bill 8 months ago
parent
commit
4d31482f0f
5 changed files with 15 additions and 7 deletions
  1. 1 1
      src/api/fuse-model.ts
  2. 5 1
      src/api/scene.ts
  3. 5 1
      src/model/app.vue
  4. 2 2
      src/model/platform.ts
  5. 2 2
      src/sdk/association.ts

+ 1 - 1
src/api/fuse-model.ts

@@ -59,7 +59,7 @@ const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel
   renderType: serviceModel.sceneData.type === SceneType.SWMX ? (serviceModel.sceneData.renderType || 'base') : undefined,
   rotation: serviceModel.transform.rotation,
   id: serviceModel.fusionNumId.toString(),
-  url: serviceModel.sceneData ? ([SceneType.SWSS, SceneType.SWYDSS].includes(serviceModel.sceneData.type) ? serviceModel.sceneData.num : serviceModel.sceneData.modelGlbUrl) : '',
+  url: serviceModel.sceneData ? ([SceneType.SWSS, SceneType.SWYDSS, SceneType.C_SWSS].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,

+ 5 - 1
src/api/scene.ts

@@ -11,6 +11,8 @@ export enum SceneType {
   SWSSMX = 4,
   SWYDSS = 5,
   SWYDMX = 6,
+  C_SWKK,
+  C_SWSS,
 }
 
 export enum SceneStatus {
@@ -29,7 +31,9 @@ export const SceneTypeDesc: Record<SceneType, string>  = {
   [SceneType.SWMX]: '三维模型',
   [SceneType.SWSSMX]: '激光转台Mesh场景',
   [SceneType.SWYDSS]: '激光移动点云场景',
-  [SceneType.SWYDMX]: '激光移动Mesh场景'
+  [SceneType.SWYDMX]: '激光移动Mesh场景',
+  [SceneType.C_SWKK]: "Mesh场景",
+  [SceneType.C_SWSS]: "点云场景",
 }
 
 export interface Scene {

+ 5 - 1
src/model/app.vue

@@ -86,8 +86,10 @@ export const Model = defineComponent({
       const urls = !(window as any).offline
         ? {
             [SceneType.SWKK]: `/swkk/spg.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.C_SWKK]: `/swkk/spg.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.C_SWSS]: `/swss/index.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWSSMX]: `/swkk/spg.html?m=${scene.value.num}&lang=zh`,
             [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}&lang=zh`,
@@ -95,8 +97,10 @@ export const Model = defineComponent({
           }
         : {
             [SceneType.SWKK]: `/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.C_SWKK]: `/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWKJ]: `/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWSS]: `/swss/${scene.value.num}/www/offline.html?m=${scene.value.num}&lang=zh`,
+            [SceneType.C_SWSS]: `/swss/${scene.value.num}/www/offline.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWSSMX]: `/swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
             [SceneType.SWMX]: `offline.html?caseId=${params.caseId}&app=${params.app}&modelId=${scene.value.num}&share=1#sign-model`,
             [SceneType.SWYDSS]: `/swss/${scene.value.num}/www/offline.html?m=${scene.value.num}&lang=zh`,
@@ -159,7 +163,7 @@ export const Model = defineComponent({
           const target = doc.head;
           clearInterval(interval);
           (window as any).iframeCreated && (window as any).iframeCreated(iframeRef.value);
-          if (type === SceneType.SWSS) {
+          if (type === SceneType.SWSS || type === SceneType.C_SWSS) {
             const $style = document.createElement("style");
             $style.type = "text/css";
             var textNode = document.createTextNode(`

+ 2 - 2
src/model/platform.ts

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

+ 2 - 2
src/sdk/association.ts

@@ -88,8 +88,8 @@ const setModels = (models: FuseModels, oldModels: FuseModels) => {
         ...modelRange,
         mode: RoutesName.signModel === currentLayout.value! ? 'single' : 'many',
         isDynamicAdded: dynamicAddedModelIds.value.some(id => itemRaw.id === id),
-        type: [SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? 'laser' : item.modelType,
-        url: [SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? item.url : item.url && item.url,
+        type: [SceneType.C_SWSS, SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? 'laser' : item.modelType,
+        url: [SceneType.C_SWSS,SceneType.SWSS, SceneType.SWYDSS].includes(item.type) ? item.url : item.url && item.url,
         fromType: item.type
       })
     } catch(e) {