dev #43

Merged
ksenia_mikhailova merged 41 commits from dev into main 2024-07-24 14:22:29 +03:00
1 changed files with 11 additions and 11 deletions
Showing only changes of commit 3445acbcdf - Show all commits

View File

@ -151,13 +151,13 @@ const goal = (target: string, params: object) => {
<div class="form-item w-full"> <div class="form-item w-full">
<label for="length">Длина ламельного блока, мм</label> <label for="length">Длина ламельного блока, мм</label>
<input disabled :value="`${form_state.length} мм`" class="w-28" /> <input disabled :value="`${form_state.length} мм`" class="w-28" />
<input id="length" type="range" class="w-full" v-bind="parametric.length" <input id="length" type="range" class="xl:w-full" v-bind="parametric.length"
v-model="form_state.length" :disabled="form_state.auto_length" :ref="form_refs.length" /> v-model="form_state.length" :disabled="form_state.auto_length" :ref="form_refs.length" />
</div> </div>
<div class="form-item w-full"> <div class="form-item w-full">
<label for="height">Высота забора, мм</label> <label for="height">Высота забора, мм</label>
<input disabled :value="`${form_state.height} мм`" class="w-28" /> <input disabled :value="`${form_state.height} мм`" class="w-28" />
<input id="height" type="range" class="w-full" v-bind="parametric.height" <input id="height" type="range" class="xl:w-full" v-bind="parametric.height"
v-model="form_state.height" :ref="form_refs.height" /> v-model="form_state.height" :ref="form_refs.height" />
</div> </div>
</div> </div>
@ -208,30 +208,30 @@ const goal = (target: string, params: object) => {
<div class="grid grid-cols-6"> <div class="grid grid-cols-6">
<div class="col-span-4 calc_table-maincell">Секции</div> <div class="col-span-4 calc_table-maincell">Секции</div>
<div class="col-span-2 calc_table-maincell">{{ section_count }}</div> <div class="col-span-2 calc_table-maincell">{{ section_count }}</div>
<div class="col-span-4"> <div class="col-span-6 xl:col-span-4">
Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }} Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }}
</div> </div>
<div class="col-span-1">{{ section_count * lamelles_count }}</div> <div class="col-span-3 xl:col-span-1">{{ section_count * lamelles_count }}</div>
<div class="col-span-1"> <div class="col-span-3 xl:col-span-1">
{{ `${parseFloat(form_state.length.toString()).toFixed(2)}\xa0мм` }}</div> {{ `${parseFloat(form_state.length.toString()).toFixed(2)}\xa0мм` }}</div>
<template v-if="!form_state.remove_pillar"> <template v-if="!form_state.remove_pillar">
<div class="col-span-4">Столбы, RAL {{ pillar_color }}, {{ <div class="col-span-6 xl:col-span-4">Столбы, RAL {{ pillar_color }}, {{
getColorNameFromRal(pillar_color)?.toLowerCase() }}</div> getColorNameFromRal(pillar_color)?.toLowerCase() }}</div>
<div class="col-span-1"> <div class="col-span-3 xl:col-span-1">
{{ section_count + ~~(!!form_state.extra_section) + 1 }} {{ section_count + ~~(!!form_state.extra_section) + 1 }}
</div> </div>
<div class="col-span-1"> <div class="col-span-3 xl:col-span-1">
{{ `${parseFloat(form_state.fence_length.toString()).toFixed(2)}\xa0мм` }} {{ `${parseFloat(form_state.fence_length.toString()).toFixed(2)}\xa0мм` }}
</div> </div>
</template> </template>
<template v-if="form_state.extra_section"> <template v-if="form_state.extra_section">
<div class="col-span-4 calc_table-maincell">Секции</div> <div class="col-span-4 calc_table-maincell">Секции</div>
<div class="col-span-2 calc_table-maincell">1</div> <div class="col-span-2 calc_table-maincell">1</div>
<div class="col-span-4"> <div class="col-span-6 xl:col-span-4">
Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }} Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }}
</div> </div>
<div class="col-span-1">{{ 1 * lamelles_count }}</div> <div class="col-span-3 xl:col-span-1">{{ 1 * lamelles_count }}</div>
<div class="col-span-1">{{ <div class="col-span-3 xl:col-span-1">{{
`${parseFloat(form_state.extra_section.toString()).toFixed(2)}\xa0мм` }}</div> `${parseFloat(form_state.extra_section.toString()).toFixed(2)}\xa0мм` }}</div>
</template> </template>
</div> </div>