dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
2 changed files with 107 additions and 96 deletions
Showing only changes of commit b313da0a53 - Show all commits

View File

@ -181,7 +181,7 @@ a[href^="#"] {
// @apply;
.container {
@apply gap-4 items-start;
@apply gap-4 items-stretch;
}
}
@ -298,10 +298,14 @@ button {
}
.form {
@apply col-span-full grid grid-cols-12 gap-4;
@apply col-span-full h-full grid grid-cols-12 gap-4 justify-between;
&-group {
@apply col-span-full rounded gap-2;
}
&-row {
@apply col-span-full flex flex-row flex-wrap gap-4;
@apply col-span-full flex flex-row flex-wrap gap-2;
}
&-item {

View File

@ -183,6 +183,7 @@ const calc_table = computed(() => {
</script>
<template>
<div class="form">
<div class="form-group">
<div class="form-row">
<div class="form-item form-item_color">
<label for="lamelle_color">Цвет ламелей</label>
@ -212,7 +213,8 @@ const calc_table = computed(() => {
<div class="form-row">
<div class="form-item form-item_color">
<label for="pillar_pattern">Узор столба</label>
<DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern" :disabled="remove_pillar"
<DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern"
:disabled="remove_pillar"
:goto_target="new Vector3(fence_section * 0.5, lamelles_count * lamelle_height, 0)"
:goto_cam="new Vector3(1, 2, -1)">
<span :style="getFilename(pillar_pattern) ? [{
@ -225,6 +227,8 @@ const calc_table = computed(() => {
</DropdownPicker>
</div>
</div>
</div>
<div class="form-group shadow shadow-slate-400">
<div class="form-row">
<div class="form-item form-item_range w-full">
<label for="length">Длина ламельного блока, мм</label>
@ -273,6 +277,8 @@ const calc_table = computed(() => {
<label for="remove_pillar">Без столбов</label>
</div>
</div>
</div>
<div class="form-group">
<div class="form-row">
<template v-if="(form_state.total_length * 1000) >= parametric.length.min">
<div class="col-span-12 xl:col-span-6 xl:col-start-4 grid calc_table">
@ -289,6 +295,7 @@ const calc_table = computed(() => {
</template>
</div>
</div>
</div>
</template>
<style lang="scss" scoped>
#pillar_pattern {