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:26:41 +03:00
parent b3b2404d27
commit 2024a9c2d2
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/modal.vue
View File

@ -107,25 +107,12 @@ 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
`Столб, ${pillar_count} шт. : ${roubleSign.format(pil)}`,
`Ламели, ${lam_count} шт. : ${roubleSign.format(lam)}`,
`Верхняя планка, ${top_count} шт. : ${roubleSign.format(top)}`,
=======
`Столб, ${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)}`,
>>>>>>> b541bdead72bb5cbf7831e7da77c6540bdb94747
]
=======
!remove_pillar.value && `Столб, ${pillar_count}: (${parseFloat(mortgage)} + ${parseFloat(pillar)}) x ${pillar_count} = ${roubleSign.format(pil)}`, !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)}`, `Ламели, ${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)}`, `Направляющая, ${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)}`, `Верхняя планка, ${top_count}: ${top_count} x ${length} x ${bar} = ${roubleSign.format(top)}`,
].filter(Boolean) ].filter(Boolean)
>>>>>>> c63b1a471f5212c40af99d24c387ae2e2d52d3cd
}) })
</script> </script>
<template> <template>