1

src/view/material/index.vue

@@ -25,7 +25,7 @@
           >
             绘制方位图
           </el-button>
-          <div class="phote my-4 w-full">
+          <!-- <div class="phote my-4 w-full">
             <p class="pb-2 title1">平面图</p>
             <div class="pmt-phote w-full flex justify-between ">
               <viewImg :list="list.pmt" delete  @handleItem="handleoverviewItem" height="66px" />
@@ -36,6 +36,12 @@
             <div class="pmt-phote w-full flex justify-between ">
               <viewImg :list="list.fwt || []" delete  @handleItem="handletabulationItem" height="66px" />
             </div>
+          </div> -->
+          <div class="phote my-4 w-full" v-for="item,index in list.xct" :key="index" v-show="item.caseFilesList?.length">
+            <p class="pb-2 title1">{{item.filesTypeName}}</p>
+            <div class="pmt-phote w-full flex justify-between ">
+              <viewImg :list="item.caseFilesList || []"  @handleItem="handleoverviewItem" height="66px" />
+            </div>
           </div>
         </div>
       </el-tab-pane>
@@ -170,23 +176,23 @@ const handleClick = (tab) => {
   console.log(tab);
 };
 const getcaseByCaseIdList = async () =>{
-  let pmt = await caseOverview(caseId.value)
-  let fwt = await getcaseByCaseId(caseId.value)
+  // let pmt = await caseOverview(caseId.value)
+  // let fwt = await getcaseByCaseId(caseId.value)
 
-    list.value.pmt = pmt.map(ele =>{
-      let mapUrl = ele.mapUrl || ele.listCover
-      return {
-        ...ele,
-        mapUrl: mapUrl,
-      }
-    })
-    list.value.fwt = fwt.map(ele =>{
-      let mapUrl = ele.mapUrl || ele.listCover
-      return {
-        ...ele,
-        mapUrl: mapUrl,
-      }
-    })
+  //   list.value.pmt = pmt.map(ele =>{
+  //     let mapUrl = ele.mapUrl || ele.listCover
+  //     return {
+  //       ...ele,
+  //       mapUrl: mapUrl,
+  //     }
+  //   })
+  //   list.value.fwt = fwt.map(ele =>{
+  //     let mapUrl = ele.mapUrl || ele.listCover
+  //     return {
+  //       ...ele,
+  //       mapUrl: mapUrl,
+  //     }
+  //   })
   //   console.log('getcaseByCaseId', res)
   // })
 }
@@ -210,6 +216,7 @@ const gotoDraw = async (type: BoardType, id: number) => {
       mapUrl
     })
     getcaseByCaseIdList()
+    getList()
     window.open(`/draw/#/tabulation?caseId=${caseId.value}&tabulationId=${res.id}`);
   }
   // router.push({
@@ -247,24 +254,25 @@ const resetForm = (formEl) => {
 function handleActive(params) {
   console.log("handleActive", params);
 }
-function handletabulationItem(type, item) {
-  console.log("handleoverviewItem", type, item);
-  if('edit' == type) {
-    window.open(`/draw/#/tabulation?caseId=${caseId.value}&tabulationId=${item.id}`);
-    // gotoDraw(item.filesTypeId != pmtId.value? BoardType.scene : BoardType.map, item.filesId)
-  }else{
-    getList()
-  }
-}
 function handleoverviewItem(type, item) {
   console.log("handleoverviewItem", type, item);
   if('edit' == type) {
-    window.open(`/draw/#/overview?caseId=${caseId.value}&overviewId=${item.id}`);
+    let url = item.filesTitle == '平面图'? `/draw/#/overview?caseId=${caseId.value}&overviewId=${item.overviewId}`:`/draw/#/tabulation?caseId=${caseId.value}&tabulationId=${item.tabulationId}`;
+    window.open(url);
     // gotoDraw(item.filesTypeId != pmtId.value? BoardType.scene : BoardType.map, item.filesId)
   }else{
     getList()
   }
 }
+// function handleoverviewItem(type, item) {
+//   console.log("handleoverviewItem", type, item);
+//   if('edit' == type) {
+//     window.open(`/draw/#/overview?caseId=${caseId.value}&overviewId=${item.id}`);
+//     // gotoDraw(item.filesTypeId != pmtId.value? BoardType.scene : BoardType.map, item.filesId)
+//   }else{
+//     getList()
+//   }
+// }
 function handleItem(type, item) {
   console.log("handleItem", type, item);
   if('edit' == type) {

vite.config.ts

@@ -46,12 +46,12 @@ export default defineConfig({
     host: "0.0.0.0",
     proxy: {
       "/api": {
-        target: dev ? "http://192.168.0.25" : "mix3d.4dkankan.com",
+        target: dev ? "http://survey.4dkankan.com" : "mix3d.4dkankan.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(new RegExp(`^/api`), ""),
       },
       "/fusion": {
-        target: dev ? "http://192.168.0.25" : "mix3d.4dkankan.com",
+        target: dev ? "http://survey.4dkankan.com" : "mix3d.4dkankan.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(new RegExp(`^/api`), "/fusion"),
       },
@@ -70,7 +70,7 @@ export default defineConfig({
         rewrite: (path) => path.replace(new RegExp(`^/swkk`), ""),
       },
       "/service": {
-        target: dev ? "http://192.168.0.25" : "https://www.4dkankan.com",
+        target: dev ? "http://survey.4dkankan.com" : "https://www.4dkankan.com",
         changeOrigin: true,
       },
       "/swss": {