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

dev #60

Merged
ksenia_mikhailova merged 48 commits from dev into main 2024-07-26 10:41:38 +03:00
Conversation 0 Commits 48 Files Changed 18 +14 -12
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c69e37532 - Show all commits

2
components/modal.vue
View File

@ -238,7 +238,7 @@ const policy = () => {
<template v-else> <template v-else>
<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 />
Цвет столба: {{ getColorNameFromRal(pillar_color) }}<br /> Цвет столба: {{ getColorNameFromRal(pillar_color) }}<br />
Цвет ламелей: {{ getColorNameFromRal(lamelle_color) }} Цвет ламелей: {{ getColorNameFromRal(lamelle_color) }}
</p> </p>

24
components/model/item.vue
View File

@ -62,15 +62,17 @@ watch(props, () => {
}, { deep: true }) }, { deep: true })
</script> </script>
<template> <template>
<TresGroup ref="model" :name="scene.children[0].name"> <template v-if="scene.children[0]">
<Suspense> <TresGroup ref="model" :name="scene.children[0].name">
<primitive :object="scene.children[0]" :position="(props.position || [0, 0, 0])" /> <Suspense>
</Suspense> <primitive :object="scene.children[0]" :position="(props.position || [0, 0, 0])" />
<Suspense v-if="false"> </Suspense>
<Text3D :text="scene.children[0].name" <Suspense v-if="false">
font='https://raw.githubusercontent.com/Tresjs/assets/main/fonts/FiraCodeRegular.json'> <Text3D :text="scene.children[0].name"
<TresMeshNormalMaterial color=red /> font='https://raw.githubusercontent.com/Tresjs/assets/main/fonts/FiraCodeRegular.json'>
</Text3D> <TresMeshNormalMaterial color=red />
</Suspense> </Text3D>
</TresGroup> </Suspense>
</TresGroup>
</template>
</template> </template>