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

src/api/fuse-model.ts

@@ -23,6 +23,7 @@ export interface FuseModel extends FuseModelAttrs {
   modelId: number;
   fusionNumId: number;
   url: string[];
+  renderType?: string,
   title: string;
   fusionId: number;
   modelType: string;
@@ -94,6 +95,7 @@ const serviceToLocal = (
     fusionNumId: serviceModel.fusionNumId,
     modelType: serviceModel.sceneData?.modelDateType,
     position: serviceModel.transform.position,
+    renderType: serviceModel.sceneData.type === SceneType.SWMX ? (serviceModel.sceneData.renderType || 'base') : undefined,
     rotation: serviceModel.transform.rotation,
     id: serviceModel.fusionNumId.toString(),
     url: getSceneUrl(serviceModel.sceneData),

src/api/scene.ts

@@ -45,6 +45,7 @@ export interface Scene {
   modelSize: number
   status: SceneStatus
   modelTitle: string
+  renderType: string
   name: string
   num: string
   sceneName: string

src/model/platform.ts

@@ -37,7 +37,7 @@ export async function modelSDKFactory(
   }
   if (type === fuseModel) {
     if (!fuseInitialed) {
-      await initialSDK({
+      const opt = {
         laserRoot: offline ? offlinePrev : import.meta.env.VITE_LASER_HOST,
         panoOSSRoot: offline ? offlinePrev : import.meta.env.VITE_PANO_OSS,
         ossRoot: offline ? offlinePrev : import.meta.env.VITE_OSS,
@@ -45,7 +45,9 @@ export async function modelSDKFactory(
         layout: dom,
         scenes: scenes.value,
         lonlat: center,
-      });
+      }
+      console.log('initialSDK', opt)
+      await initialSDK(opt);
     }
     return exposeFactory(fuseModel);
   } else {
@@ -190,7 +192,7 @@ export async function exposeFactory(
   platforms[SceneType.SWYDMX] =
     platforms[SceneType.SWSSMX] =
     platforms[SceneType.SWKJ] =
-      platforms[SceneType.SWKK];
+    platforms[SceneType.SWKK];
   platforms[SceneType.SWMX] = {
     getSDK: async () => findObjectAttr(win, "__sdk"),
     expose: platforms[fuseModel].expose,

src/views/sign-model/index.vue

@@ -52,6 +52,7 @@ const loadSignModel = async () => {
       show: true,
       raw: scene,
       url: getSceneUrl(scene),
+      renderType: scene.renderType,
       type: scene.type,
       opacity: 100,
       modelType: scene.modelDateType,