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

Merge branch 'dev' into bx-1480-constructor
Deploy / build_and_push_images (push) Successful in 1m20s Details
Deploy / deploy_to_server_dev (push) Successful in 53s Details

This commit is contained in:
aarizona 2024-09-27 16:58:47 +03:00
parent 0341756dd1 7c3b7d621f
commit fe05fe959c
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
assets/main.scss
View File

@ -327,12 +327,20 @@ button {
@apply w-full flex-nowrap; @apply w-full flex-nowrap;
input { input {
@apply w-20 bg-slate-300; @apply w-20 bg-slate-100;
} }
} }
&_checkbox { &_checkbox {
@apply w-full xl:w-auto flex-row xl:flex-initial flex-nowrap gap-4; @apply w-full xl:w-auto flex-row xl:flex-initial flex-nowrap gap-2 items-center;
label {
@apply leading-none;
}
svg {
@apply text-slate-500;
}
} }
&_range { &_range {
@ -350,13 +358,13 @@ button {
} }
} }
&_color { &_picker {
@apply w-full; @apply w-full;
}
// input[type=range] { svg {
// @apply min-w-[calc(100%-8rem)] xl:min-w-min py-0 -translate-y-1/2; @apply text-slate-500;
// } }
}
} }
} }

2
components/calc/models.vue
View File

@ -25,7 +25,7 @@ const cameraStat = reactive({
</template> </template>
<Loader /> <Loader />
<Stats /> <Stats />
<TresCanvas clear-color="#ccc"> <TresCanvas clear-color="#e2e8f0">
<TresPerspectiveCamera v-bind="cameraStat" ref="camera" /> <TresPerspectiveCamera v-bind="cameraStat" ref="camera" />
<OrbitControls v-bind="controlsState" make-default /> <OrbitControls v-bind="controlsState" make-default />
<Suspense> <Suspense>

16
components/calc/values.vue
View File

@ -198,10 +198,10 @@ const calc_table = computed(() => {
<div class="form-row"> <div class="form-row">
<div class="form-item form-item_color"> <div class="form-item form-item_color">
<label for="pillar_pattern">Узор столба</label> <label for="pillar_pattern">Узор столба</label>
<DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern" :pattern="pillar_pattern" <DropdownPicker type="pattern" :cb="setPillarPattern" name="pillar_pattern"
:disabled="remove_pillar" :pattern="pillar_pattern" :disabled="remove_pillar"
:goto_target="new Vector3(fence_section * 0.5, lamelles_count * lamelle_height, 0)" :goto_target="new Vector3(fence_section * 0.5, lamelles_count * lamelle_height, 0)"
:goto_cam="new Vector3(1, 2, -1)"/> :goto_cam="new Vector3(1, 2, -1)" />
</div> </div>
</div> </div>
</div> </div>
@ -241,16 +241,18 @@ const calc_table = computed(() => {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-item form-item_checkbox"> <div class="form-item form-item_checkbox">
<input id="auto_length" type="checkbox" v-model="form_state.auto_length" /> <Icon :name="`mdi:check-box-outline${!form_state.auto_length ? '-blank' : ''}`"
@click="form_state.auto_length = !form_state.auto_length" />
<input id="auto_length" type="checkbox" hidden v-model="form_state.auto_length" />
<label for="auto_length">Автоматический подбор секции</label> <label for="auto_length">Автоматический подбор секции</label>
</div> </div>
<p v-if="!form_state.auto_length" class="text-ioprim text-sm"> <p v-if="!form_state.auto_length" class="text-ioprim text-sm">
Рекомендуем вам включить автоподбор длины секции Рекомендуем вам включить автоподбор длины секции
</p> </p>
</div>
<div class="form-row">
<div class="form-item form-item_checkbox"> <div class="form-item form-item_checkbox">
<input id="remove_pillar" type="checkbox" v-model="form_state.remove_pillar" /> <Icon :name="`mdi:check-box-outline${!form_state.remove_pillar ? '-blank' : ''}`"
@click="form_state.remove_pillar = !form_state.remove_pillar" />
<input id="remove_pillar" type="checkbox" hidden v-model="form_state.remove_pillar" />
<label for="remove_pillar">Без столбов</label> <label for="remove_pillar">Без столбов</label>
</div> </div>
</div> </div>