添加深时移动类型

src/api/fuse-model.ts

@@ -57,7 +57,7 @@ const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel
   position: serviceModel.transform.position,
   rotation: serviceModel.transform.rotation,
   id: serviceModel.fusionNumId.toString(),
-  url: serviceModel.sceneData ? (serviceModel.sceneData.type === SceneType.SWSS ? serviceModel.sceneData.num : serviceModel.sceneData.modelGlbUrl) : '',
+  url: serviceModel.sceneData ? ([SceneType.SWSS, SceneType.SWYDSS].includes(serviceModel.sceneData.type) ? serviceModel.sceneData.num : serviceModel.sceneData.modelGlbUrl) : '',
   title: serviceModel.sceneData ? (serviceModel.sceneData?.name || serviceModel.sceneData.sceneName || serviceModel.sceneData.modelTitle) : '-',
   modelId: serviceModel.sceneData?.modelId,
   fusionId: serviceModel.fusionId,

src/api/scene.ts

@@ -8,7 +8,9 @@ export enum SceneType {
   SWKJ = 1,
   SWSS = 2,
   SWMX = 3,
-  SWSSMX = 4
+  SWSSMX = 4,
+  SWYDSS = 5,
+  SWYDMX = 6,
 }
 
 export enum SceneStatus {
@@ -26,6 +28,8 @@ export const SceneTypeDesc: Record<SceneType, string>  = {
   [SceneType.SWSS]: '激光转台点云场景',
   [SceneType.SWMX]: '三维模型',
   [SceneType.SWSSMX]: '激光转台Mesh场景'
+  [SceneType.SWYDSS]: '激光移动点云场景'
+  [SceneType.SWYDMX]: '激光移动Mesh场景'
 }
 
 export interface Scene {

src/layout/pwd.vue

@@ -4,7 +4,7 @@
       <Button key="submit" type="primary" @click="okHandler">确定</Button>
     </template>
     <FormItem label="访问密码" name="password">
-      <InputPassword v-model:value="password" />
+      <InputPassword v-model:value="password" placeholder="请输入" />
     </FormItem>
   </Modal>
 </template>

src/model/app.vue

@@ -63,7 +63,9 @@ export const Model = defineComponent({
         [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}`,
         [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}`,
         [SceneType.SWSSMX]: `/swkk/spg.html?m=${scene.value.num}`,
-        [SceneType.SWMX]: `index.html?caseId=${params.caseId}&app=${params.app}&modelId=${scene.value.num}&share=1#sign-model`
+        [SceneType.SWMX]: `index.html?caseId=${params.caseId}&app=${params.app}&modelId=${scene.value.num}&share=1#sign-model`,
+        [SceneType.SWYDSS]: `/swss/index.html?m=${scene.value.num}`,
+        [SceneType.SWYDMX]: `/swkk/spg.html?m=${scene.value.num}`,
       }
       setUrl(urls[type])
     })

src/model/platform.ts

@@ -147,7 +147,8 @@ export async function exposeFactory(type: ModelType, win?: any): Promise<ModelEx
       }
     }
   }
-  platforms[SceneType.SWSSMX] = platforms[SceneType.SWKJ] = platforms[SceneType.SWKK]
+  platforms[SceneType.SWYDSS] = platforms[SceneType.SWSS]
+  platforms[SceneType.SWYDMX] = platforms[SceneType.SWSSMX] = platforms[SceneType.SWKJ] = platforms[SceneType.SWKK]
   platforms[SceneType.SWMX] = {
     getSDK: async () => findObjectAttr(win , '__sdk'),
     expose: platforms[fuseModel].expose

src/sdk/association.ts

@@ -84,14 +84,13 @@ const associationModels = (sdk: SDK) => {
       const itemRaw = toRaw(item)
       let sceneModel: SceneModel
       try {
-        console.log(item.type === SceneType.SWSS ? 'laser' : item.modelType, item)
         sceneModel = sdk.addModel({
           ...itemRaw,
           ...modelRange,
           mode: RoutesName.signModel === currentLayout.value! ? 'single' : 'many',
           isDynamicAdded: dynamicAddedModelIds.value.some(id => itemRaw.id === id),
-          type: item.type === SceneType.SWSS ? 'laser' : item.modelType,
-          url: item.type === SceneType.SWSS ? item.url : item.url && getResource(item.url)
+          type: [SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? 'laser' : item.modelType,
+          url: [SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? item.url : item.url && getResource(item.url)
         })
       } catch(e) {
         console.error('模型加载失败', e)

src/views/sign-model/index.vue

@@ -24,7 +24,9 @@ const loadSignModel = async () => {
       scene = mscene
     }
   } else if ('m' in params) {
-    const scenes = await fetchScenesAll({ numList: [params.m!], type: SceneType.SWSSMX })
+    const SSscenes = await fetchScenesAll({ numList: [params.m!], type: SceneType.SWSSMX })
+    const YDscenes = await fetchScenesAll({ numList: [params.m!], type: SceneType.SWYDMX })
+    const scenes = [...SSscenes, ...YDscenes]
     scene = scenes.find(scene => scene.num === params.m)
     console.log(scene)
   }