mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ral

This commit is contained in:
Зеленская Анастасия Николаевна 2024-06-18 16:10:07 +03:00
parent 3757efdc49 c63b1a471f
commit b3b2404d27
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/modal.vue
View File

@ -15,6 +15,7 @@ const lamelle_color = useState<ralTypes>('lamelle_color')
const section_count = useState('section_count') const section_count = useState('section_count')
const extra_section = useState('extra_section') const extra_section = useState('extra_section')
const total_length = useState('total_length') const total_length = useState('total_length')
const remove_pillar = useState<boolean>('remove_pillar')
const toggleModal = () => { const toggleModal = () => {
modal_data.phone = undefined modal_data.phone = undefined
@ -106,6 +107,7 @@ const total = computed(() => {
const guides_count = section_count.value const guides_count = section_count.value
const guides = guides_count * parseFloat(guide) * lam_count * 115 const guides = guides_count * parseFloat(guide) * lam_count * 115
return [ return [
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
`Столб, ${pillar_count} шт. : ${roubleSign.format(pil)}`, `Столб, ${pillar_count} шт. : ${roubleSign.format(pil)}`,
`Ламели, ${lam_count} шт. : ${roubleSign.format(lam)}`, `Ламели, ${lam_count} шт. : ${roubleSign.format(lam)}`,
@ -117,6 +119,13 @@ const total = computed(() => {
`Верхняя планка, ${top_count}: ${top_count} x ${length} x ${bar} = ${roubleSign.format(top)}`, `Верхняя планка, ${top_count}: ${top_count} x ${length} x ${bar} = ${roubleSign.format(top)}`,
>>>>>>> b541bdead72bb5cbf7831e7da77c6540bdb94747 >>>>>>> b541bdead72bb5cbf7831e7da77c6540bdb94747
] ]
=======
!remove_pillar.value && `Столб, ${pillar_count}: (${parseFloat(mortgage)} + ${parseFloat(pillar)}) x ${pillar_count} = ${roubleSign.format(pil)}`,
`Ламели, ${lam_count}: (${lam_count} x ${length} x ${lamella}) + ${rivets} = ${roubleSign.format(lam)}`,
`Направляющая, ${guides_count}: ${guides_count} x ${guide} x ${lam_count} x 115 = ${roubleSign.format(guides)}`,
`Верхняя планка, ${top_count}: ${top_count} x ${length} x ${bar} = ${roubleSign.format(top)}`,
].filter(Boolean)
>>>>>>> c63b1a471f5212c40af99d24c387ae2e2d52d3cd
}) })
</script> </script>
<template> <template>