type

src/store/case.ts

@@ -112,9 +112,14 @@ export const getCaseScenes = (scenes: Scene[]) => {
   ] as CaseScenes;
   console.log(scenes, 'scene.type')
   for (const scene of scenes) {
-    const typeIdent = typeIdents.find((ident) => ident.type === scene.type)!;
-    console.log(typeIdent, 'scene.typeIdent')
-    typeIdent.numList.push(getSceneKey(scene));
+    if(scene.fusionId){
+      const typeIdent = typeIdents.find((ident) => ident.type === 3)!;
+      typeIdent.numList.push(scene.fusionId);
+    }else{
+      const typeIdent = typeIdents.find((ident) => ident.type === scene.type)!;
+      console.log(typeIdent, 'scene.typeIdent')
+      typeIdent.numList.push(getSceneKey(scene));
+    }
   }
   return typeIdents;
 };

src/view/newFireCase/meshManager/sceneContent.vue

@@ -70,13 +70,12 @@ import {
   downQuoteSceneHash,
 } from "@/store/scene";
 import { ScenePagging } from "./pagging";
-import { QuoteSceneStatusDesc } from "@/constant/scene";
 import { OpenType, openSceneUrl } from "../../case/help";
 import { confirm } from "@/helper/message";
 import { sceneDownload } from "./quisk";
 import { sceneShare as openSceneShare } from "@/view/case/quisk";
 import { downSceneHash } from "@/request";
-import { SceneTypeDesc } from '@/constant/scene';
+import { SceneTypeDesc, QuoteSceneStatusDesc, SceneTypePaths } from '@/constant/scene';
 import { transformSWToken } from "@/store/user";
 
 const props = defineProps<{ pagging: ScenePagging }>();
@@ -98,11 +97,13 @@ const sceneDownloadHandler = (scene: QuoteScene) => {
 };
 
 const openSceneEdit = async (scene: QuoteScene, type: any) => {
+  console.log('openSceneEdit', scene, type)
   const token = await transformSWToken(scene, type);
   if (!token) return;
-  const isTest = window.location.host.includes("localhost") || window.location.host.includes("test");
-  const base = isTest ? "https://test.4dkankan.com" : "https://4dkankan.com";
-  window.open(`${base}/epg.html?m=${scene.num}&token=${token}`, "_blank");
+  let newUrl = SceneTypePaths[scene.type][1];
+  // const isTest = window.location.host.includes("localhost") || window.location.host.includes("test");
+  // const base = isTest ? "https://test.4dkankan.com" : "https://4dkankan.com";
+  window.open(`${newUrl}?m=${scene.num}&token=${token}`, "_blank");
 };
 
 // 权限弹窗：传递 num 和 isObj（由行数据或类型推断）

src/view/newFireCase/newFireDetails/components/scene.vue

@@ -157,9 +157,8 @@ import { DocumentAdd, Edit, Delete, FullScreen } from '@element-plus/icons-vue';
 import comPagination from "@/components/pagination/index.vue";
 import { Scene, SceneType, getSWKKSyncLink } from '@/store/scene';
 import { getScenePaggingOffline as getScenePagging, getFusionAndSceneList } from '@/store/editCsae';
-import { SceneTypeDesc, SceneTypePaths } from '@/constant/scene';
+import { SceneTypeDesc, SceneTypePaths, QuoteSceneStatusDesc } from '@/constant/scene';
 import { getCaseScenes, replaceCaseScenes, getSceneKey, getCaseScenesBySceneType } from '@/store/case';
-import { QuoteSceneStatusDesc } from "@/constant/scene";
 import { dateFormat } from "@/util";
 import { confirm } from '@/helper/message';
 import { ElMessage } from 'element-plus';

src/view/newFireCase/newdispatch/editFire.vue

@@ -236,7 +236,7 @@ const query = ref<{ type: number; modelTitle: string; searchType: string }>({ ty
 const typeOptions = ref([
   { label: 'Mesh场景', value: 1 },
   { label: '点云场景', value: 0 },
-  // { label: '多元融合', value: 2 },
+  { label: '多元融合', value: 2 },
 ]);
 const tableRef = ref<any>(null);
 const tableData = ref<Scene[]>([]);