1

src/app/fire/view/dispatch/editLeaveMsg.vue

@@ -19,6 +19,8 @@ import { addFireLeaveMsg } from "@/app/fire/store/fire";
 
 const props = defineProps<{
   projectId: string;
+  refresh: any;
+  onQuit: any;
 }>();
 const content = ref("");
 
@@ -32,6 +34,8 @@ defineExpose<QuiskExpose>({
       content: content.value,
       projectId: props.projectId,
     });
+    props.refresh()
+    return true
   },
 });
 </script>

src/app/fire/view/dispatch/index.vue

@@ -145,7 +145,7 @@ const revokeTeaching = async (row?: Fire) => {
 const showMessageHandler = (row: Fire) => {
   showLeaveMsgList({
     projectId: row.id,
-    onAddLeaveMsg: () => addLeaveMsg({ projectId: row.id }),
+    onAddLeaveMsg: (refresh) => addLeaveMsg({ projectId: row.id, refresh }),
   });
 };
 

src/app/fire/view/dispatch/leaveMsgList.vue

@@ -52,7 +52,7 @@ import { QuiskExpose } from "@/helper/mount";
 
 const props = defineProps<{
   projectId: string;
-  onAddLeaveMsg: (projectId: string) => boolean | Promise<boolean>;
+  onAddLeaveMsg: (refresh: any) => boolean | Promise<boolean>;
 }>();
 
 const { state, refresh, changPageSize, changPageCurrent } = usePagging({
@@ -66,9 +66,7 @@ const format = (date: number) => dateFormat(new Date(date), "yyyy-MM-dd hh:mm");
 
 defineExpose<QuiskExpose>({
   async submit() {
-    if (await props.onAddLeaveMsg(props.projectId)) {
-      refresh();
-    }
+    await props.onAddLeaveMsg(refresh)
     throw "不退出";
   },
 });

src/store/editCsae.ts

@@ -348,7 +348,7 @@ export const getMix3dPaggingOffline = async (params: ScenePaggingParams): Promis
       return { list: [], total: 0 } as PaggingRes<any>;
     }
   }
-  return (await axios.post(getMix3dList, { params })).data as PaggingRes<any>;
+  return (await axios.post(getMix3dList, { ...params })).data as PaggingRes<any>;
 };
 
 // =============== 现场勘验：照片制卷列表（离线支持） ===============

src/util/index.ts

@@ -1,7 +1,8 @@
 import { Base64 } from "js-base64";
 import { positionTransform } from "./mt4";
 
-export const dateFormat = (date: Date, fmt: string) => {
+export const dateFormat = (dates: Date, fmt: string) => {
+  let date = new Date(dates);
   var o: any = {
     "M+": date.getMonth() + 1, //月份
     "d+": date.getDate(), //日

src/view/newFireCase/mix3dManager/sceneContent.vue

@@ -9,7 +9,7 @@
     style="width: 100%"
     size="large"
   >
-    <el-table-column label="场景标题" prop="name">
+    <el-table-column label="标题" prop="name">
       <template v-slot:default="{ row }">
         <span class="oper-span" @click="openFusionView(row)">{{ row.fusionTitle }}</span>
       </template>

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

@@ -405,7 +405,7 @@ const searchAMapAddress = async () => {
 const handleMapConfirm = (LocationInfo: any) => {
   console.log(LocationInfo, 666)
   const {cityname, adname, address, name, location} = LocationInfo;
-  bindFire.value.mapUrl = cityname + adname + address + name;
+  bindFire.value.mapUrl = cityname?`${cityname+ adname + address + name}`:name;
   bindFire.value.latlng = bindFire.value.latAndLong = `${location.lat},${location.lng}`;
   showMapDialog.value = false;
 }

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

@@ -161,7 +161,10 @@ const initMap = async () => {
     });
 
     AMapUI.loadUI(['misc/PoiPicker'], function(PoiPicker) {
-
+    // 正确：异步加载插件后再实例化
+    AMap.plugin("AMap.Geocoder", () => {
+      geocoder = new AMap.Geocoder();
+    });
     poiPicker = new PoiPicker({
         input: 'searchInput',
         placeSearchOptions: {
@@ -283,14 +286,20 @@ const locateByCoordinates = (lat: number, lng: number) => {
     //     city: "", //城市设为北京，默认：“全国”
     //     radius: 1000 //范围，默认：500
     // });
-    // geocoder.getAddress(lngLat, function(status, result) {
-    //         if (status === 'complete'&&result.regeocode) {
-    //             var address = result.regeocode.formattedAddress;
-    //             console.log('经纬度定位address:', address)
-    //         }else{
-    //           ElMessage.success('根据经纬度查询地址失败')
-    //         }
-    //     });
+    geocoder.getAddress(lngLat, function(status, result) {
+            if (status === 'complete'&&result.regeocode) {
+                var address = result.regeocode.formattedAddress;
+                selectedLocation.value = {
+                  ...result.regeocode.addressComponent,
+                  location: lngLat,
+                  name: address,
+                  lat: lat,
+                  lng: lng
+                };//选中的信息
+            }else{
+              // ElMessage.success('根据经纬度查询地址失败')
+            }
+        });
     console.log('经纬度定位:', searchResults)
     ElMessage.success('经纬度定位成功')
   } catch (error) {

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

@@ -77,6 +77,7 @@
        <el-table
          ref="tableRef"
          :data="tableData"
+         show-overflow-tooltip
          height="420"
          style="width: 100%"
          border
@@ -94,9 +95,9 @@
              {{ row.deptName }}
            </template>
          </el-table-column>
-         <el-table-column label="拍摄时间" width="200">
+         <el-table-column label="创建时间" width="200">
            <template #default="{ row }">
-             {{ row.createTime }}
+             {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
            </template>
          </el-table-column>
        </el-table>
@@ -132,6 +133,7 @@ import { user } from "@/store/user";
 import { isOfflineMode } from '@/util/offline'
 const url = import.meta.env.VITE_SEVER_URL || 'https://mix3d.4dkankan.com';
 const nowRouteName = import.meta.env.VITE_APP_APP;
+import { dateFormat } from "@/util";
 
 const route = useRoute();
 const router = useRouter();
@@ -190,11 +192,11 @@ const onDelete = async (scene: any) => {
   if ((scenes.value || []).length <= 1) {
     const sceneList = (await getFusionAndSceneList({ caseId: caseId.value, type: 'scene' })) as unknown as any[];
     if (!sceneList || sceneList.length === 0) {
-      ElMessage.error('至少保留一个实景三维/多元融合场景');
+      ElMessage.error('至少保留一个实景三维/多元融合');
       return;
     }
   }
-  if (await confirm('确定要移除当前融合场景吗？')) {
+  if (await confirm('确定要移除当前多元融合吗？')) {
     const delId = String((scene as any)?.fusionId || '');
     const newList = (scenes.value || []).filter((s: any) => String(s?.fusionId || '') !== delId);
     const fusionIds = newList.map((s: any) => s?.fusionId).filter((v: any) => v !== undefined && v !== null);
@@ -224,6 +226,7 @@ const importedIdSet = computed(() => {
     const id = String((s && (s.fusionId ?? s.id)) || '');
     if (id) set.add(id);
   });
+  console.log('importedIdSet', set);
   return set;
 });
 const selectedIdSet = computed(() => {
@@ -306,6 +309,7 @@ const onSelectionChange = (rows: any[]) => {
     map.set(rowKey(r), r);
   });
   selectedRows.value = Array.from(map.values());
+  console.log('selectedRows', selectedRows.value);
 };
 
 const onConfirmEdit = async () => {

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

@@ -154,7 +154,7 @@ 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 } from '@/constant/scene';
+import { SceneTypeDesc, SceneTypePaths } from '@/constant/scene';
 import { getCaseScenes, replaceCaseScenes, getSceneKey, getCaseScenesBySceneType } from '@/store/case';
 import { confirm } from '@/helper/message';
 import { ElMessage } from 'element-plus';
@@ -284,11 +284,11 @@ const onOpen = async (scene: Scene) => {
   let type = [0, 1, 3, 4, 6].includes(Number(scene.sceneType)) ? 1 : 0;
   const token = await transformSWToken(scene, type);
   if(!token) return;
-  let newUrl = ''
+  let newUrl = SceneTypePaths[scene.sceneType][1];
   if(window.location.host.includes('localhost') || window.location.host.includes('test')){
-    newUrl = `https://test.4dkankan.com/epg.html?m=${scene.num}&token=${token}`
+    newUrl += `?m=${scene.num}&token=${token}`
   } else {
-    newUrl = `https://4dkankan.com/epg.html?m=${scene.num}&token=${token}`
+    newUrl += `?m=${scene.num}&token=${token}`
   }
   window.open(newUrl, '_blank');
 };
@@ -486,7 +486,7 @@ onMounted(async () => {
   display: flex;
   .let-bar{
     width: 510px;
-    height: 100%;
+    height: calc(100% - 221.36px);
     overflow: auto;
     .no-data{
       line-height: 100px;

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

@@ -258,7 +258,7 @@
         <!-- 现场图右侧：图片查看器 -->
         <template v-if="activeTab === 'scene'">
           <div v-if="currentSceneImageUrl" class="scene-image" @click="showViewer = true">
-            <el-image :src="currentSceneImageUrl" fit="contain" class="inline-image" />
+            <el-image :src="currentSceneImageUrl" loading="lazy" fit="contain" class="inline-image" />
             <!-- <div class="click-tip">点击图片放大</div> -->
           </div>
           <div class="viewer-placeholder" v-else>选择左侧图片进行查看</div>

src/view/newFireCase/newdispatch/editFire.vue

@@ -50,7 +50,6 @@
             height="420"
             style="width: 100%"
             :row-class-name="rowClassName"
-            v-loading="tableLoading"
             @selection-change="onSelectionChange"
           >
             <el-table-column type="selection" width="48" :selectable="isRowSelectable" />
@@ -71,7 +70,7 @@
             </el-table-column>
             <el-table-column label="拍摄时间" width="200">
               <template #default="{ row }">
-                {{ row.createTime }}
+              {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
               </template>
             </el-table-column>
           </el-table>