Merge branch 'v1.7.0' of http://192.168.0.115:3000/bill/fuse-code into v1.7.0

src/api/fuse-model.ts

@@ -47,26 +47,23 @@ interface ServiceFuseModel {
   sceneData: Scene;
 }
 
-const serviceToLocal = (
-  serviceModel: ServiceFuseModel,
-  test = false
-): FuseModel => {
+export const getSceneUrl = (sceneData: Scene) => {
   let url: any = [""];
-  console.log(serviceModel.sceneData, serviceModel.sceneData.type);
+  console.log(sceneData, sceneData.type);
   if (
-    [SceneType.SWSS, SceneType.SWYDSS].includes(serviceModel.sceneData.type)
+    [SceneType.SWSS, SceneType.SWYDSS].includes(sceneData.type)
   ) {
-    url = [serviceModel.sceneData.num];
+    url = [sceneData.num];
   } else {
-    switch (serviceModel.sceneData.modelDateType) {
+    switch (sceneData.modelDateType) {
       case "3dgs":
-        url = serviceModel.sceneData.model3dgsUrl;
+        url = sceneData.model3dgsUrl;
         break;
       case "shp":
-        url = serviceModel.sceneData.modelShpUrl;
+        url = sceneData.modelShpUrl;
         break;
       default:
-        url = serviceModel.sceneData.modelGlbUrl;
+        url = sceneData.modelGlbUrl;
     }
     try {
       url = JSON.parse(url);
@@ -74,6 +71,13 @@ const serviceToLocal = (
       console.error(url, e);
     }
   }
+  return url
+}
+
+const serviceToLocal = (
+  serviceModel: ServiceFuseModel,
+  test = false
+): FuseModel => {
 
   return {
     show: true,
@@ -85,7 +89,7 @@ const serviceToLocal = (
     position: serviceModel.transform.position,
     rotation: serviceModel.transform.rotation,
     id: serviceModel.fusionNumId.toString(),
-    url,
+    url: getSceneUrl(serviceModel.sceneData),
     title: serviceModel.sceneData
       ? serviceModel.sceneData?.name ||
         serviceModel.sceneData.sceneName ||

src/views/sign-model/index.vue

@@ -3,7 +3,7 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import { loadModel, fuseModel as FModel } from "@/model";
-import { fetchScene, fetchScenesAll, Scene, SceneType } from "@/api";
+import { fetchScene, fetchScenesAll, getSceneUrl, Scene, SceneType } from "@/api";
 import { createFuseModels, defTitle, fuseModels, SceneStatus } from "@/store";
 import {
   custom,
@@ -51,7 +51,7 @@ const loadSignModel = async () => {
       modelId: scene.modelId,
       show: true,
       raw: scene,
-      url: scene.modelGlbUrl || scene.modelObjUrl,
+      url: getSceneUrl(scene),
       type: scene.type,
       opacity: 100,
       modelType: scene.modelDateType,