Merge pull request 'bx-1146-more_calc' (#57) from bx-1146-more_calc into dev
Deploy / build_and_push_images (push) Successful in 1m23s Details
Deploy / deploy_to_server_dev (push) Successful in 34s Details

Reviewed-on: #57
This commit is contained in:
ksenia_mikhailova 2024-07-26 10:13:36 +03:00
commit 55e2ea51a9
4 changed files with 16 additions and 11 deletions

View File

@ -240,7 +240,7 @@ a[href^="#"] {
} }
&-close { &-close {
@apply absolute right-3 top-3 text-4xl opacity-50; @apply absolute right-3 top-3 text-4xl opacity-50 cursor-pointer;
} }
&-status { &-status {

View File

@ -240,7 +240,8 @@ const goal = (target: string, params: object) => {
<div class="col-span-6 sm:col-span-4"> <div class="col-span-6 sm:col-span-4">
Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }} Ламели, RAL {{ lamelle_color }}, {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }}
</div> </div>
<div class="col-span-3 sm:col-span-1">{{ 1 * lamelles_count }}</div> <div class="col-span-3 sm:col-span-1">
Доп. {{ 1 * lamelles_count }}</div>
<div class="col-span-3 sm:col-span-1">{{ <div class="col-span-3 sm: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>

View File

@ -239,9 +239,6 @@ const policy = () => {
<h2>данные расчета</h2> <h2>данные расчета</h2>
<div class="flex gap-4 flex-col mb-4 modal-content"> <div class="flex gap-4 flex-col mb-4 modal-content">
<p>Общая длина: {{ total_length }}<br /> <p>Общая длина: {{ total_length }}<br />
Ламелей: {{ lamelles_count }}<br />
Длина секции: {{ (fence_section * 1000).toFixed(0) }}<br />
Секций: {{ section_count }}<br />
Цвет столба: {{ getColorNameFromRal(pillar_color) }}<br /> Цвет столба: {{ getColorNameFromRal(pillar_color) }}<br />
Цвет ламелей: {{ getColorNameFromRal(lamelle_color) }} Цвет ламелей: {{ getColorNameFromRal(lamelle_color) }}
</p> </p>

View File

@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { useGLTF } from '@tresjs/cientos' import { useGLTF, Text3D } from '@tresjs/cientos'
import { Vector3 } from 'three'; import { DoubleSide, Vector3 } from 'three';
const props = defineProps(['modelUrl', 'model', 'position', 'target', 'parent']) const props = defineProps(['modelUrl', 'model', 'position', 'target', 'parent'])
let scene: any let scene: any
@ -60,10 +60,17 @@ watch(props, () => {
target.value = new Vector3(...props.target) target.value = new Vector3(...props.target)
} }
}, { deep: true }) }, { deep: true })
</script> </script>
<template> <template>
<TresGroup ref="model" :name="scene.children[0].name">
<Suspense> <Suspense>
<primitive :object="scene.children[0]" :position="(props.position || [0, 0, 0])" ref="model" /> <primitive :object="scene.children[0]" :position="(props.position || [0, 0, 0])" />
</Suspense> </Suspense>
<Suspense v-if="false">
<Text3D :text="scene.children[0].name"
font='https://raw.githubusercontent.com/Tresjs/assets/main/fonts/FiraCodeRegular.json'>
<TresMeshNormalMaterial color=red />
</Text3D>
</Suspense>
</TresGroup>
</template> </template>