1

.env.development

@@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = ./
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
 # VITE_PROXY = [["/service","http://192.168.9.27:1804"], ["/fusion","http://192.168.9.27:1804"]]
-VITE_PROXY = [["/service","http://192.168.0.43:8808"], ["/fusion","http://192.168.0.43:8808"]]
+VITE_PROXY = [["/service","http://192.168.0.43:8088"], ["/fusion","http://192.168.0.43:8088"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console

src/views/diversity/list.vue

@@ -18,7 +18,7 @@
               v-if="record.fusionTitle"
               target="_blank"
               :title="record.fusionTitle"
-              :href="`/code/index.html?caseId=${record.caseId}#/show`"
+              :href="`/code/index.html?caseId=${record.fusionId}#/show`"
               >{{ record.fusionTitle }}</a
             >
             <span v-else>-</span>
@@ -28,7 +28,7 @@
               v-if="record.caseTitle"
               target="_blank"
               :title="record.caseTitle"
-              :href="`/code/index.html?caseId=${record.caseId}#/show`"
+              :href="`/mix3d/#/home/${record.caseId}`"
               >{{ record.caseTitle }}</a
             >
             <span v-else>-</span>
@@ -456,9 +456,6 @@
           }
         });
       }
-      function handleEdit(record: Recordable) {
-        window.open(record.thumbEdit + '&&token=' + token.value);
-      }
       async function handleGenerate(record: Recordable) {
         console.log('record', record);
         let data = await sceneDetail({ id: record.id });
@@ -505,13 +502,9 @@
         return getCheckPerm(val) || getCheckPerm(`${val}-${myType}`);
       }
       function handlegotoEdit(record) {
-        window.open(`/mix3d/#/home/${record.caseId}`);
-        // let url = record.webSite.replace('smg', 'epg');
-        // if (!record.editAuthTime || (record.editAuthTime && dayjs() < dayjs(record.editAuthTime))) {
-        //   window.open(url);
-        // } else {
-        //   createMessage.error('编辑权限已过期');
-        // }
+        // window.open(`/mix3d/#/home/${record.caseId}`);
+        let url = `/code/index.html?caseId=${record.fusionId}#/fuseEdit/merge`;
+        window.open(url);
       }
       function handlePowers(record: Recordable) {
         openPowersModal(true, {

src/views/draw/list.vue

@@ -11,7 +11,7 @@
           <template #toolbar>
             <a-button
               type="primary"
-              @click="handleAdd"
+              @click="handleAdd('overview')"
               v-if="getCheckPerm('case-Add') && tableType == 0"
             >
               新增</a-button
@@ -66,10 +66,10 @@
           <template #toolbar>
             <a-button
               type="primary"
-              @click="handleAdd"
+              @click="handleAdd('tabulation')"
               v-if="getCheckPerm('case-Add') && tableType == 0"
             >
-              新增案件</a-button
+              新增</a-button
             >
           </template>
 
@@ -314,7 +314,9 @@
       function handlegoRename(record) {
         openRenameModal(
           true,
-          tableType.value ? { overviewId: record.id, newTitle: record.title } : { tabulationId: record.id, newTitle: record.title },
+          tableType.value
+            ? { overviewId: record.id, newTitle: record.title }
+            : { tabulationId: record.id, newTitle: record.title },
         );
 
         // createPrompt({
@@ -329,8 +331,15 @@
         // });
       }
 
-      function handleAdd() {
-        openAddModal(true, {});
+      function handleAdd(type) {
+        // openAddModal(true, {});
+        if (type == 'overview') {
+          window.open(`/draw/#/overview`);
+          // window.open(`/draw/#/overview?caseId=${caseId.value}`);
+        } else {
+          // window.open(`/draw/#/tabulation?caseId=${caseId.value}&tabulationId=${res.id}`);
+          window.open(`/draw/#/tabulation`);
+        }
         // router.push({ path: '/scene/add' });
       }
       function reload() {
@@ -413,7 +422,11 @@
 
       function handleDownload(record: Recordable) {
         console.log('handleDownload', record, canDownload.value);
-        downloadByUrl({url:record.listCover || record.mapUrl, target: '_blank', fileName: record.title + '.jpg'})
+        downloadByUrl({
+          url: record.listCover || record.mapUrl,
+          target: '_blank',
+          fileName: record.title + '.jpg',
+        });
       }
       function handleEdit(record: Recordable) {
         window.open(record.thumbEdit + '&&token=' + token.value);
@@ -464,13 +477,11 @@
         return getCheckPerm(val) || getCheckPerm(`${val}-${myType}`);
       }
       function handlegotoEdit(record) {
-        // window.open(`/mix3d/#/home/${record.caseId}`);
-        // let url = record.webSite.replace('smg', 'epg');
-        // if (!record.editAuthTime || (record.editAuthTime && dayjs() < dayjs(record.editAuthTime))) {
-        //   window.open(url);
-        // } else {
-        //   createMessage.error('编辑权限已过期');
-        // }
+        if (!tableType.value) {
+          window.open(`/draw/#/tabulation?caseId=${record.caseId}&tabulationId=${record.id}`);
+        } else {
+          window.open(`/draw/#/overview?caseId=${record.id}`);
+        }
       }
       function handlePowers(record: Recordable) {
         openPowersModal(true, {