Merge branch 'dev' into bx-1146-more_calc

components/model/diagram.vue

@@ -29,12 +29,15 @@ set_material(planki, getColorHexFromRal(lamelle_color.value));
 
 </script>
 <template>
+    <Suspense>
         <TresGroup :position-y="-3.5" :scale="2">
-        <!-- <ModelItem :model="kosynka" :target="explosion_state ? targetExplosion.kosynka : [0, 0, 0]"  /> -->
+            <ModelItem :model="kosynka" :target="explosion_state ? targetExplosion.kosynka : [0, 0, 0]" />
-        <!-- <ModelItem :model="krepleniye_planok" :target="explosion_state ? targetExplosion.krepleniye_planok : [0, 0, 0]" /> -->
+            <ModelItem :model="krepleniye_planok"
+                :target="explosion_state ? targetExplosion.krepleniye_planok : [0, 0, 0]" />
             <ModelItem :model="osnova_stolba" />
             <ModelItem :model="planki" :target="explosion_state ? targetExplosion.planki : [0, 0, 0]" />
             <ModelItem :model="stolb" :target="explosion_state ? targetExplosion.stolb : [0, 0, 0]" />
             <ModelItem :model="verh" :target="explosion_state ? targetExplosion.verh : [0, 0, 0]" />
         </TresGroup>
+    </Suspense>
 </template>

components/model/item.vue

@@ -41,6 +41,12 @@ onLoop(() => {
                             model.value[element.func](step)
                         } catch (error) {
                             console.log('lvl 1')
+                            try { model.value[element.func](step) } catch {
+                                console.log('lvl 2')
+                                try { model.value[element.func](step) } catch {
+                                    console.log('lvl 3')
+                                }
+                            }
                         }
                     }
                 }

compose.yaml

@@ -8,6 +8,7 @@ services:
     restart: always
     ports:
       - "${DOCKER_PORT:-80}:3000"
+      - "8999:3001"
     volumes:
       - ./.env:/src/.env
     image: ci.svs-tech.pro/mns-mini-zabor:${BRANCH:-dev}

package.json

@@ -13,7 +13,7 @@
     "@artmizu/yandex-metrika-nuxt": "^1.0.4",
     "@monogrid/gainmap-js": "^3.0.5",
     "@nuxt/image": "^1.7.0",
-    "@nuxtjs/robots": "^3.0.0",
+    "@nuxtjs/robots": "^4.0.0",
     "@nuxtjs/sitemap": "^5.3.5",
     "@nuxtjs/tailwindcss": "^6.12.0",
     "@tailwindcss/typography": "^0.5.13",