修改

src/components/map/GisMap.vue

@@ -54,7 +54,6 @@ onMounted(() => {
       console.log('listen', arg);
       switch (arg.action) {
         case 'getPoint': {
-          debugger;
           const data = arg.data;
           drawPointStore.modifyCurrentDrawPointList('x', data.x);
           drawPointStore.modifyCurrentDrawPointList('y', data.y);

src/stores/drawPointManage.js

@@ -40,26 +40,31 @@ export const useDrawPointStore = defineStore('drawPointStore', () => {
     }
   };
 
+  const renderPersonPoint = () => {
+    const pointList = currentDrawPointList.value
+      .filter((item) => {
+        return item.x && item.y;
+      })
+      .sort((pre, next) => new Date(pre.date) - new Date(next.date));
+    if (pointList?.length > 0) {
+      addPoint(pointList, 'drawPoint');
+      addTrajectory(pointList, 'drawLine');
+      setTimeout(() => {
+        playTrajectory('drawLine', 160, mapStore.mapTheme == 'light' ? 'green' : 'red');
+      }, 1000);
+    }
+  };
+
   watch(
     () => currentDrawPointList.value,
     () => {
-      const pointList = currentDrawPointList.value
-        .filter((item) => {
-          return item.x && item.y;
-        })
-        .sort((pre, next) => new Date(pre.date) - new Date(next.date));
-      if (pointList?.length > 0) {
-        addPoint(pointList, 'drawPoint');
-        addTrajectory(pointList, 'drawLine');
-        setTimeout(() => {
-          playTrajectory('drawLine', 160, mapStore.mapTheme == 'light' ? 'green' : 'red');
-        }, 1000);
-      }
+      renderPersonPoint();
     },
     {
       deep: true
     }
   );
+
   return {
     currentDrawPointList,
     infoBoxIndex,
@@ -72,6 +77,7 @@ export const useDrawPointStore = defineStore('drawPointStore', () => {
     modifyTrail,
     pushCurrentDrawPointList,
     setDrawStartStatus,
-    modifyCurrentDrawPointList
+    modifyCurrentDrawPointList,
+    renderPersonPoint
   };
 });

src/stores/mapStore.js

@@ -38,8 +38,7 @@ export const useMapStore = defineStore('mapStore', () => {
     flowCarList.value = [];
   };
 
-  //切换主题后加载初始化地图
-  const initChangeMap = (is3D) => {
+  const changeTheme = (is3D) => {
     change3DTheme(is3D);
     if (is3D) {
       currentToolSelectArray.value.push('3dChange');
@@ -48,6 +47,11 @@ export const useMapStore = defineStore('mapStore', () => {
         (item) => item != '3dChange'
       );
     }
+  };
+
+  //切换主题后加载初始化地图
+  const initChangeMap = (is3D) => {
+    changeTheme(is3D);
 
     currentToolSelectArray.value.forEach((item) => {
       if (item != '3dChange' && item != 'Bidding' && item != 'flowCar') {
@@ -62,6 +66,7 @@ export const useMapStore = defineStore('mapStore', () => {
       }
     });
   };
+
   //点亮地图工具图标
   const setCurrentToolSelectArray = async (value) => {
     currentToolSelectArray.value.push(value);
@@ -153,7 +158,7 @@ export const useMapStore = defineStore('mapStore', () => {
         }
         case 'Bidding': {
           initChangeMap(true);
-          //有轨迹点
+          //有轨迹点;
           const allShowHasPoint = currentAllPointList.value.filter((item) => {
             return item?.x && item?.y && item?.ty == '有轨迹';
           });
@@ -224,6 +229,7 @@ export const useMapStore = defineStore('mapStore', () => {
     delFlowCarList,
     setCurrentToolSelectArray,
     delCurrentToolSelectArray,
-    mapTheme
+    mapTheme,
+    changeTheme
   };
 });

src/views/DataCenterGis/components/LeftMap.vue

@@ -157,7 +157,12 @@ import { ref } from 'vue';
 import { useDrawPointStore } from '@/stores/drawPointManage';
 import { useMapStore } from '@/stores/mapStore';
 import { ArrowLeftBold, ArrowRightBold, Search } from '@element-plus/icons-vue';
-import { startOutputPoint, closeOutputPoint, gotoPosition } from '@/utils/map/mapOperation.js';
+import {
+  startOutputPoint,
+  change3DTheme,
+  closeOutputPoint,
+  gotoPosition
+} from '@/utils/map/mapOperation.js';
 import {
   addTrajectorPointOnPeople,
   getGeocode,
@@ -279,11 +284,14 @@ const handleView = (scope) => {
   address.value = drawPointStore.currentDrawPointList[index]?.address || '';
   described.value = drawPointStore.currentDrawPointList[index].described || '';
   drawPointStore.modifyTrail = true;
+  //标会切至二维
+  mapStore.changeTheme(false);
   startOutputPoint(true);
   gotoPosition({
     x: row.x,
     y: row.y
   });
+  drawPointStore.renderPersonPoint();
 };
 
 //重新获取当前病例列表数据
@@ -358,6 +366,7 @@ const handleClose = () => {
   drawPointStore.modifyTrail = false;
   closeOutputPoint();
   getCurrentData();
+  mapStore.changeTheme(true);
 };
 
 const lastPoint = () => {