diff --git a/components/expDiagram.vue b/components/expDiagram.vue index 68de2ca..358cf2a 100644 --- a/components/expDiagram.vue +++ b/components/expDiagram.vue @@ -56,15 +56,10 @@ onMounted(() => { + - - - -
diff --git a/components/modal.vue b/components/modal.vue index 81a8c00..8353e2f 100644 --- a/components/modal.vue +++ b/components/modal.vue @@ -189,7 +189,7 @@ const total_txt = computed(() => { if (isTopper) decor.topper = { txt: 'Колпак', value: getTopperName(pillar_topper.value) } } - const total = [extra, regular, decor].map(item => Object.values(item).map(el => el ? el.value : 0)).flat().reduce((a, b) => a + b, 0) + const total = [extra, regular].map(item => Object.values(item).map(el => el ? el.value : 0)).flat().reduce((a, b) => a + b, 0) const res_regular = Object.values(regular).map(item => Object.entries(item).map(el => el[0] == 'value' ? roubleSign.format(el[1] as number) : el[1]).join(': ') diff --git a/components/model/diagram.vue b/components/model/diagram.vue index 3844897..96b59c0 100644 --- a/components/model/diagram.vue +++ b/components/model/diagram.vue @@ -25,8 +25,8 @@ const { scene: verh } = await useGLTF('/models_exp/verh.glb') const lamelle_color = use_lamelle_color() const pillar_color = use_pillar_color() -set_material(planki, getColorHexFromRal(lamelle_color.value)); -[stolb, verh, krepleniye_planok].map(el => set_material(el, getColorHexFromRal(pillar_color.value))) +set_material(planki, getColorHexFromRal(lamelle_color.value), undefined, false); +[stolb, verh, krepleniye_planok].map(el => set_material(el, getColorHexFromRal(pillar_color.value), undefined, false))