Browse Source

功能修改20250319-01

zhiyuan-007 1 week ago
parent
commit
3ffc737d4b
3 changed files with 54 additions and 53 deletions
  1. 2 2
      src/components/MapView.vue
  2. 51 50
      src/store/map.js
  3. 1 1
      src/views/home/cpns/PanelQjchs.vue

+ 2 - 2
src/components/MapView.vue

@@ -25,11 +25,11 @@ export default {
 			}, 2500)
 			myBridge.bridgeContent = bridge = new CityGis.Bridge({
 				id: 'i_map',
-				url: 'http://localhost:5173/map-tool-widget/',
+				//url: 'http://localhost:5173/map-tool-widget/',
 				// url: 'http://10.1.163.210:5173/map-tool-widget/#/jk_map',
 				// url: 'http://58.34.215.19:8100/map-tool-widget/',
 				// url: 'https://cimweb.zjw.sh.cegn.cn:2007/map-tool-widget/#/',
-				// url: 'http://58.34.215.19:8095/map-tool-widget/#/jk_map',
+				url: 'http://58.34.215.19:8095/map-tool-widget/#/jk_map',
 				onReady: function () {
 					console.log('地图创建完成')
 				},

+ 51 - 50
src/store/map.js

@@ -1,51 +1,52 @@
-import { defineStore } from "pinia";
+import { defineStore } from 'pinia'
 export const useMapStore = defineStore('map', {
-    state: () => ({
-        // layerShow:true,  //服务列表是否开启
-        // currentLayerType:"mainPage", //当前服务列表类型
-        // currentLayerList:[ {
-        //     "label": "全市白模",
-        //     "D_CODE": "D85030103202409",
-        //     "S_CODE": "D8503010320240901",
-        //     "ADDRESS": "https://cimweb.zjw.sh.cegn.cn:2008/MapProxyApi/getSceneServer/ptgl/05195418",
-        //     "chosen":true,
-        //     "TYPE": "scene",
-        // }],  //当前服务列表
-        // currentNum:null,
-        // currentLayer:null,
-        scale:null,
-        // whiteMoldState:false,   //白模状态
-        camera:{      //相机信息
-            heading:null,
-            tilt:null,
-            position:{
-                x:null,
-                y:null,
-                z:null
-            }
-        },
-        center:null,
-        extent:null,
-        // layerDetailObj:{},    //当前服务详情
-        // layerDetailShow:false,   //服务详情是否开启
-        // left_board:true,     //左侧板是否开启
-        // right_board:false,    //右侧板是否开启
-        // path_planShow:false,   //路线规划是否开启
-        // simulate_flyShow:false,   //模拟飞行是否开启
-        draw_geometry:null,   //绘制的几何
-        gridCode:null,   //当前网格编码
-        uavId:null, //当前无人机编码
-        flyInfo:null, //当前无人机信息
-        currentUavInfo:null,
-        realTimeUAVList:[], //实时无人机列表
-        isFollow:false, //是否跟随无人机
-        queryResult:[], //查询结果
-        cubeResult:[], //查询结果
-    }),
-    persist: true,
-    actions: {
-        //   setCameraInfo(data){
-        //       this.camera = data
-        //   }
-    }
-})
+	state: () => ({
+		// layerShow:true,  //服务列表是否开启
+		// currentLayerType:"mainPage", //当前服务列表类型
+		// currentLayerList:[ {
+		//     "label": "全市白模",
+		//     "D_CODE": "D85030103202409",
+		//     "S_CODE": "D8503010320240901",
+		//     "ADDRESS": "https://cimweb.zjw.sh.cegn.cn:2008/MapProxyApi/getSceneServer/ptgl/05195418",
+		//     "chosen":true,
+		//     "TYPE": "scene",
+		// }],  //当前服务列表
+		// currentNum:null,
+		// currentLayer:null,
+		scale: null,
+		// whiteMoldState:false,   //白模状态
+		camera: {
+			//相机信息
+			heading: null,
+			tilt: null,
+			position: {
+				x: null,
+				y: null,
+				z: null,
+			},
+		},
+		center: null,
+		extent: null,
+		// layerDetailObj:{},    //当前服务详情
+		// layerDetailShow:false,   //服务详情是否开启
+		// left_board:true,     //左侧板是否开启
+		// right_board:false,    //右侧板是否开启
+		// path_planShow:false,   //路线规划是否开启
+		// simulate_flyShow:false,   //模拟飞行是否开启
+		draw_geometry: null, //绘制的几何
+		gridCode: null, //当前网格编码
+		uavId: null, //当前无人机编码
+		flyInfo: null, //当前无人机信息
+		currentUavInfo: null,
+		realTimeUAVList: [], //实时无人机列表
+		isFollow: false, //是否跟随无人机
+		queryResult: [], //查询结果
+		cubeResult: {}, //查询结果
+	}),
+	persist: true,
+	actions: {
+		//   setCameraInfo(data){
+		//       this.camera = data
+		//   }
+	},
+})

+ 1 - 1
src/views/home/cpns/PanelQjchs.vue

@@ -345,7 +345,7 @@ watch(
 watch(
 	() => mapStore.cubeResult,
 	(val) => {
-		formatResult(val)
+		formatResult(val.data)
 	},
 	{ deep: true }
 )