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

Merge branch 'bx-696-startproject' of https://git.svs-tech.pro/ksenia_mikhailova/mns-mini-zabor into bx-696-startproject

This commit is contained in:
Kseninia Mikhaylova 2024-06-20 10:47:45 +03:00
parent a22d5ffa46 f3d5292d8c
commit 7791eb4bc4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/calcValues.vue
View File

@ -191,8 +191,8 @@ const plurals = {
{{ section_count }} {{ section_count }}
<Plural :n="section_count" :forms="plurals.section" /> по <Plural :n="section_count" :forms="plurals.section" /> по
{{ `${parseInt(form_state.length).toFixed(2)}\xa0мм` }}{{ {{ `${parseInt(form_state.length).toFixed(2)}\xa0мм` }}{{
form_state.extra_section ? `и 1 дополнительная секция form_state.extra_section ? ` и 1 дополнительная секция
длиной ${form_state.extra_section.toFixed(2)}\xa0мм` : '' }} длиной ${form_state.extra_section.toFixed(2)}\xa0мм` : '' }}.
</p> </p>
<p v-if="parametric.length.min <= form_state.total_length * 1000"> <p v-if="parametric.length.min <= form_state.total_length * 1000">
Всего <template v-if="!form_state.remove_pillar"> Всего <template v-if="!form_state.remove_pillar">

6
components/modal.vue
View File

@ -113,12 +113,12 @@ const total_txt = computed(() => {
const extra = { const extra = {
pillar: !remove_pillar.value && { pillar: !remove_pillar.value && {
txt: 'Дополнительная секция, столб, 1шт', txt: 'Дополнительная секция, столб, 1 шт',
value: ((parseFloat(mortgage) + parseFloat(pillar)) * 1) value: ((parseFloat(mortgage) + parseFloat(pillar)) * 1)
}, },
lamella: { lamella: {
txt: `Дополнительная секция, ламели, ${lamelles_count.value}шт`, txt: `Дополнительная секция, ламели, ${lamelles_count.value} шт`,
value: ((parseFloat(mortgage) + parseFloat(pillar)) * 1) value: ((parseFloat(mortgage) + parseFloat(pillar)) * top_count)
}, },
guide: { txt: 'Направляющие', value: 2 * parseFloat(guide) * lam_count * 0.115 }, guide: { txt: 'Направляющие', value: 2 * parseFloat(guide) * lam_count * 0.115 },
top: { txt: 'Верхняя планка', value: 1 * bar }, top: { txt: 'Верхняя планка', value: 1 * bar },