添加三维二维切换

public/config.js

@@ -1,5 +1,5 @@
 window.CityGisJs = 'http://10.1.161.53:9082/vmap/CityGis.Bridge.js';
 window.CityGisHtml =
-  'http://10.1.161.53:9082/vmap/GIS.html?appKey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHBsaWNhdGlvbl9pZCI6MzMsImFwcGxpY2F0aW9uX25hbWUiOiLmjZ_ogJciLCJleHAiOjE3NTIyMTgwNDZ9.3ZomslkPrbBJ2xmI0QFyaRPuL21cjuFoijDrkPazb8s&debug=false&maptype=3d&code=city&devicetype=lg&themeid=Gis&mapthemeid=undefined';
+  'http://10.1.161.53:9082/vmap/GIS.html?appKey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHBsaWNhdGlvbl9pZCI6MzMsImFwcGxpY2F0aW9uX25hbWUiOiLmjZ_ogJciLCJleHAiOjE3NTIyMTgwNDZ9.3ZomslkPrbBJ2xmI0QFyaRPuL21cjuFoijDrkPazb8s&debug=false&maptype=25d&code=city&devicetype=lg&themeid=Gis&mapthemeid=undefined';
 window.VITE_BASE_API = '/api';
 window.VITE_CityGIS_API = '/cityGIsApi';

src/stores/mapStore.js

@@ -9,7 +9,8 @@ import {
   closeOutputPoint,
   addPoint,
   fullExtent,
-  change3DTheme
+  change3DTheme,
+  regionZone
 } from '@/utils/map/mapOperation.js';
 import { getTrajectorPointOnPeople, getTrajectorPointOnCar } from '@/service/api/mapRequest.js';
 import { useDrawPointStore } from '@/stores/drawPointManage';
@@ -17,6 +18,9 @@ export const useMapStore = defineStore('mapStore', () => {
   //当前病例点位列表
   const currentToolSelectArray = ref(['newAdress', 'touch']);
 
+  //区选择
+  const selectPartKey = ref('松江区');
+
   //所有病例点位
   const currentAllPointList = ref([]);
 
@@ -31,6 +35,30 @@ export const useMapStore = defineStore('mapStore', () => {
     flowCarList.value = [];
   };
 
+  //切换主题后加载初始化地图
+  const initChangeMap = (is3D) => {
+    change3DTheme(is3D);
+    if (is3D) {
+      currentToolSelectArray.value.push('3dChange');
+    } else {
+      currentToolSelectArray.value = currentToolSelectArray.value.filter(
+        (item) => item != '3dChange'
+      );
+    }
+
+    currentToolSelectArray.value.forEach((item) => {
+      if (item != '3dChange' && item != 'Bidding' && item != 'flowCar') {
+        setCurrentToolSelectArray(item);
+        if (selectPartKey.value?.length > 0) {
+          if (selectPartKey.value == '浦东新区') {
+            regionZone('浦东');
+          } else {
+            regionZone(selectPartKey.value.split('区')[0]);
+          }
+        }
+      }
+    });
+  };
   //点亮地图工具图标
   const setCurrentToolSelectArray = async (value) => {
     currentToolSelectArray.value.push(value);
@@ -117,6 +145,7 @@ export const useMapStore = defineStore('mapStore', () => {
               imageUrl: new URL(`@/assets/image/mapTools/6.png`, import.meta.url).href
             });
           }
+          initChangeMap(true);
           //流调会商车图标
           // addTrajectory();
           // setTimeout(() => {
@@ -125,6 +154,7 @@ export const useMapStore = defineStore('mapStore', () => {
           break;
         }
         case 'Bidding': {
+          initChangeMap(true);
           //有轨迹点
           const allShowHasPoint = currentAllPointList.value.filter((item) => {
             return item?.x && item?.y && item?.ty == '有轨迹';
@@ -147,7 +177,7 @@ export const useMapStore = defineStore('mapStore', () => {
           break;
         }
         case '3dChange': {
-          change3DTheme(true);
+          initChangeMap(true);
         }
       }
     } catch (error) {
@@ -169,6 +199,7 @@ export const useMapStore = defineStore('mapStore', () => {
 
       useDrawPointStore().modifyTrail = false;
       closeOutputPoint();
+      initChangeMap(false);
     } else if (value == 'flowCar') {
       flowCarList.value.forEach((item) => {
         stopTrajectory(item);
@@ -176,8 +207,10 @@ export const useMapStore = defineStore('mapStore', () => {
       });
       closePoint(value);
       delFlowCarList();
+      initChangeMap(false);
     } else if (value == '3dChange') {
       change3DTheme(false);
+      initChangeMap();
     } else {
       closePoint(value);
     }
@@ -187,6 +220,7 @@ export const useMapStore = defineStore('mapStore', () => {
   return {
     currentToolSelectArray,
     flowCarList,
+    selectPartKey,
     currentAllPointList,
     pushFlowCarList,
     delFlowCarList,

src/utils/map/mapOperation.js

@@ -507,7 +507,7 @@ export function gotoPosition(point, color) {
 //区边界
 export function regionZone(name) {
   invokeParams('ShowData', {
-    name: 'car_layer',
+    name: 'cityLine',
     type: 'layer',
     isLocate: true,
     isHighlight: true,

src/views/DataCenterGis/components/RightPanel.vue

@@ -22,7 +22,7 @@
           class="partition-card"
           v-for="(key, index) in Object.keys(partitionData)"
           :key="index + key + ''"
-          :class="{ activeCard: selectPartKey == key }"
+          :class="{ activeCard: mapStore.selectPartKey == key }"
           @click="handleSelect(key)"
         >
           <div class="title">{{ key }}</div>
@@ -150,7 +150,13 @@ import {
 import { stackRightOptions, stackLeftOptions } from '@/utils/chartsOptions.js';
 import { useMapStore } from '@/stores/mapStore.js';
 import { useDrawPointStore } from '@/stores/drawPointManage.js';
-import { addPoint, gotoPosition, regionZone } from '@/utils/map/mapOperation.js';
+import {
+  addPoint,
+  gotoPosition,
+  regionZone,
+  closePoint,
+  fullExtent
+} from '@/utils/map/mapOperation.js';
 const partitionData = ref({});
 const mapStore = useMapStore();
 const drawPointStore = useDrawPointStore();
@@ -261,7 +267,13 @@ const handleView = (row) => {
 const selectPartKey = ref('');
 //选择区
 const handleSelect = (key) => {
-  selectPartKey.value = key;
+  closePoint('cityLine');
+  if (mapStore.selectPartKey == key) {
+    mapStore.selectPartKey = '';
+    fullExtent();
+    return;
+  }
+  mapStore.selectPartKey = key;
   if (key == '浦东新区') {
     regionZone('浦东');
   } else {

src/views/DataCenterGis/components/Tools.vue

@@ -14,12 +14,12 @@ import { useMapStore } from '@/stores/mapStore.js';
 const mapStore = useMapStore();
 //地图工具图例
 const toolsOptions = [
-  // {
-  //   id: '3dChange',
-  //   name: '三维转换',
-  //   image: new URL(`@/assets/image/mapTools/3D.png`, import.meta.url).href,
-  //   activeImage: new URL(`@/assets/image/mapTools/2D.png`, import.meta.url).href
-  // },
+  {
+    id: '3dChange',
+    name: '三维转换',
+    image: new URL(`@/assets/image/mapTools/3D.png`, import.meta.url).href,
+    activeImage: new URL(`@/assets/image/mapTools/2D.png`, import.meta.url).href
+  },
   {
     id: 'newAdress',
     name: '新址',