From 6818f29a6f55e46ffca07fd0c68141144170e6d7 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 13 Jun 2024 15:46:15 +0300
Subject: [PATCH] remove pillar

---
 components/calcValues.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/calcValues.vue b/components/calcValues.vue
index 20f4844..6d82ab5 100644
--- a/components/calcValues.vue
+++ b/components/calcValues.vue
@@ -4,7 +4,7 @@ import type { ralTypes } from '@/components/ral'
 
 const lamelles_count = useState('lamelles_count', () => 8)
 const fence_section = useState<number>('fence_section', () => 2000 * 0.001)
-const remove_pillar = useState<boolean>('pillar_color', () => false)
+const remove_pillar = useState<boolean>('remove_pillar', () => false)
 const pillar_color = useState<ralTypes>('pillar_color', () => '3009')
 const lamelle_color = useState<ralTypes>('lamelle_color', () => '3004')
 const section_count = useState('section_count', () => 1)
@@ -191,21 +191,21 @@ const plurals = {
                         Забор общей длиной {{ form_state.total_length }}{{ '\xa0' }}м,
                         {{ section_count }}
                         <Plural :n="section_count" :forms="plurals.section" /> по
-                        {{ form_state.length }}{{ '\xa0' }}мм<span class="contents" v-if="form_state.extra_section">
-                            и 1 дополнительная секция длиной {{ form_state.extra_section }}{{ '\xa0' }}мм</span>.
+                        {{ form_state.length }}{{ '\xa0' }}мм<template v-if="form_state.extra_section">
+                            и 1 дополнительная секция длиной {{ form_state.extra_section }}{{ '\xa0' }}мм</template>.
                     </p>
                     <p>
-                        Всего {{ section_count + ~~(!!form_state.extra_section) + 1 }}
-                        <Plural :forms="plurals.fence" :n="section_count + ~~(!!form_state.extra_section) + 1" />,
+                        Всего <template v-if="!form_state.remove_pillar">
+                            {{ section_count + ~~(!!form_state.extra_section) + 1 }}
+                            <Plural :forms="plurals.fence" :n="section_count + ~~(!!form_state.extra_section) + 1" />,
+                        </template>
                         {{ section_count * lamelles_count }}
                         <Plural :n="section_count * lamelles_count" :forms="plurals.lamelle" />
-                        длиной {{ form_state.length }}{{ '\xa0' }}мм
-                        <span class="contents" v-if="form_state.extra_section">
-                            и {{ ~~(!!form_state.extra_section) * lamelles_count }}
+                        {{ `длиной ${form_state.length}\xa0мм` }}<template v-if="form_state.extra_section">и
+                            {{ ~~(!!form_state.extra_section) * lamelles_count }}
                             <Plural :n="~~(!!form_state.extra_section) * lamelles_count" :forms="plurals.lamelle" />
-                            длиной {{
-                                form_state.extra_section }}{{ '\xa0' }}мм
-                        </span>.
+                            {{ `длиной ${form_state.extra_section}\xa0мм` }}
+                        </template>.
                     </p>
                     <p>
                         Все элементы окрашиваются порошковым методом: <br />