src/assets/DicData/KeyName_CN.js

@@ -12,7 +12,7 @@ const dictionary = {
 		1: "已提交"
 	},
 	targetType: {
-		0: "固定目标",
+		0: "点目标",
 		1: "移动目标",
 		2: "区域目标",
 		3: "线目标",

src/components/cesiumViewer/cesiumViewer.vue

@@ -5,7 +5,7 @@
 
 <script>
 import cesiumEntityUtils from "@/utils/cesiumEntityUtils";
-import GlobleCountryLine from "../../assets/MapData/GlobleCountryLine.json";
+// import GlobleCountryLine from "../../assets/MapData/GlobleCountryLine.json";
 import {number} from "echarts/lib/export";
 
 let viewer;
@@ -13,20 +13,14 @@ export default {
 	name: "cesiumViewer",
 	data() {
 		return {
-			globleLines: GlobleCountryLine,
-			locationLonLat: [],
+			// globleLines: GlobleCountryLine,
 			rwxxztVis: null,
 			projectEntitys: {},
-			showAll: true
+			showAll: true,
+			pointsIndex: 0
 		};
 	},
 	computed: {
-		mapPoint() {
-			return this.$store.state.xqglMapPointVisible
-		},
-		mapRectangle() {
-			return this.$store.state.xqglMapRectangleVisible
-		},
 		clickedTargetRow() {
 			return this.$store.state.xqglClickedTargetRowForCesiumSetView
 		},
@@ -50,24 +44,6 @@ export default {
 			},
 			immediate: true,
 		},
-		locationLonLat: {
-			deep: true,
-			handler(newval) {
-				this.$store.dispatch("xqglMapPointLonLat", newval)
-			}
-		},
-		mapPoint(newPoint) {
-			// this.moveEntities(this.thisviewer);
-			this.moveMapLeftEventMonitor(window.viewer);
-			console.log("地图上得到点击,地图点选的信息：", newPoint);
-			this.mapClickPointAdd(window.viewer)
-		},
-		mapRectangle(newRec) {
-			// this.moveEntities(this.thisviewer);
-			this.moveMapLeftEventMonitor(window.viewer)
-			console.log("地图上得到点击,地图框选的信息：", newRec);
-			this.mapDrawRectangle(window.viewer)
-		},
 		clickedTargetRow(newClickedRow) {
 			//测试点位添加
 			const viewer = window.viewer;
@@ -170,6 +146,7 @@ export default {
 				//   maximumLevel: 7,
 				//   show: false
 				// }),
+				infoBox: false,
 				imageryProvider: new Cesium.ArcGisMapServerImageryProvider({
 					// url: window.mapUrl + ":9109/map/?z={z}&x={x}&y={y}",
 					url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
@@ -179,6 +156,7 @@ export default {
 				}),
 				animation: true,//true
 				baseLayerPicker: false,
+				selectionIndicator: false,
 				geocoder: false,
 				homeButton: false,
 				sceneModePicker: false,
@@ -191,7 +169,7 @@ export default {
 			// )
 			viewer.clock.shouldAnimate = true;
 			viewer._cesiumWidget._creditContainer.style.display = "none";
-			viewer.scene.globe.enableLighting = true;
+			// viewer.scene.globe.enableLighting = true;
 			viewer.camera.setView({
 				destination: Cesium.Cartesian3.fromDegrees(115.48, 32.67, 40000000.0),
 				orientation: {
@@ -205,12 +183,6 @@ export default {
 			document.oncontextmenu = function () {
 				return false
 			}
-
-			let handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas);
-			let tempStore = this.$store
-			handler.setInputAction(function (click) {
-				tempStore.dispatch("xqglContentVisible", true)
-			}, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
 		},
 		componentsEvents() {
 			let self = this;
@@ -233,6 +205,10 @@ export default {
 				let datasource = cesiumEntityUtils.getCustomLayer(viewer, "xqgl");
 				if (datasource) {
 					datasource.entities.removeById("selectTarget");
+					for (let i = 0; i < self.pointsIndex; i++) {
+						datasource.entities.removeById("selectTarget" + i);
+					}
+					self.pointsIndex = 0
 				}
 				self.addTargetList("xqgl", datas)
 			})
@@ -241,6 +217,10 @@ export default {
 				let datasource = cesiumEntityUtils.getCustomLayer(viewer, "xqgl");
 				if (datasource) {
 					datasource.entities.removeById("selectTarget");
+					for (let i = 0; i < self.pointsIndex; i++) {
+						datasource.entities.removeById("selectTarget" + i);
+					}
+					self.pointsIndex = 0
 				}
 			})
 			//专题切换通知
@@ -289,10 +269,12 @@ export default {
 				self.displayTimeLine(show);
 			})
 			this.$events.on("sys-showTrack", (type) => {
-				this.initView(viewer, type);
-				this.isTrackShow(undefined, type);
+				self.initView(viewer, type);
+				self.isTrackShow(undefined, type);
+			})
+			this.$events.on("map-select", (type) => {
+				self.selectEntityByType(viewer, type)
 			})
-
 		},
 		changeViewerModel() {
 			viewer.scene.mode == Cesium.SceneMode.SCENE3D ? (viewer.scene.mode = Cesium.SceneMode.SCENE2D) : (viewer.scene.mode = Cesium.SceneMode.SCENE3D);
@@ -329,58 +311,91 @@ export default {
 		moveMapLeftEventMonitor(viewer) {
 			viewer.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
 		},
-		mapClickPointAdd(viewer) {
+
+		selectEntityByType(viewer, type) {
 			let self = this;
+			let clickPoint = [];
+			let line = [];
+			let points = [];
 			let handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas);
+			cesiumEntityUtils.addCustomLayer(viewer, "xqgl")
+			let datasource = cesiumEntityUtils.getCustomLayer(viewer, "xqgl");
+			let pointLength = 0;
+			datasource.entities.removeById("selectTarget");
+			for (let i = 0; i < self.pointsIndex; i++) {
+				datasource.entities.removeById("selectTarget" + i);
+			}
+			self.pointsIndex = 0
 			handler.setInputAction(function (event) {
-				cesiumEntityUtils.addCustomLayer(viewer, "xqgl")
-				let datasource = cesiumEntityUtils.getCustomLayer(viewer, "xqgl");
-				let clickPosition = viewer.scene.camera.pickEllipsoid(event.position);
-				let radiansPos = Cesium.Cartographic.fromCartesian(clickPosition);
-				cesiumEntityUtils.flyToTargetPoint(viewer, Cesium.Math.toDegrees(radiansPos.longitude), Cesium.Math.toDegrees(radiansPos.latitude), 20000000);
-				if (datasource) {
-					datasource.entities.removeById("selectTarget");
-					datasource.entities.add({
-						id: 'selectTarget',
-						position: clickPosition,
-						point: {
-							color: Cesium.Color.YELLOW,
-							pixelSize: 10
+				let clickPosition = viewer.scene.camera.pickEllipsoid(event.position, viewer.scene.globe.ellipsoid);
+				if (Cesium.defined(clickPosition)) {
+					let radiansPos = Cesium.Cartographic.fromCartesian(clickPosition);
+					if (type === 'selectPoint') {
+						datasource.entities.removeById("selectTarget");
+						cesiumEntityUtils.flyToTargetPoint(viewer, Cesium.Math.toDegrees(radiansPos.longitude), Cesium.Math.toDegrees(radiansPos.latitude), 20000000);
+						datasource.entities.add({
+							id: 'selectTarget',
+							position: clickPosition,
+							point: {
+								color: Cesium.Color.YELLOW,
+								pixelSize: 10
+							}
+						})
+						handler.setInputAction(() => {
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+							self.$events.emit('map-selectresult', {
+								type: type,
+								data: [Cesium.Math.toDegrees(radiansPos.longitude).toFixed(3), Cesium.Math.toDegrees(radiansPos.latitude).toFixed(3)]
+							})
+						}, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+					}
+					if (type === 'selectLine') {
+						if (line.length === 0) {
+							line = [Cesium.Math.toDegrees(radiansPos.longitude).toFixed(3), Cesium.Math.toDegrees(radiansPos.latitude).toFixed(3)];//还没有点，添加第一个点
+							datasource.entities.add({
+								id: 'selectTarget',
+								polyline: {
+									positions: new Cesium.CallbackProperty(() => {
+										return Cesium.Cartesian3.fromDegreesArray(line)
+									}, false),
+									width: 5,
+									material: Cesium.Color.YELLOW,
+									clampToGround: true,
+								},
+							})
+							handler.setInputAction((movement) => {
+								const newPosition = viewer.scene.camera.pickEllipsoid(movement.endPosition);
+								if (Cesium.defined(newPosition)) {
+									const newPositionPos = Cesium.Cartographic.fromCartesian(newPosition);
+									if (Cesium.defined(newPosition)) {
+										line[2] = Cesium.Math.toDegrees(newPositionPos.longitude).toFixed(3);
+										line[3] = Cesium.Math.toDegrees(newPositionPos.latitude).toFixed(3);
+									}
+								}
+							}, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+						} else {
+							self.$events.emit('map-selectresult', {
+								type: type,
+								data: line
+							})
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE)
 						}
-					})
-				}
-				self.locationLonLat = [];
-				self.locationLonLat.push(Cesium.Math.toDegrees(radiansPos.longitude));
-				self.locationLonLat.push(Cesium.Math.toDegrees(radiansPos.latitude));
-			}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-		},
-		mapDrawRectangle(viewer) {
-			if (viewer) {
-				const self = this;
-				let clickPoint = [];
-				let sefstore = this.$store
-				// 鼠标左键绘制
-				let handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas);
-				handler.setInputAction(function (movement) {
-					const earthPosition = viewer.camera.pickEllipsoid(movement.position, viewer.scene.globe.ellipsoid); //当前世界坐标笛卡尔积
-					if (Cesium.defined(earthPosition)) {
+					}
+					if (type === 'selectRegion') {
 						// 判断现在是第几个点
 						if (clickPoint.length === 0) { //还没有点，添加第一个点
-							clickPoint.push(earthPosition)
-						} else {
-							//绘制矩形
-							clickPoint.push(earthPosition)
+							clickPoint.push(clickPosition)
 							// 绘制矩形
-							const rectangleHand = Cesium.Rectangle.fromCartesianArray(clickPoint)
-							cesiumEntityUtils.addCustomLayer(viewer, "xqgl")
-							let datasource = cesiumEntityUtils.getCustomLayer(viewer, "xqgl");
 							if (datasource) {
-								datasource.entities.removeById("selectTarget");
 								datasource.entities.add({
 									id: 'selectTarget',
 									name: 'drawRectangle',
 									rectangle: {
-										coordinates: rectangleHand,
+										coordinates: new Cesium.CallbackProperty(() => {
+											return Cesium.Rectangle.fromCartesianArray(clickPoint)
+										}, false),
 										height: 0,
 										material: Cesium.Color.RED.withAlpha(0.4),
 										outline: true,
@@ -388,34 +403,123 @@ export default {
 									},
 								});
 							}
-
-
+							handler.setInputAction((movement) => {
+								const newPosition = viewer.scene.camera.pickEllipsoid(movement.endPosition);
+								if (Cesium.defined(newPosition)) {
+									clickPoint[1] = newPosition
+								}
+							}, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+						} else {
+							const rectangleHand = Cesium.Rectangle.fromCartesianArray(clickPoint)
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE)
 							const northwest = Cesium.Rectangle.northwest(rectangleHand); //西北角弧度坐标（左上）
 							const southwest = Cesium.Rectangle.southwest(rectangleHand); //西南角弧度坐标（左下）
 							const northeast = Cesium.Rectangle.northeast(rectangleHand); //东北角弧度坐标（右上）
 							const southeast = Cesium.Rectangle.southeast(rectangleHand); //东南角弧度坐标（右下）
-
 							// 转换为经纬度
-							const leftTop = [Cesium.Math.toDegrees(northwest.longitude), Cesium.Math.toDegrees(northwest.latitude)]; //左上角经度
-							const leftBottom = [Cesium.Math.toDegrees(southwest.longitude), Cesium.Math.toDegrees(southwest.latitude)]; //左下角经度
-							const rightTop = [Cesium.Math.toDegrees(northeast.longitude), Cesium.Math.toDegrees(northeast.latitude)]; //右上角经度
-							const rightBottom = [Cesium.Math.toDegrees(southeast.longitude), Cesium.Math.toDegrees(southeast.latitude)]; //右下角经度
-							cesiumEntityUtils.flyToTargetPoint(viewer, (leftTop[0] + rightBottom[0]) / 2, (leftTop[1] + rightBottom[1]) / 2, 20000000);
-							const data = {
-								leftTop: leftTop,
-								leftBottom: leftBottom,
-								rightTop: rightTop,
-								rightBottom: rightBottom,
+							const leftTop = [Cesium.Math.toDegrees(northwest.longitude).toFixed(3), Cesium.Math.toDegrees(northwest.latitude).toFixed(3)]; //左上角经度
+							const leftBottom = [Cesium.Math.toDegrees(southwest.longitude).toFixed(3), Cesium.Math.toDegrees(southwest.latitude).toFixed(3)]; //左下角经度
+							const rightTop = [Cesium.Math.toDegrees(northeast.longitude).toFixed(3), Cesium.Math.toDegrees(northeast.latitude).toFixed(3)]; //右上角经度
+							const rightBottom = [Cesium.Math.toDegrees(southeast.longitude).toFixed(3), Cesium.Math.toDegrees(southeast.latitude).toFixed(3)]; //右下角经度
+
+							// cesiumEntityUtils.flyToTargetPoint(viewer, (leftTop[0] + rightBottom[0]) / 2, (leftTop[1] + rightBottom[1]) / 2, 20000000);
+							const data = [leftTop, rightTop,rightBottom,leftBottom]
+							self.$events.emit('map-selectresult', {
+								type: type,
+								data: data
+							})
+						}
+
+					}
+					if (type === 'selectPoints') {
+						datasource.entities.add({
+							id: 'selectTarget' + self.pointsIndex,
+							position: clickPosition,
+							point: {
+								color: Cesium.Color.YELLOW,
+								pixelSize: 10
 							}
-							const dataarr = [leftTop, rightTop, rightBottom, leftBottom]
-							sefstore.dispatch('xqglMapRectangleLonLats', dataarr)
-							// console.log("矩形四角坐标：",data);
-							console.log("矩形四角坐标arr：", sefstore.state.xqglMapRectangleLonLats);
-							clickPoint = []; //清空
+						})
+						points.push([Cesium.Math.toDegrees(radiansPos.longitude).toFixed(3), Cesium.Math.toDegrees(radiansPos.latitude).toFixed(3)])
+						self.pointsIndex++;
+						handler.setInputAction(() => {
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
+							handler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+							self.$events.emit('map-selectresult', {
+								type: type,
+								data: points
+							})
+						}, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+					}
+					if (type === 'selectMovePoint') {
+						if (line.length === 0) {
+							line = [Cesium.Math.toDegrees(radiansPos.longitude).toFixed(3), Cesium.Math.toDegrees(radiansPos.latitude).toFixed(3)];//还没有点，添加第一个点
+							datasource.entities.add({
+								id: 'selectTarget',
+								polyline: {
+									positions: new Cesium.CallbackProperty(() => {
+										return Cesium.Cartesian3.fromDegreesArray(line)
+									}, false),
+									width: 5,
+									material: new Cesium.PolylineArrowMaterialProperty(Cesium.Color.YELLOW),
+									clampToGround: true,
+								},
+							})
+							datasource.entities.add({
+								id: 'selectTarget' + self.pointsIndex,
+								position: clickPosition,
+								point: {
+									color: Cesium.Color.YELLOW,
+									pixelSize: 10
+								}
+							})
+							self.pointsIndex++;
+							pointLength = pointLength + 2;
+							handler.setInputAction((movement) => {
+								const newPosition = viewer.scene.camera.pickEllipsoid(movement.endPosition);
+								if (Cesium.defined(newPosition)) {
+									const newPositionPos = Cesium.Cartographic.fromCartesian(newPosition);
+									line[pointLength] = Cesium.Math.toDegrees(newPositionPos.longitude).toFixed(3)
+									line[pointLength + 1] = Cesium.Math.toDegrees(newPositionPos.latitude).toFixed(3)
+								}
+							}, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+							handler.setInputAction(() => {
+								datasource.entities.add({
+									id: 'selectTarget' + self.pointsIndex,
+									position: clickPosition,
+									point: {
+										color: Cesium.Color.YELLOW,
+										pixelSize: 10
+									}
+								})
+								self.pointsIndex++;
+
+								self.$events.emit('map-selectresult', {
+									type: type,
+									data: line
+								})
+								handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
+								handler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+								handler.removeInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+							}, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+
+						} else {
+							datasource.entities.add({
+								id: 'selectTarget' + self.pointsIndex,
+								position: clickPosition,
+								point: {
+									color: Cesium.Color.YELLOW,
+									pixelSize: 10
+								}
+							})
+							self.pointsIndex++;
+							pointLength = pointLength + 2;
 						}
 					}
-				}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-			}
+				}
+			}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
 		},
 		addGlobleLine() {
 			const features = this.globleLines.geometries;

src/components/jcfwComponents/satelliteCompute.vue

@@ -80,7 +80,7 @@
 
   </div>
 </template>
-  
+
 <script>
 import { getNewestInstance, postJcfwXLcompute, postJcfwXXDcompute, getZJWXtype, postJcfwCZYBdmzCompute, postJcfwMidSatelliteCompute } from '@/api/jcfwApi.js';
 import { mapState } from 'vuex';
@@ -105,6 +105,12 @@ export default {
           sortable: true,
           width: 100
         },
+				{
+					prop: 'orbitNum',
+					label: '圈号',
+					sortable: false,
+					width: 90
+				},
         {
           prop: 'epochTime',
           label: '历元时刻',
@@ -112,12 +118,12 @@ export default {
           width: 120,
           isTooltip: true,
         },
-        {
-          prop: 'orbitNum',
-          label: '圈号',
-          sortable: false,
-          width: 90
-        },
+				{
+					prop: 'semiMajorAxis',
+					label: "半长轴\n(m)",
+					sortable: false,
+					width: 100
+				},
         {
           prop: 'inclination',
           label: '轨道倾角\n(°)',
@@ -130,12 +136,6 @@ export default {
           sortable: false,
           width: 90
         },
-        {
-          prop: 'semiMajorAxis',
-          label: "半长轴\n(m)",
-          sortable: false,
-          width: 100
-        },
         {
           prop: 'raan',
           label: "升交点赤经(°)",
@@ -143,6 +143,13 @@ export default {
           width: 110,
           isTooltip: true,
         },
+				{
+					prop: 'argumentOfPerigee',
+					label: "近地点辐角(°)",
+					sortable: false,
+					width: 110,
+					isTooltip: true,
+				},
         {
           prop: 'meanAnoMaly',
           label: "平近点角(°)",
@@ -150,13 +157,6 @@ export default {
           width: 100,
           isTooltip: true,
         },
-        {
-          prop: 'argumentOfPerigee',
-          label: "近地点辐角(°)",
-          sortable: false,
-          width: 110,
-          isTooltip: true,
-        },
       ],
       tableData: [],
       selRow: {},
@@ -255,7 +255,7 @@ export default {
         this.$message.warning('请选择时间！');
         return;
       }
-      
+
       this.curveDialogVisible = false;
       this.CZYBLoading = this.$loading({
         lock: true,
@@ -367,7 +367,7 @@ export default {
   }
 };
 </script>
-  
+
 <style lang='scss' scoped>
 .table2-satelliteBasicCalculate {
   width: 52%;
@@ -561,4 +561,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/components/rwjsComponents/rwyxzt.vue

@@ -187,7 +187,7 @@ export default {
           6: "海上识别确认"
         }
         const typeDic = {
-          0: "固定目标",
+          0: "点目标",
           1: "移动目标",
           2: "区域目标"
         }

src/components/tables/xqglTable_XQTB.vue

@@ -123,7 +123,7 @@ export default{
           }
 
           if (element.type === 0) {
-            element.typeChinese = '固定目标';
+            element.typeChinese = '点目标';
           }
           if (element.type === 1) {
             element.typeChinese = '移动目标';

src/components/xqglComponents/excelPop.vue

@@ -26,7 +26,7 @@
         </div>
     </div>
 </template>
-  
+
 <script>
 import { mapState } from 'vuex';
 import {
@@ -80,14 +80,14 @@ export default {
     }
 };
 </script>
-  
+
 <style lang='scss' scoped>
 .excel-inputWindow {
     width: 356px;
     height: 194px;
     position: absolute;
     top: 74px;
-    left: 524px;
+    left: 100%;
     z-index: 1;
     background: url('@/assets/ClipImage/dikuang/tanchuang/exceldaoru.png');
     background-size: 100% 100%;
@@ -218,4 +218,4 @@ export default {
     }
 
 }
-</style>
+</style>

src/components/xqglComponents/mapPop.vue

@@ -1,329 +1,377 @@
 <template>
-  <div class="mapSelect-content">
-    <div class="mapSelect-titleWords">
-      内容详情
-      <div class="excel-mapSelect">
-        <i class="el-icon-close" @click="cancel"></i>
-      </div>
-    </div>
-    <div class="mapSelect-formArea">
-      <div class="mapSelect-formContent">
-        <el-form ref="mapform" :model="mapSelectForm" label-width="58px">
-          <el-form-item label="名称">
-            <el-input v-model="mapSelectForm.name" size="mini"></el-input>
-          </el-form-item>
-          <el-form-item label="经纬度">
-            <el-input v-model="mapPointSelectLonlat_useUI" type="textarea"></el-input>
-          </el-form-item>
-          <el-form-item label="级别">
-            <el-input v-model="mapSelectForm.level" size="mini"></el-input>
-          </el-form-item>
-          <el-form-item label="类型">
-            <el-input v-if="mapPointSelect === 'selectPoint'" v-model="mapSelectForm.types[0].label"
-                      size="mini"></el-input>
-            <el-input v-if="mapPointSelect === 'selectPoints'" v-model="mapSelectForm.types[2].label"
-                      size="mini"></el-input>
-          </el-form-item>
-          <el-form-item label="国别">
-            <el-input v-model="mapSelectForm.country" size="mini"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="mapSelect-formButtonsDIV">
-        <div class="mapSelect-formButtons">
-          <el-button class="mapSelect-confirmButton" type="primary" @click="confirm">确认</el-button>
-          <el-button class="mapSelect-cancelButton" type="primary" @click="cancel">取消</el-button>
-        </div>
-      </div>
-    </div>
-  </div>
+	<div class="mapSelect-content">
+		<div class="mapSelect-titleWords">
+			内容详情
+			<div class="excel-mapSelect">
+				<i class="el-icon-close" @click="cancel"></i>
+			</div>
+		</div>
+		<div class="mapSelect-formArea">
+			<div class="mapSelect-formContent">
+				<el-form ref="mapform" :model="mapSelectForm" label-width="58px">
+					<el-form-item label="名称">
+						<el-input v-model="mapSelectForm.name" size="mini"></el-input>
+					</el-form-item>
+					<el-form-item
+							v-if="mapPointSelect==='selectPoint' || (mapPointSelect==='selectMovePoint' && mapSelectForm.points.length === 1)"
+							label="坐标">
+						<el-input v-model="mapPointSelect==='selectPoint' ? mapSelectForm.point: mapSelectForm.points[0]"
+											size="mini"></el-input>
+					</el-form-item>
+					<template v-if="(mapPointSelect==='selectMovePoint' && mapSelectForm.points.length == 1)">
+						<el-form-item label="航速">
+							<el-input v-model="mapSelectForm.movingEvgSpeed" size="mini"></el-input>
+						</el-form-item>
+						<el-form-item label="航向">
+							<el-input v-model="mapSelectForm.heading" size="mini"></el-input>
+						</el-form-item>
+					</template>
+					<template v-if="mapPointSelect==='selectLine'">
+						<el-form-item label="起点">
+							<el-input v-model="mapSelectForm.points[0]" size="mini"></el-input>
+						</el-form-item>
+						<el-form-item label="终点">
+							<el-input v-model="mapSelectForm.points[1]" size="mini"></el-input>
+						</el-form-item>
+					</template>
+					<template
+							v-if="['selectRegion', 'selectPoints', 'selectMovePoint'].includes(mapPointSelect) && mapSelectForm.points.length > 1">
+						<el-form-item label="目标点集">
+							<el-input v-for="(item, i) in mapSelectForm.points" :key="i" v-model="mapSelectForm.points[i].toString()"
+												size="mini" style="margin: 5px 0"></el-input>
+						</el-form-item>
+					</template>
+					<el-form-item label="级别">
+						<el-input v-model="mapSelectForm.level" size="mini"></el-input>
+					</el-form-item>
+					<el-form-item label="类型">
+						<el-input v-model="mapSelectForm.types[mapPointSelect]"
+											size="mini"></el-input>
+					</el-form-item>
+					<el-form-item label="国别">
+						<el-input v-model="mapSelectForm.country" size="mini"></el-input>
+					</el-form-item>
+				</el-form>
+			</div>
+			<div class="mapSelect-formButtonsDIV">
+				<div class="mapSelect-formButtons">
+					<el-button class="mapSelect-confirmButton" type="primary" @click="confirm">确认</el-button>
+					<el-button class="mapSelect-cancelButton" type="primary" @click="cancel">取消</el-button>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
 import {
-  getXQTBListViaMapSelect
+	getXQTBListViaMapSelect
 } from '@/api/xqglApi.js';
 import {mapState} from 'vuex'
 
 export default {
-  name: "mapPop",
-  components: {},
-  props: {
-    mapPointSelect: {},
-  },
-  data() {
-    return {
-      mapSelectVisible: true,
-      //手动导入，地图点选或框选，弹窗的表单收集
-      mapSelectForm: {
-        name: '',
-        lonlat: '',
-        level: '',
-        // type: '',
-        typeValue: 0,
-        types: [
-          {
-            typeValue: 0,
-            label: '固定目标',
-          },
-          {
-            typeValue: 1,
-            label: '移动目标',
-          },
-          {
-            typeValue: 2,
-            label: '区域目标',
-          },
-        ],
-        country: '',
-      },
-      //记录地图点选或框选的目标条数
-      mapselectTotalItem: 0,
-    };
-  },
-  computed: {
-    ...mapState("xqgl", ["parentId"]),
-    mapPointSelectLonlat_useUI() {
-      const mapRectangleLonLatsFixed = [];
-      const mapPointLonLatFixed = [];
-      if (this.mapPointSelect === 'selectPoints') {
-        this.$store.state.xqglMapRectangleLonLats.forEach(element => {
-          mapRectangleLonLatsFixed.push([element[0].toFixed(3), element[1].toFixed(3)]);
-        });
-        console.log("mapRectangleLonLatsFixed:", mapRectangleLonLatsFixed);
-        let strPonts = JSON.stringify(mapRectangleLonLatsFixed);
-        strPonts = strPonts.replaceAll('[', '(').replaceAll(']', ')').replaceAll('"', '');
-        return strPonts;
-      } else {
-        this.$store.state.xqglMapPointLonLat.forEach(element => {
-          mapPointLonLatFixed.push(element.toFixed(3));
-        });
-        console.log("mapPointLonLatFixed:", mapPointLonLatFixed);
-        return mapPointLonLatFixed.toString();
-        // return this.$store.state.xqglMapPointLonLat.toString();
-      }
-    },
-  },
-  watch: {},
-  methods: {
-    //内容详情页的确认按钮绑定事件
-    confirm() {
-      //收集 内容详情页的 单条数据
-      // this.mapSelectForm.lonlat = this.$store.state.xqglMapPointLonLat.join();
-      //tempPointDTOList用于存放后端所需的经纬度数组
-      var tempPointDTOList = [];
-      if (this.mapPointSelect === 'selectPoint') {
-        this.mapSelectForm.typeValue = 0;
-        this.mapSelectForm.lonlat = this.$store.state.xqglMapPointLonLat;
-        let lonlatPoint = {
-          lat: this.mapSelectForm.lonlat[1].toFixed(3),
-          lng: this.mapSelectForm.lonlat[0].toFixed(3),
-          sequence: 1,
-        }
-        tempPointDTOList = [];
-        tempPointDTOList.push(lonlatPoint);
-      }
-      if (this.mapPointSelect === 'selectPoints') {
-        this.mapSelectForm.typeValue = 2;
-        this.mapSelectForm.lonlat = this.$store.state.xqglMapRectangleLonLats;
-        var pointsArray = this.mapSelectForm.lonlat;
-        tempPointDTOList = [];
-        for (let i = 0; i < pointsArray.length; i++) {
-          tempPointDTOList.push({
-            lat: pointsArray[i][1].toFixed(3),
-            lng: pointsArray[i][0].toFixed(3),
-            sequence: i + 1,
-          });
-          console.log("i:", i);
-        }
-      }
-      console.log("***地图点目标信息：", this.mapSelectForm);
-      //生成地图点选的parentId标识
-      let firstStr = this.parentId + "_"
-      let startNumber = this.mapselectTotalItem + 1;
-      this.mapselectTotalItem = this.mapselectTotalItem + 1;
-      let mapselectId = this.commonFunction.createParentID(firstStr, startNumber, this.mapselectTotalItem);
-      console.log('----------------------');
-      let mapselectIdMap = mapselectId[0].replace("_0", "_M0");
-      console.log("mapselectId:", mapselectIdMap);
-      console.log('----------------------');
-      //将该条数据存入 库 表
-      let data = {
-        // parentId: this.parentId,
-        parentId: mapselectIdMap,
-        targetName: this.mapSelectForm.name,
-        pointDTOList: tempPointDTOList,
-        targetLevel: this.mapSelectForm.level,
-        type: this.mapSelectForm.typeValue,
-        countryName: this.mapSelectForm.country,
-      };
-      getXQTBListViaMapSelect(data).then(res => {
-        if (res.code === 200) {
-          this.$emit('comfirm');
-          this.$emit('closePop');
-        }
-      });
+	name: "mapPop",
+	components: {},
+	props: {
+		mapPointSelect: {},
+	},
+	data() {
+		return {
+			mapSelectVisible: true,
+			//手动导入，地图点选或框选，弹窗的表单收集
+			mapSelectForm: {
+				name: '',
+				lonlat: '',
+				level: '',
+				point: '',
+				points: [],
+				// type: '',
+				movingEvgSpeed: null,//航速
+				heading: null,//航向
+				typeValue: 0,
+				types: {
+					selectPoint: '点目标',
+					selectLine: '移动目标',
+					selectRegion: '区域目标',
+					selectPoints: '线目标',
+					selectMovePoint: '点群目标',
+				},
+				country: '',
+			},
+			//记录地图点选或框选的目标条数
+			mapselectTotalItem: 0,
+		};
+	},
+	computed: {
+		...mapState("xqgl", ["parentId"]),
+	},
+	watch: {},
+	methods: {
+		//内容详情页的确认按钮绑定事件
+		confirm() {
+			//收集 内容详情页的 单条数据
+			// this.mapSelectForm.lonlat = this.$store.state.xqglMapPointLonLat.join();
+			//tempPointDTOList用于存放后端所需的经纬度数组
+			let tempPointDTOList = [];
+			const type = this.mapPointSelect;
+			const points = this.mapSelectForm.points;
+			let typeValue = 0
+			if (type === 'selectPoint') {
+				const point = this.mapSelectForm.point.split(",")
+				let lonlatPoint = {
+					lat: point[0],
+					lng: point[1],
+					sequence: 1,
+				}
+				tempPointDTOList.push(lonlatPoint);
+			}
+			if (['selectRegion', 'selectPoints'].includes(type)) {
+				typeValue = type == 'selectRegion' ? 2 : 4;
+				points.forEach(
+						(item, i) => {
+							tempPointDTOList.push({
+								lat: item[0],
+								lng: item[1],
+								sequence: i + 1,
+							});
+						}
+				)
+			}
+			if (['selectLine', 'selectMovePoint'].includes(type)) {
+				typeValue = type == 'selectLine' ? 3 : 1;
+				points.forEach(
+						(item, i) => {
+							const point = item.split(",")
+							tempPointDTOList.push({
+								lat: point[0],
+								lng: point[1],
+								sequence: i + 1,
+								movingEvgSpeed:this.mapSelectForm.movingEvgSpeed,
+								heading:this.mapSelectForm.heading,
+							});
+						}
+				)
+			}
+			//生成地图点选的parentId标识
+			let firstStr = this.parentId + "_"
+			let startNumber = this.mapselectTotalItem + 1;
+			this.mapselectTotalItem = this.mapselectTotalItem + 1;
+			let mapselectId = this.commonFunction.createParentID(firstStr, startNumber, this.mapselectTotalItem);
+			let mapselectIdMap = mapselectId[0].replace("_0", "_M0");
+			//将该条数据存入 库 表
+			let data = {
+				// parentId: this.parentId,
+				parentId: mapselectIdMap,
+				targetName: this.mapSelectForm.name,
+				pointDTOList: tempPointDTOList,
+				targetLevel: this.mapSelectForm.level,
+				type: typeValue,
+				countryName: this.mapSelectForm.country,
+			};
+			getXQTBListViaMapSelect(data).then(res => {
+				if (res.code === 200) {
+					this.$emit('comfirm');
+					this.$emit('closePop');
+				}
+			});
 
-      //关闭 内容详情页
-      this.mapSelectVisible = false;
-    },
-    //关闭 内容详情 弹窗
+			//关闭 内容详情页
+			this.mapSelectVisible = false;
+		},
+		//关闭 内容详情 弹窗
 
-    cancel() {
-      this.$events.emit('xqgl-cancelselect')
-      this.$emit('closePop');
+		cancel() {
+			this.$events.emit('xqgl-cancelselect')
+			this.$emit('closePop');
 
-    },
-  },
-  mounted() {
-
-  }
+		},
+		setTagetInfo(data) {
+			const type = data.type;
+			const points = data.data;
+			const mapRectangleLonLatsFixed = [];
+			const mapPointLonLatFixed = [];
+			if (type === 'selectRegion') {
+				this.mapSelectForm.points = points;
+			}
+			if (type === 'selectPoint') {
+				this.mapSelectForm.point = points.toString();
+			}
+			if (type === 'selectLine') {
+				let strPonts = [];
+				points.forEach((item, index) => {
+					if (index % 2 === 0) {
+						strPonts.push(item + ',' + points[index + 1])
+					}
+				})
+				this.mapSelectForm.points = strPonts;
+			}
+			if (type === 'selectPoints') {
+				this.mapSelectForm.points = points;
+			}
+			if (type === 'selectMovePoint') {
+				let strPonts = [];
+				points.forEach((item, index) => {
+					if (index % 2 === 0) {
+						strPonts.push(item + ',' + points[index + 1])
+					}
+				})
+				this.mapSelectForm.points = strPonts;
+			}
+		},
+	},
+	mounted() {
+		const self = this;
+		this.$events.on('map-selectresult', (data) => {
+			self.setTagetInfo(data)
+		})
+	}
 };
 </script>
 
 <style lang='scss' scoped>
 .mapSelect-content {
-  width: 356px;
-  height: 402px;
-  position: absolute;
-  top: 74px;
-  left: 524px;
-  z-index: 1;
-  background: url('@/assets/ClipImage/dikuang/tanchuang/neirongxiangqing.png');
-  background-size: 100% 100%;
+	width: 356px;
+	height: 402px;
+	position: absolute;
+	top: 74px;
+	left: 100%;
+	z-index: 1;
+	background: url('@/assets/ClipImage/dikuang/tanchuang/neirongxiangqing.png');
+	background-size: 100% 100%;
 
-  .mapSelect-titleWords {
-    width: 320px;
-    height: 32px;
-    line-height: 32px;
-    text-align: center;
-    // position: relative;
-    // top: 34px;
-    background-color: #0095ff;
-    margin: 34px 18px 20px;
-    font-family: 'SourceHanSansCN-Bold';
-    font-size: 14px;
-    color: #fff;
+	.mapSelect-titleWords {
+		width: 320px;
+		height: 32px;
+		line-height: 32px;
+		text-align: center;
+		// position: relative;
+		// top: 34px;
+		background-color: #0095ff;
+		margin: 34px 18px 20px;
+		font-family: 'SourceHanSansCN-Bold';
+		font-size: 14px;
+		color: #fff;
 
-    .excel-mapSelect {
-      float: right;
-      margin-right: 12px;
-    }
-  }
+		.excel-mapSelect {
+			float: right;
+			margin-right: 12px;
+		}
+	}
 
-  .mapSelect-formArea {
-    width: 230px;
-    height: 284px;
-    // background:pink;
-    // position: relative;
-    // top: 34px;
-    margin: 0 auto;
+	.mapSelect-formArea {
+		width: 230px;
+		height: 284px;
+		// background:pink;
+		// position: relative;
+		// top: 34px;
+		margin: 0 auto;
 
-    .mapSelect-formContent {
-      width: 230px;
-      height: 220px;
+		.mapSelect-formContent {
+			width: 230px;
+			height: 220px;
+			overflow: auto;
 
-      /deep/ .mapSelect-typeStyle {
-        width: 172px;
-        color: #fff;
-      }
+			/deep/ .mapSelect-typeStyle {
+				width: 172px;
+				color: #fff;
+			}
 
-      /deep/ .el-form-item__label {
-        line-height: 30px;
-        padding: 0 10px 0 0;
-        font-family: 'SourceHanSansCN-Regular';
-        font-size: 12px;
-        color: #fff;
-      }
+			/deep/ .el-form-item__label {
+				line-height: 30px;
+				padding: 0 10px 0 0;
+				font-family: 'SourceHanSansCN-Regular';
+				font-size: 12px;
+				color: #fff;
+			}
 
-      /deep/ .el-input--mini {
-        font-size: 12px;
-        height: 30px;
-        line-height: 30px;
-      }
+			/deep/ .el-input--mini {
+				font-size: 12px;
+				height: 30px;
+				line-height: 30px;
+			}
 
-      /deep/ .el-input__inner {
-        border-radius: 0;
-        padding: 0 4px;
-        background: rgba(299, 299, 299, 0.3);
-        border: rgba(299, 299, 299, 0.3);
-        font-family: 'SourceHanSansCN-Regular';
-        font-size: 12px;
-        color: #fff;
-      }
+			/deep/ .el-input__inner {
+				border-radius: 0;
+				padding: 0 4px;
+				background: rgba(299, 299, 299, 0.3);
+				border: rgba(299, 299, 299, 0.3);
+				font-family: 'SourceHanSansCN-Regular';
+				font-size: 12px;
+				color: #fff;
+			}
 
-      /deep/ .el-textarea__inner {
-        border-radius: 0;
-        background: rgba(299, 299, 299, 0.3);
-        border: rgba(299, 299, 299, 0.3);
-        padding: 0px 4px;
-        line-height: 2;
-        font-family: 'SourceHanSansCN-Regular';
-        font-size: 12px;
-        color: #fff;
-      }
+			/deep/ .el-textarea__inner {
+				border-radius: 0;
+				background: rgba(299, 299, 299, 0.3);
+				border: rgba(299, 299, 299, 0.3);
+				padding: 0px 4px;
+				line-height: 2;
+				font-family: 'SourceHanSansCN-Regular';
+				font-size: 12px;
+				color: #fff;
+			}
 
-      /deep/ .el-form-item__content {
-        line-height: 30px;
-      }
+			/deep/ .el-form-item__content {
+				line-height: 30px;
+			}
 
-      /deep/ .el-form-item {
-        margin-bottom: 10px;
-      }
-    }
+			/deep/ .el-form-item {
+				margin-bottom: 10px;
+			}
+		}
 
-    .mapSelect-formButtonsDIV {
-      margin-top: 20px;
-      // width: 230px;
-      // height: 64px;
-      // display: flex;
-      // align-items: flex-end;
+		.mapSelect-formButtonsDIV {
+			margin-top: 20px;
+			// width: 230px;
+			// height: 64px;
+			// display: flex;
+			// align-items: flex-end;
 
-      .mapSelect-formButtons {
-        width: 230px;
-        height: 30px;
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-end;
+			.mapSelect-formButtons {
+				width: 230px;
+				height: 30px;
+				display: flex;
+				justify-content: space-between;
+				align-items: flex-end;
 
-        .mapSelect-confirmButton,
-        .mapSelect-cancelButton {
-          width: 92px;
-          height: 30px;
-          background: url('@/assets/ClipImage/anniu/quxiao_link.png');
-          background-size: 100% 100%;
-          border: none;
-          padding: 0;
-          margin: 0;
-          font-family: SourceHanSansCN-Regular;
-        }
+				.mapSelect-confirmButton,
+				.mapSelect-cancelButton {
+					width: 92px;
+					height: 30px;
+					background: url('@/assets/ClipImage/anniu/quxiao_link.png');
+					background-size: 100% 100%;
+					border: none;
+					padding: 0;
+					margin: 0;
+					font-family: SourceHanSansCN-Regular;
+				}
 
-        .mapSelect-confirmButton {
-          background: url('@/assets/ClipImage/anniu/queren_link.png');
-        }
+				.mapSelect-confirmButton {
+					background: url('@/assets/ClipImage/anniu/queren_link.png');
+				}
 
-        .mapSelect-confirmButton:hover {
-          background: url('@/assets/ClipImage/anniu/queren_hover.png');
-        }
+				.mapSelect-confirmButton:hover {
+					background: url('@/assets/ClipImage/anniu/queren_hover.png');
+				}
 
-        .mapSelect-confirmButton:focus {
-          background: url('@/assets/ClipImage/anniu/queren_check.png');
-        }
+				.mapSelect-confirmButton:focus {
+					background: url('@/assets/ClipImage/anniu/queren_check.png');
+				}
 
-        .mapSelect-cancelButton {
-          background: url('@/assets/ClipImage/anniu/quxiao_link.png');
-        }
+				.mapSelect-cancelButton {
+					background: url('@/assets/ClipImage/anniu/quxiao_link.png');
+				}
 
-        .mapSelect-cancelButton:hover {
-          background: url('@/assets/ClipImage/anniu/quxiao_hover.png');
-        }
+				.mapSelect-cancelButton:hover {
+					background: url('@/assets/ClipImage/anniu/quxiao_hover.png');
+				}
 
-        .mapSelect-cancelButton:focus {
-          background: url('@/assets/ClipImage/anniu/quxiao_check.png');
-        }
-      }
-    }
-  }
+				.mapSelect-cancelButton:focus {
+					background: url('@/assets/ClipImage/anniu/quxiao_check.png');
+				}
+			}
+		}
+	}
 
 }
 </style>

src/components/xqglComponents/targetPop.vue

@@ -1,323 +1,325 @@
 <template>
-    <!-- 点击需求列表中的某一行之后的弹窗：点目标 -->
-    <div class="XQ-target">
-        <!-- <div class="XQ-target" v-show="true"> -->
-        <div class="pointTarget-word">
-            {{ rowData.typeChinese }}
-        </div>
-        <div class="pointTarget-title">
-            {{ rowData.targetName }}
-            <div class="pointTarget-closeIcon">
-                <i class="el-icon-close" @click="cancel"></i>
-            </div>
-        </div>
-        <el-form class="pointTargetContent-form" ref="formRef" :model="pointTargetForm" label-width="80px">
-            <el-form-item label="观测目的">
-                <el-select v-model="rowData.observationPurpose" placeholder="请选择">
-                    <el-option v-for="item in observationPurposeOpt" :key="item.value" :label="item.label"
-                        :value="item.value">
-                    </el-option>
-                </el-select>
-
-
-            </el-form-item>
-            <el-form-item label="开始时间">
-                <el-date-picker v-model="rowData.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="选择开始时间"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="截至时间">
-                <el-date-picker v-model="rowData.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="选择开始时间"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="优先级">
-                <el-input-number v-model="rowData.priority" :min="1" :max="10000"
-                    controls-position="right"></el-input-number>
-            </el-form-item>
-            <el-form-item label="频次">
-                <el-input-number v-model="rowData.rate" :min="1" :max="5" controls-position="right"></el-input-number>
-            </el-form-item>
-            <el-form-item label="观测手段">
-                <el-input readonly :value="rowData.investigativeMeans === '0' ? '默认' : rowData.investigativeMeans" placeholder="">
-                    <i slot="suffix" class="el-icon-more" @click="toSatelliteFilter"></i>
-                </el-input>
-            </el-form-item>
-            <div class="confirmORcancel-pointTarget">
-                <el-button class="pointTarget-confirm-button" type="primary" @click="confirm">确认
-                </el-button>
-                <el-button class="pointTarget-cancel-button" type="primary" @click="cancel">取消
-                </el-button>
-            </div>
-        </el-form>
-
-
-    </div>
+	<!-- 点击需求列表中的某一行之后的弹窗：点目标 -->
+	<div class="XQ-target">
+		<!-- <div class="XQ-target" v-show="true"> -->
+		<div class="pointTarget-word">
+			{{ rowData.typeChinese }}
+		</div>
+		<div class="pointTarget-title">
+			{{ rowData.targetName }}
+			<div class="pointTarget-closeIcon">
+				<i class="el-icon-close" @click="cancel"></i>
+			</div>
+		</div>
+		<el-form ref="formRef" :model="pointTargetForm" class="pointTargetContent-form" label-width="80px">
+			<el-form-item label="观测目的">
+				<el-select v-model="rowData.observationPurpose" placeholder="请选择">
+					<el-option v-for="item in observationPurposeOpt" :key="item.value" :label="item.label"
+										 :value="item.value">
+					</el-option>
+				</el-select>
+
+
+			</el-form-item>
+			<el-form-item label="开始时间">
+				<el-date-picker v-model="rowData.startTime" placeholder="选择开始时间" type="datetime"
+												value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+			</el-form-item>
+			<el-form-item label="截至时间">
+				<el-date-picker v-model="rowData.endTime" placeholder="选择开始时间" type="datetime"
+												value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+			</el-form-item>
+			<el-form-item label="优先级">
+				<el-input-number v-model="rowData.priority" :max="10000" :min="1"
+												 controls-position="right"></el-input-number>
+			</el-form-item>
+			<el-form-item label="频次">
+				<el-input-number v-model="rowData.rate" :max="5" :min="1" controls-position="right"></el-input-number>
+			</el-form-item>
+			<el-form-item label="观测手段">
+				<el-input :value="rowData.investigativeMeans === '0' ? '默认' : rowData.investigativeMeans" placeholder=""
+									readonly>
+					<i slot="suffix" class="el-icon-more" @click="toSatelliteFilter"></i>
+				</el-input>
+			</el-form-item>
+			<div class="confirmORcancel-pointTarget">
+				<el-button class="pointTarget-confirm-button" type="primary" @click="confirm">确认
+				</el-button>
+				<el-button class="pointTarget-cancel-button" type="primary" @click="cancel">取消
+				</el-button>
+			</div>
+		</el-form>
+
+
+	</div>
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex';
-import { getXQTBListViaPointTarget } from '@/api/xqglApi.js';
+import {mapState, mapMutations} from 'vuex';
+import {getXQTBListViaPointTarget} from '@/api/xqglApi.js';
+
 export default {
-    name: "targetPop",
-    components: {},
-    props: {
-        rowData: {
-            type: Object,
-            default: () => ({ targetName: 'xx', type: 0 })
-        }
-    },
-    data() {
-        return {
-            XQtargetVisible: true,
-            //点目标弹窗下的form表单内容
-            formData: {},
-            pointTargetForm: {
-                xqTBrowID: "",
-                selectValue: '',
-                pointTargetStartTime: '',
-                pointTargetEndTime: '',
-                priorNumber: 999,
-                frequency: 1,
-                investigativeMeans: '默认',
-            },
-            observationPurposeOpt: [
-                {
-                    value: 1,
-                    label: '快响应急观测',
-                },
-                {
-                    value: 2,
-                    label: '陆地伪装识别',
-                },
-                {
-                    value: 3,
-                    label: '早期异常监测',
-                },
-                {
-                    value: 4,
-                    label: '海上搜索发现',
-                },
-                {
-                    value: 5,
-                    label: '海上持续跟踪',
-                },
-                {
-                    value: 6,
-                    label: '海上识别确认',
-                },
-            ],
-        };
-    },
-    computed: {
-        ...mapState("xqgl", ["confirmStatellite","investigationMeans", "satelliteSelected"]),
-    },
-    watch: {
-        confirmStatellite() {
-            this.rowData.investigativeMeans = this.investigationMeans;
-        },
-    },
-    methods: {
-        ...mapMutations("xqgl", ["changeToFilterSate"]),
-        toSatelliteFilter() {
-            this.changeToFilterSate();
-        },
-        confirm() {
-            if (this.rowData.investigativeMeans === '默认') {
-                this.rowData.investigativeMeans = '0';
-            } else {
-                // this.rowData.satelliteSelected = this.$store.state.clickedSatellitesInvestigationMeansId;
-                this.rowData.satelliteSelected = this.satelliteSelected;
-            }
-            // 用于后端测试用，测试完成之后删除以下两行时间的设置
-            // this.rowData.startTime = '2023-02-05 08:00:00';
-            // this.rowData.endTime = '2023-02-09 08:00:00';
-            getXQTBListViaPointTarget(this.rowData).then(res => {
-                if (res.code === 200) {
-                    this.$emit('comfirm');
-                    this.$emit('closePop');
-                    this.$message({
-                        message: '目标修改成功',
-                        type: 'success',
-                        showClose: true,
-                    });
-                } else {
-                    this.$message({
-                        message: '目标修改失败',
-                        type: 'warning',
-                        showClose: true,
-                    });
-                }
-            })
-        },
-        cancel() {
-            this.XQtargetVisible = false
-            this.$emit("closePop");
-        },
-
-    },
-    mounted() {
-
-    }
+	name: "targetPop",
+	components: {},
+	props: {
+		rowData: {
+			type: Object,
+			default: () => ({targetName: 'xx', type: 0})
+		}
+	},
+	data() {
+		return {
+			XQtargetVisible: true,
+			//点目标弹窗下的form表单内容
+			formData: {},
+			pointTargetForm: {
+				xqTBrowID: "",
+				selectValue: '',
+				pointTargetStartTime: '',
+				pointTargetEndTime: '',
+				priorNumber: 999,
+				frequency: 1,
+				investigativeMeans: '默认',
+			},
+			observationPurposeOpt: [
+				{
+					value: 1,
+					label: '快响应急观测',
+				},
+				{
+					value: 2,
+					label: '陆地伪装识别',
+				},
+				{
+					value: 3,
+					label: '早期异常监测',
+				},
+				{
+					value: 4,
+					label: '海上搜索发现',
+				},
+				{
+					value: 5,
+					label: '海上持续跟踪',
+				},
+				{
+					value: 6,
+					label: '海上识别确认',
+				},
+			],
+		};
+	},
+	computed: {
+		...mapState("xqgl", ["confirmStatellite", "investigationMeans", "satelliteSelected"]),
+	},
+	watch: {
+		confirmStatellite() {
+			this.rowData.investigativeMeans = this.investigationMeans;
+		},
+	},
+	methods: {
+		...mapMutations("xqgl", ["changeToFilterSate"]),
+		toSatelliteFilter() {
+			this.changeToFilterSate();
+		},
+		confirm() {
+			if (this.rowData.investigativeMeans === '默认') {
+				this.rowData.investigativeMeans = '0';
+			} else {
+				// this.rowData.satelliteSelected = this.$store.state.clickedSatellitesInvestigationMeansId;
+				this.rowData.satelliteSelected = this.satelliteSelected;
+			}
+			// 用于后端测试用，测试完成之后删除以下两行时间的设置
+			// this.rowData.startTime = '2023-02-05 08:00:00';
+			// this.rowData.endTime = '2023-02-09 08:00:00';
+			getXQTBListViaPointTarget(this.rowData).then(res => {
+				if (res.code === 200) {
+					this.$emit('comfirm');
+					this.$emit('closePop');
+					this.$message({
+						message: '目标修改成功',
+						type: 'success',
+						showClose: true,
+					});
+				} else {
+					this.$message({
+						message: '目标修改失败',
+						type: 'warning',
+						showClose: true,
+					});
+				}
+			})
+		},
+		cancel() {
+			this.XQtargetVisible = false
+			this.$emit("closePop");
+		},
+
+	},
+	mounted() {
+
+	}
 };
 </script>
 
 <style lang='scss' scoped>
 .XQ-target {
-    width: 356px;
-    height: 418px;
-    position: absolute;
-    top: 74px;
-    left: 100%;
-    z-index: 1;
-    background: url('@/assets/ClipImage/dikuang/tanchuang/dianmubiao.png');
-    background-size: 100% 100%;
-
-    .pointTarget-word {
-        width: 320px;
-        height: 44px;
-        line-height: 44px;
-        margin: 0 18px;
-        padding-left: 8px;
-        // background:red;
-        font-family: SourceHanSansCN-Regular;
-        font-size: 14px;
-        color: #fff;
-    }
-
-    .pointTarget-title {
-        width: 320px;
-        height: 32px;
-        line-height: 32px;
-        text-align: center;
-        background-color: #0095ff;
-        margin: 0 18px 18px;
-        font-family: SourceHanSansCN-Regular;
-        font-size: 14px;
-
-        .pointTarget-closeIcon {
-            float: right;
-            margin-right: 12px;
-
-            .el-icon-close {
-                cursor: pointer;
-            }
-        }
-    }
-
-    .pointTargetContent-form {
-        width: 240px;
-        height: 294px;
-        // background:red;
-        margin: 0 58px;
-        font-family: SourceHanSansCN-Regular;
-        font-size: 12px;
-        color: #ffffff;
-
-        /deep/ .el-form-item {
-            height: 30px;
-            margin-bottom: 10px;
-        }
-
-        /deep/ .el-input__inner {
-            height: 30px;
-            line-height: 30px;
-            width: 160px;
-            background-color: rgba(299, 299, 299, 0.3);
-            font-family: SourceHanSansCN-Regular;
-            font-size: 12px;
-            color: #ffffff;
-            border-radius: 0;
-            border: none;
-        }
-
-        /deep/ .el-date-editor {
-            width: 160px;
-            height: 30px;
-            font-size: 12px;
-
-            .el-input__inner {
-                padding: 0 0 0 15px;
-            }
-
-            .el-input__icon {
-                display: none;
-            }
-        }
-
-        /deep/ .el-input-number__increase,
-        /deep/ .el-input-number__decrease {
-            background: transparent;
-            border: none;
-            color: #fff;
-            width: 25px;
-        }
-
-        /deep/ .el-input__icon {
-            line-height: 30px;
-            height: 30px;
-        }
-
-        /deep/ .el-input-number {
-            width: 160px;
-        }
-
-        /deep/ .el-form-item__label {
-            width: 58px !important;
-            height: 30px;
-            padding: 0;
-            font-family: SourceHanSansCN-Regular;
-            font-size: 12px;
-            color: #ffffff;
-        }
-
-        .el-icon-more {
-            cursor: pointer;
-        }
-    }
-
-    .confirmORcancel-pointTarget {
-        width: 240px;
-        height: 54px;
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-end;
-
-        .pointTarget-confirm-button,
-        .pointTarget-cancel-button {
-            width: 92px;
-            height: 30px;
-            font-family: 'SourceHanSansCN-Regular';
-            font-size: 14px;
-            color: #ffffff;
-            background-size: 100% 100%;
-            border: none;
-            padding: 0;
-            margin: 0;
-        }
-
-        .pointTarget-confirm-button {
-            background: url('@/assets/ClipImage/anniu/queren_link.png');
-        }
-
-        .pointTarget-confirm-button:hover {
-            background: url('@/assets/ClipImage/anniu/queren_hover.png');
-        }
-
-        .pointTarget-confirm-button:focus {
-            background: url('@/assets/ClipImage/anniu/queren_check.png');
-        }
-
-        .pointTarget-cancel-button {
-            background: url('@/assets/ClipImage/anniu/quxiao_link.png');
-        }
-
-        .pointTarget-cancel-button:hover {
-            background: url('@/assets/ClipImage/anniu/quxiao_hover.png');
-        }
-
-        .pointTarget-cancel-button:focus {
-            background: url('@/assets/ClipImage/anniu/quxiao_check.png');
-        }
-    }
+	width: 356px;
+	height: 418px;
+	position: absolute;
+	top: 74px;
+	left: 100%;
+	z-index: 1;
+	background: url('@/assets/ClipImage/dikuang/tanchuang/dianmubiao.png');
+	background-size: 100% 100%;
+
+	.pointTarget-word {
+		width: 320px;
+		height: 44px;
+		line-height: 44px;
+		margin: 0 18px;
+		padding-left: 8px;
+		// background:red;
+		font-family: SourceHanSansCN-Regular;
+		font-size: 14px;
+		color: #fff;
+	}
+
+	.pointTarget-title {
+		width: 320px;
+		height: 32px;
+		line-height: 32px;
+		text-align: center;
+		background-color: #0095ff;
+		margin: 0 18px 18px;
+		font-family: SourceHanSansCN-Regular;
+		font-size: 14px;
+
+		.pointTarget-closeIcon {
+			float: right;
+			margin-right: 12px;
+
+			.el-icon-close {
+				cursor: pointer;
+			}
+		}
+	}
+
+	.pointTargetContent-form {
+		width: 240px;
+		height: 294px;
+		// background:red;
+		margin: 0 58px;
+		font-family: SourceHanSansCN-Regular;
+		font-size: 12px;
+		color: #ffffff;
+
+		/deep/ .el-form-item {
+			height: 30px;
+			margin-bottom: 10px;
+		}
+
+		/deep/ .el-input__inner {
+			height: 30px;
+			line-height: 30px;
+			width: 160px;
+			background-color: rgba(299, 299, 299, 0.3);
+			font-family: SourceHanSansCN-Regular;
+			font-size: 12px;
+			color: #ffffff;
+			border-radius: 0;
+			border: none;
+		}
+
+		/deep/ .el-date-editor {
+			width: 160px;
+			height: 30px;
+			font-size: 12px;
+
+			.el-input__inner {
+				padding: 0 0 0 15px;
+			}
+
+			.el-input__icon {
+				display: none;
+			}
+		}
+
+		/deep/ .el-input-number__increase,
+		/deep/ .el-input-number__decrease {
+			background: transparent;
+			border: none;
+			color: #fff;
+			width: 25px;
+		}
+
+		/deep/ .el-input__icon {
+			line-height: 30px;
+			height: 30px;
+		}
+
+		/deep/ .el-input-number {
+			width: 160px;
+		}
+
+		/deep/ .el-form-item__label {
+			width: 58px !important;
+			height: 30px;
+			padding: 0;
+			font-family: SourceHanSansCN-Regular;
+			font-size: 12px;
+			color: #ffffff;
+		}
+
+		.el-icon-more {
+			cursor: pointer;
+		}
+	}
+
+	.confirmORcancel-pointTarget {
+		width: 240px;
+		height: 54px;
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+
+		.pointTarget-confirm-button,
+		.pointTarget-cancel-button {
+			width: 92px;
+			height: 30px;
+			font-family: 'SourceHanSansCN-Regular';
+			font-size: 14px;
+			color: #ffffff;
+			background-size: 100% 100%;
+			border: none;
+			padding: 0;
+			margin: 0;
+		}
+
+		.pointTarget-confirm-button {
+			background: url('@/assets/ClipImage/anniu/queren_link.png');
+		}
+
+		.pointTarget-confirm-button:hover {
+			background: url('@/assets/ClipImage/anniu/queren_hover.png');
+		}
+
+		.pointTarget-confirm-button:focus {
+			background: url('@/assets/ClipImage/anniu/queren_check.png');
+		}
+
+		.pointTarget-cancel-button {
+			background: url('@/assets/ClipImage/anniu/quxiao_link.png');
+		}
+
+		.pointTarget-cancel-button:hover {
+			background: url('@/assets/ClipImage/anniu/quxiao_hover.png');
+		}
+
+		.pointTarget-cancel-button:focus {
+			background: url('@/assets/ClipImage/anniu/quxiao_check.png');
+		}
+	}
 
 }
 </style>

src/components/xqglComponents/taskInfos.vue

@@ -41,24 +41,16 @@ export default {
 					options: [
 						{
 							value: 0,
-							label: "气象海洋"
-						},
-						{
-							value: 0,
-							label: "水利交通"
+							label: "A部门"
 						},
 						{
-							value: 0,
-							label: "防灾减灾"
+							value: 1,
+							label: "B部门"
 						},
 						{
-							value: 0,
-							label: "城乡规划"
+							value: 2,
+							label: "C部门"
 						},
-						{
-							value: 0,
-							label: "农林渔牧"
-						}
 					]
 				},
 				{
@@ -93,24 +85,12 @@ export default {
 					options: [
 						{
 							value: 0,
-							label: "气象海洋"
-						},
-						{
-							value: 0,
-							label: "水利交通"
-						},
-						{
-							value: 0,
-							label: "防灾减灾"
+							label: "是"
 						},
 						{
-							value: 0,
-							label: "城乡规划"
+							value: 1,
+							label: "否"
 						},
-						{
-							value: 0,
-							label: "农林渔牧"
-						}
 					]
 				},
 				{
@@ -130,23 +110,27 @@ export default {
 					options: [
 						{
 							value: 0,
-							label: "气象海洋"
+							label: "快响应急观测"
 						},
 						{
-							value: 0,
-							label: "水利交通"
+							value: 1,
+							label: "陆地伪装识别"
 						},
 						{
-							value: 0,
-							label: "防灾减灾"
+							value: 2,
+							label: "早期异常监测"
 						},
 						{
-							value: 0,
-							label: "城乡规划"
+							value: 3,
+							label: "海上搜索发现"
 						},
 						{
-							value: 0,
-							label: "农林渔牧"
+							value: 4,
+							label: "海上持续跟踪"
+						},
+						{
+							value: 5,
+							label: "海上识别确认"
 						}
 					]
 				},
@@ -162,23 +146,23 @@ export default {
 					options: [
 						{
 							value: 0,
-							label: "气象海洋"
+							label: "TEST-SA1"
 						},
 						{
-							value: 0,
-							label: "水利交通"
+							value: 1,
+							label: "TEST-SA2"
 						},
 						{
-							value: 0,
-							label: "防灾减灾"
+							value: 2,
+							label: "TEST-SA3"
 						},
 						{
-							value: 0,
-							label: "城乡规划"
+							value: 3,
+							label: "TEST-SA4"
 						},
 						{
-							value: 0,
-							label: "农林渔牧"
+							value: 4,
+							label: "TEST-SA5"
 						}
 					]
 				},
@@ -207,23 +191,23 @@ export default {
 					options: [
 						{
 							value: 0,
-							label: "气象海洋"
+							label: "全条带模式"
 						},
 						{
-							value: 0,
-							label: "水利交通"
+							value: 1,
+							label: "目标筛选模式"
 						},
 						{
-							value: 0,
-							label: "防灾减灾"
+							value: 2,
+							label: "全条带加目标筛选模式"
 						},
 						{
-							value: 0,
-							label: "城乡规划"
+							value: 3,
+							label: "区域加点模式"
 						},
 						{
-							value: 0,
-							label: "农林渔牧"
+							value: 4,
+							label: "点加区模式"
 						}
 					]
 				},
@@ -239,23 +223,11 @@ export default {
 					options: [
 						{
 							value: 0,
-							label: "气象海洋"
-						},
-						{
-							value: 0,
-							label: "水利交通"
+							label: "条带"
 						},
 						{
-							value: 0,
-							label: "防灾减灾"
-						},
-						{
-							value: 0,
-							label: "城乡规划"
-						},
-						{
-							value: 0,
-							label: "农林渔牧"
+							value: 1,
+							label: "扫描"
 						}
 					]
 				},
@@ -286,24 +258,16 @@ export default {
 					options: [
 						{
 							value: 0,
-							label: "气象海洋"
+							label: "A部门"
 						},
 						{
-							value: 0,
-							label: "水利交通"
+							value: 1,
+							label: "B部门"
 						},
 						{
-							value: 0,
-							label: "防灾减灾"
+							value: 2,
+							label: "C部门"
 						},
-						{
-							value: 0,
-							label: "城乡规划"
-						},
-						{
-							value: 0,
-							label: "农林渔牧"
-						}
 					]
 				},
 				{
@@ -318,8 +282,29 @@ export default {
 	watch: {
 		seltask(to, from) {
 			this.form = this.seltask
+			this.form.region = this.form.region ? this.form.region : '中国';
+			this.form.targetPreprocess = this.form.targetPreprocess ? this.form.targetPreprocess : '10s';
+			this.form.rate = this.form.rate ? this.form.rate : '1';
+			this.form.receivingStation = 'TRGS-SY\\TRGS-BJ\\TRGS-HEB\\TRGS-HK\\TRGS-JMS\\TRGS-KS';
+			this.taskInfolabels.forEach(item => {
+				if (this.form[item.prop] == null && item.type === 'select') {
+					this.form[item.prop] = 0
+				}
+			})
 		},
 	},
+	mounted() {
+		this.form = this.seltask
+		this.form.region = this.form.region ? this.form.region : '中国';
+		this.form.targetPreprocess = this.form.targetPreprocess ? this.form.targetPreprocess : '10s';
+		this.form.rate = this.form.rate ? this.form.rate : '1';
+		this.form.receivingStation = 'TRGS-SY\\TRGS-BJ\\TRGS-HEB\\TRGS-HK\\TRGS-JMS\\TRGS-KS';
+		this.taskInfolabels.forEach(item => {
+			if (this.form[item.prop] == null && item.type === 'select') {
+				this.form[item.prop] = 0
+			}
+		})
+	}
 }
 </script>
 
@@ -330,6 +315,7 @@ export default {
 					v-if="task.type=='select'"
 					v-model="form[task.prop]"
 					collapse-tags
+					disabled
 			>
 				<el-option
 						v-for="(item, i) in task.options"
@@ -342,6 +328,7 @@ export default {
 			<el-date-picker
 					v-if="task.type=='time'"
 					v-model="form[task.prop]"
+					disabled
 					placeholder="选择日期时间"
 					type="datetime">
 			</el-date-picker>

src/components/xqglComponents/xqDetails.vue

@@ -56,14 +56,14 @@
 		<!-- 观测需求详情的表格内容 -->
 		<div class="table1TB-area">
 			<el-table ref="multipleTable" :data="XQTBviserble ? getTableXQTBData : getTableXQHQData" height="450"
-								style="width: 100%" tooltip-effect="light">
+								style="width: 100%" tooltip-effect="light" @row-contextmenu="rightClick" @row-click="handleClick">
 				<el-table-column align="center" type="selection" width="40"></el-table-column>
 				<el-table-column v-for="(col, i) in cols" :key="i" :label="col.label" :prop="col.prop" show-overflow-tooltip
 												 width="75"
 				></el-table-column>
 				<el-table-column align="center" label="操作">
 					<template slot-scope="scope">
-						<el-link size="mini" type="primary" @click="showTaskInfo(scope.row)">详细信息</el-link>
+						<el-link size="mini" type="primary" @click.stop="showTaskInfo(scope.row)">详细信息</el-link>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -88,8 +88,8 @@
 			<li @click="rightClickMenuClear">清空</li>
 			<li @click="rightClickMenuClose">取消</li>
 		</div>
-		<!--		<targetPop v-show="targetPopVis" :rowData="selRow" @closePop="targetPopVis = false"-->
-		<!--							 @comfirm="getxqtbList"></targetPop>-->
+		<targetPop v-show="targetPopVis" :rowData="selRow" @closePop="closeWindow"
+							 @comfirm="getxqtbList"></targetPop>
 		<mapPop v-show="mapPopVis" :mapPointSelect="mapPointSelect" @closePop="mapPopVis = false" @comfirm="getxqtbList">
 		</mapPop>
 		<excelPop v-show="excelPopVis" @closePop="excelPopVis = false" @comfirm="getxqtbList"></excelPop>
@@ -295,7 +295,6 @@ export default {
 		},
 		showTaskInfo(row) {
 			this.taskInfoShow = true;
-
 			const satelliteSelected = JSON.parse(row.satelliteSelected)
 			let ids = []
 			for (const i in satelliteSelected) {
@@ -305,8 +304,8 @@ export default {
 			this.seltask = Object.assign({}, row)
 			this.seltask.satelliteSelected = ids.join(",")
 
-			this.seltask.isaccurate = this.seltask.isaccurate == 0 ? '是' : '否'
-			this.seltask.isEmcon = this.seltask.isEmcon == 0 ? '是' : '否'
+			// this.seltask.isaccurate = this.seltask.isaccurate == 0 ? '是' : '否'
+			// this.seltask.isEmcon = this.seltask.isEmcon == 0 ? '是' : '否'
 			this.seltask.pitchAngle += '°'
 			this.seltask.groundResolution = this.seltask.groundResolution + '米'
 		},
@@ -327,8 +326,10 @@ export default {
 				this.checkeALl = false;
 			}
 		},
-
-
+		closeWindow() {
+			this.targetPopVis = false
+			this.$emit("clickTarget");
+		},
 		getTaskList() {
 			this.taskShow = false;
 			this.loading = this.$loading({
@@ -342,7 +343,7 @@ export default {
 				startTime: (this.taskDatetimeRange && this.taskDatetimeRange.length) > 0 ? this.taskDatetimeRange[0] : null,
 				endTime: (this.taskDatetimeRange && this.taskDatetimeRange.length) > 1 ? this.taskDatetimeRange[1] : null,
 			}
-			const names = ["固定目标", "移动目标", "区域目标", "线目标", "点群目标", "未知"]
+			const names = ["点目标", "移动目标", "区域目标", "线目标", "点群目标", "未知"]
 			selAllTargetList(param).then(res => {
 				this.getTableXQTBData = []
 				this.loading.close();
@@ -404,32 +405,19 @@ export default {
 			this.closeExcelWindowVisible = true;
 			//目标列表导入,隐藏
 			this.xqglTargetListVisible = false;
-			console.log(command);
-			if (command === "selectPoints") {
-				this.mapPointSelect = command
-				this.$store.dispatch("xqglMapRectangleVisible", !this.$store.state.xqglMapRectangleVisible)
-				console.log("地图框选被选中：", this.$store.state.xqglMapRectangleVisible);
-				// this.mapSelectForm.lonlat = this.$store.state.xqglMapRectangleLonLats.toString();
-			}
-			if (command === "selectPoint") {
-				this.mapPointSelect = command
-				this.$store.dispatch("xqglMapPointVisible", !this.$store.state.xqglMapPointVisible)
-				console.log("地图点选被选中：", this.$store.state.xqglMapPointVisible);
-				// this.mapSelectForm.lonlat = this.$store.state.xqglMapPointLonLat.toString();
-			}
+			this.$events.emit('map-select', command)
+			this.mapPointSelect = command
 			this.$store.dispatch("xqglContentVisible", false)
-
-
 			//内容详情 弹窗 弹出前，确保 点目标弹窗 和 excel导入弹窗 关闭状态
 			this.XQtargetVisible = false
 			this.closeExcelWindowVisible = false
 			this.mapSelectVisible = true
 
-			this.popIsShow('mapPopVis');
+			// this.popIsShow('mapPopVis');
 		},
 		//观测需求详情表格下的“目标库导入”绑定的事件
 		getXQfromTargetBase() {
-			this.$emit("clickTarget");
+			this.$emit("clickTarget", 'targetListVis');
 			//Excel导入，隐藏
 			this.excelPopVis = false;
 
@@ -437,6 +425,7 @@ export default {
 		//点击excel导入按钮，弹窗；同时，点目标和地图点选两个窗口不显示
 		popExcelWindow() {
 			this.popIsShow('excelPopVis');
+			this.$emit("clickTarget");
 		},
 
 		//观测需求详情某行被 左键 点击时，从子组件表格中获取数据
@@ -559,9 +548,12 @@ export default {
 				6: '海上识别确认',
 			}
 			const typeDic = {
-				0: '固定目标',
+				0: '点目标',
 				1: '移动目标',
 				2: '区域目标',
+				3: '线目标',
+				4: '点群目标',
+				'-1': '未知'
 			}
 			const statusDic = {
 				0: '未提交',
@@ -579,7 +571,7 @@ export default {
 				this.getTableXQTBData = resData;
 				this.getTableXQTBData.forEach(item => {
 					item.observationPurposeChinese = purposeDic[item.observationPurpose];
-					item.typeChinese = typeDic[item.type];
+					item.typeName = typeDic[item.type];
 					item.statusChinese = statusDic[item.status];
 				})
 				//20221019屏蔽添加的目标需求点
@@ -603,6 +595,12 @@ export default {
 		this.getParentId();
 		this.toXQTB();
 		this.getTaskList();
+		const self = this
+		this.$events.on('map-selectresult', (data) => {
+			self.popIsShow('mapPopVis');
+			let tempStore = self.$store
+			tempStore.dispatch("xqglContentVisible", true)
+		})
 	}
 };
 </script>

src/pages/1-main/02-XQGL/xqgl.vue

@@ -38,8 +38,8 @@ export default {
           this[item] = showName === item;
         });
       },
-      clickTarget(){
-        this.targetOrFilterShow('targetListVis');
+      clickTarget(name){
+        this.targetOrFilterShow(name);
       },
 
     //关闭需求列表

src/store/index.js

@@ -3,6 +3,7 @@ import Vue from 'vue'
 
 //引入并使用Vuex
 import Vuex from 'vuex'
+
 Vue.use(Vuex)
 
 import user from './user'
@@ -14,390 +15,390 @@ import rwjs from './rwjs'
 
 //准备actions：用于响应组件中的动作
 const actions = {
-        userTokenAuthorization(context, value) {
-            context.commit('USERTOKENAUTHORIZATION', value)
-        },
-        userLoginName(context, value) {
-            context.commit('USERLOGINNAME', value)
-        },
-        userLoginTypeId(context, value) {
-            context.commit('USERLOGINTYPEID', value)
-        },
-        userOwnMenus(context, value) {
-            context.commit('USEROWNMENUS', value)
-        },
-        userInfo(context, value) {
-            context.commit('USERINFO', value)
-        },
-        jcfwSatelliteVisible(context, value) {
-            context.commit('JCFWSATELLITEVISIBLE', value)
-        },
-        jcfwSatationVisible(context, value) {
-            context.commit('JCFWSATATIONVISIBLE', value)
-        },
-        jcfwSatelliteComputeVisible(context, value) {
-            context.commit('JCFWSATELLITECOMPUTEVISIBLE', value)
-        },
-        jcfwPasswayDialogVisible(context, value) {
-            context.commit('JCFWPASSWAYDIALOGVISIBLE', value)
-        },
-        jcfwCurveDialogVisible(context, value) {
-            context.commit('JCFWCURVEDIALOGVISIBLE', value)
-        },
-        jcfwCurveStationOrMidStation(context, value) {
-            context.commit('JCFWCURVESTATIONORMIDSTATION', value)
-        },
-        jcfwPasswayComputeMethod(context, value) {
-            context.commit('JCFWPASSWAYCOMPUTEMETHOD', value)
-        },
-        jcfwPasswayClickedRowData(context, value) {
-            context.commit('JCFWPASSWAYCLICKEDROWDATA', value)
-        },
-        jcfwCurveClickedRowData(context, value) {
-            context.commit('JCFWCURVECLICKEDROWDATA', value)
-        },
-        xqglContentVisible(context, value) {
-            context.commit('XQGLCONTENTVISIBLE', value)
-        },
-        xqglMapPointLonLat(context, value) {
-            context.commit('XQGLMAPPOINTLONLAT', value)
-        },
-        xqglMapRectangleLonLats(context, value) {
-            context.commit('XQGLMAPRECTANGLELONLATS', value)
-        },
-        xqglMapPointVisible(context, value) {
-            context.commit('XQGLMAPPOINTVISIBLE', value)
-        },
-        xqglMapRectangleVisible(context, value) {
-            context.commit('XQGLMAPRECTANGLEVISIBLE', value)
-        },
-        xqglpagechbuttonclick(context, value) {
-            context.commit('XQGLPAGECHBUTTONCLICK', value)
-        },
-        xqglClickedTargetList(context, value) {
-            context.commit('XQGLCLICKEDTARGETLIST', value)
-        },
-        xqglClickedTargetRowForCesiumSetView(context, value) {
-            context.commit('XQGLCLICKEDTARGETROWFORCESIUMSETVIEW', value)
-        },
-        clearxqglClickedTargetList(context, value) {
-            context.commit('CLEARXQGLCLICKEDTARGETLIST', value)
-        },
-        xqglclickedSatellites(context, value) {
-            context.commit('XQGLCLICKEDSATELLITES', value)
-        },
-        xqglclickedSatellitesForClickedTabel(context, value) {
-            context.commit('XQGLCLICKEDSATELLITESFORCLICKEDTABEL', value)
-        },
-        clearxqglclickedSatellitesForClickedTabel(context, value) {
-            context.commit('CLEARXQGLCLICKEDSATELLITESFORCLICKEDTABEL', value)
-        },
-        // deleteClickedSatellite(context, value) {
-        //     context.commit('DELETECLICKEDSATELLITE', value)
-        // },
-        xqchEstimatePlanToMainPageFlag(context, value) {
-            context.commit('XQCHESTIMATEPLANTOMAINPAGEFLAG', value)
-        },
-        xqchPGandCHsameId(context, value) {
-            context.commit('XQCHPGANDCHSAMEID', value)
-        },
-        xqchPlanEstimateSelectRowTotalTimes(context, value) {
-            context.commit('XQCHPLANESTIMATESELECTROWTOTALTIMES', value)
-        },
-        xqchSelecedItems(context, value) {
-            context.commit('XQCHSELECEDITEMS', value)
-        },
-        xqchCHplanTableData(context, value) {
-            context.commit('XQCHCHPLANTABLEDATA', value)
-        },
-        xqchPlanEstimateVsCHPlans(context, value) {
-            context.commit('XQCHPLANESTIMATEVSCHPLANS', value)
-        },
-        xqchCHplanWindows(context, value) {
-            context.commit('XQCHCHPLANWINDOWS', value)
-        },
-        xqchPlanAdjustWindowIds(context, value) {
-            context.commit('XQCHPLANADJUSTWINDOWIDS', value)
-        },
-        xqchPlanAdjustSelectionDatas(context, value) {
-            context.commit('XQCHPLANADJUSTSELECTIONDATAS', value)
-        },
-        xqchTransferSelectionData(context, value) {
-            context.commit('XQCHTRANSFERSELECTIONDATA', value)
-        },
-        postConfilctCheckData(context, value) {
-            context.commit('POSTCONFILCTCHECKDATA', value)
-        },
-        xqchAdjustPlanStatus(context, value) {
-            context.commit('XQCHADJUSTPLANSTATUS', value)
-        },
-
-
-    }
-    //准备mutations：用于操作数据(state)
-const mutations = {
-        USERTOKENAUTHORIZATION(state, value) {
-            state.userTokenAuthorization = value
-            sessionStorage.setItem("temptoken", value)
-        },
-        USERLOGINNAME(state, value) {
-            state.userLoginName = value
-            sessionStorage.setItem("tempname", value)
-        },
-        USERLOGINTYPEID(state, value) {
-            state.userLoginTypeId = value
-            sessionStorage.setItem("temptypeid", value)
-        },
-        USEROWNMENUS(state, value) {
-            state.userOwnMenus = value
-            sessionStorage.setItem("tempmeuns", value)
-        },
-        USERINFO(state, value) {
-            state.userInfo = Object.assign({}, state.userInfo, value)
-        },
-        JCFWSATELLITEVISIBLE(state, value) {
-            state.jcfwSatelliteVisible = value
-        },
-        JCFWSATATIONVISIBLE(state, value) {
-            state.jcfwSatationVisible = value
-        },
-        JCFWSATELLITECOMPUTEVISIBLE(state, value) {
-            state.jcfwSatelliteComputeVisible = value
-        },
-        JCFWPASSWAYDIALOGVISIBLE(state, value) {
-            state.jcfwPasswayDialogVisible = value
-        },
-        JCFWCURVEDIALOGVISIBLE(state, value) {
-            state.jcfwCurveDialogVisible = value
-        },
-        JCFWCURVESTATIONORMIDSTATION(state, value) {
-            state.jcfwCurveStationOrMidStation = value
-        },
-        JCFWPASSWAYCOMPUTEMETHOD(state, value) {
-            state.jcfwPasswayComputeMethod = value
-        },
-        JCFWPASSWAYCLICKEDROWDATA(state, value) {
-            state.jcfwPasswayClickedRowData = value
-        },
-        JCFWCURVECLICKEDROWDATA(state, value) {
-            state.jcfwCurveClickedRowData = value
-        },
-        XQGLCONTENTVISIBLE(state, value) {
-            state.xqglContentVisible = value
-        },
-        XQGLMAPPOINTLONLAT(state, value) {
-            state.xqglMapPointLonLat = value
-        },
-        XQGLMAPRECTANGLELONLATS(state, value) {
-            state.xqglMapRectangleLonLats = value
-        },
-        XQGLMAPPOINTVISIBLE(state, value) {
-            state.xqglMapPointVisible = value
-        },
-        XQGLMAPRECTANGLEVISIBLE(state, value) {
-            state.xqglMapRectangleVisible = value
-        },
-        XQGLPAGECHBUTTONCLICK(state, value) {
-            state.xqglPageCHbuttonClick = value + 1
-        },
-        XQGLCLICKEDTARGETLIST(state, value) {
-            let findItem = state.xqglClickedTargetList.find(item => {
-                return item.targetId === value.targetId
-            })
-            if (!findItem) {
-                state.xqglClickedTargetList.push(value)
-            }
-        },
-        XQGLCLICKEDTARGETROWFORCESIUMSETVIEW(state, value) {
-            state.xqglClickedTargetRowForCesiumSetView = value
-        },
-        CLEARXQGLCLICKEDTARGETLIST(state, value) {
-            state.xqglClickedTargetList = value
-        },
-        XQGLCLICKEDSATELLITES(state, value) {
-            state.xqglclickedSatellites = value
-
-        },
-        XQGLCLICKEDSATELLITESFORCLICKEDTABEL(state, value) {
-            state.xqglclickedSatellitesForClickedTabel = value
-        },
-        CLEARXQGLCLICKEDSATELLITESFORCLICKEDTABEL(state, value) {
-            state.xqglclickedSatellitesForClickedTabel = value
-        },
-
-        // DELETECLICKEDSATELLITE(state, value) {
-        //     state.xqglclickedSatellitesForClickedTabel = value
-        // },
-        XQCHESTIMATEPLANTOMAINPAGEFLAG(state, value) {
-            state.xqchEstimatePlanToMainPageFlag = value
-        },
-        XQCHPGANDCHSAMEID(state, value) {
-            state.xqchPGandCHsameId = value
-        },
-        XQCHPLANESTIMATESELECTROWTOTALTIMES(state, value) {
-            state.xqchPlanEstimateSelectRowTotalTimes = value
-        },
-        XQCHSELECEDITEMS(state, value) {
-            state.xqchSelecedItems = value
-        },
-        XQCHCHPLANTABLEDATA(state, value) {
-            state.xqchCHplanTableData = value
-        },
-        XQCHPLANESTIMATEVSCHPLANS(state, value) {
-            state.xqchPlanEstimateVsCHPlans = value
-        },
-        XQCHCHPLANWINDOWS(state, value) {
-            state.xqchCHplanWindows = value
-        },
-        XQCHPLANADJUSTWINDOWIDS(state, value) {
-            state.xqchPlanAdjustWindowIds = value
-        },
-        XQCHPLANADJUSTSELECTIONDATAS(state, value) {
-            state.xqchPlanAdjustSelectionDatas = value
-        },
-        XQCHTRANSFERSELECTIONDATA(state, value) {
-            state.xqchTransferSelectionData = value
-        },
-        POSTCONFILCTCHECKDATA(state, value) {
-            state.postConfilctCheckData = value
-        },
-        XQCHADJUSTPLANSTATUS(state, value) {
-            state.xqchAdjustPlanStatus = value
-        },
-
-
-        changeXQListShow(state, value){
-            state.XQListShow = value;
-        }
-
-    }
-    //准备state：用于存储数据
-const state = {
-    // 需求列表 在所有导航页 显示/隐藏
-    XQListShow:false,
+	userTokenAuthorization(context, value) {
+		context.commit('USERTOKENAUTHORIZATION', value)
+	},
+	userLoginName(context, value) {
+		context.commit('USERLOGINNAME', value)
+	},
+	userLoginTypeId(context, value) {
+		context.commit('USERLOGINTYPEID', value)
+	},
+	userOwnMenus(context, value) {
+		context.commit('USEROWNMENUS', value)
+	},
+	userInfo(context, value) {
+		context.commit('USERINFO', value)
+	},
+	jcfwSatelliteVisible(context, value) {
+		context.commit('JCFWSATELLITEVISIBLE', value)
+	},
+	jcfwSatationVisible(context, value) {
+		context.commit('JCFWSATATIONVISIBLE', value)
+	},
+	jcfwSatelliteComputeVisible(context, value) {
+		context.commit('JCFWSATELLITECOMPUTEVISIBLE', value)
+	},
+	jcfwPasswayDialogVisible(context, value) {
+		context.commit('JCFWPASSWAYDIALOGVISIBLE', value)
+	},
+	jcfwCurveDialogVisible(context, value) {
+		context.commit('JCFWCURVEDIALOGVISIBLE', value)
+	},
+	jcfwCurveStationOrMidStation(context, value) {
+		context.commit('JCFWCURVESTATIONORMIDSTATION', value)
+	},
+	jcfwPasswayComputeMethod(context, value) {
+		context.commit('JCFWPASSWAYCOMPUTEMETHOD', value)
+	},
+	jcfwPasswayClickedRowData(context, value) {
+		context.commit('JCFWPASSWAYCLICKEDROWDATA', value)
+	},
+	jcfwCurveClickedRowData(context, value) {
+		context.commit('JCFWCURVECLICKEDROWDATA', value)
+	},
+	xqglContentVisible(context, value) {
+		context.commit('XQGLCONTENTVISIBLE', value)
+	},
+	xqglMapPointLonLat(context, value) {
+		context.commit('XQGLMAPPOINTLONLAT', value)
+	},
+	xqglMapRectangleLonLats(context, value) {
+		context.commit('XQGLMAPRECTANGLELONLATS', value)
+	},
+	xqglMapPointVisible(context, value) {
+		context.commit('XQGLMAPPOINTVISIBLE', value)
+	},
+	xqglMapRectangleVisible(context, value) {
+		context.commit('XQGLMAPRECTANGLEVISIBLE', value)
+	},
+	xqglpagechbuttonclick(context, value) {
+		context.commit('XQGLPAGECHBUTTONCLICK', value)
+	},
+	xqglClickedTargetList(context, value) {
+		context.commit('XQGLCLICKEDTARGETLIST', value)
+	},
+	xqglClickedTargetRowForCesiumSetView(context, value) {
+		context.commit('XQGLCLICKEDTARGETROWFORCESIUMSETVIEW', value)
+	},
+	clearxqglClickedTargetList(context, value) {
+		context.commit('CLEARXQGLCLICKEDTARGETLIST', value)
+	},
+	xqglclickedSatellites(context, value) {
+		context.commit('XQGLCLICKEDSATELLITES', value)
+	},
+	xqglclickedSatellitesForClickedTabel(context, value) {
+		context.commit('XQGLCLICKEDSATELLITESFORCLICKEDTABEL', value)
+	},
+	clearxqglclickedSatellitesForClickedTabel(context, value) {
+		context.commit('CLEARXQGLCLICKEDSATELLITESFORCLICKEDTABEL', value)
+	},
+	// deleteClickedSatellite(context, value) {
+	//     context.commit('DELETECLICKEDSATELLITE', value)
+	// },
+	xqchEstimatePlanToMainPageFlag(context, value) {
+		context.commit('XQCHESTIMATEPLANTOMAINPAGEFLAG', value)
+	},
+	xqchPGandCHsameId(context, value) {
+		context.commit('XQCHPGANDCHSAMEID', value)
+	},
+	xqchPlanEstimateSelectRowTotalTimes(context, value) {
+		context.commit('XQCHPLANESTIMATESELECTROWTOTALTIMES', value)
+	},
+	xqchSelecedItems(context, value) {
+		context.commit('XQCHSELECEDITEMS', value)
+	},
+	xqchCHplanTableData(context, value) {
+		context.commit('XQCHCHPLANTABLEDATA', value)
+	},
+	xqchPlanEstimateVsCHPlans(context, value) {
+		context.commit('XQCHPLANESTIMATEVSCHPLANS', value)
+	},
+	xqchCHplanWindows(context, value) {
+		context.commit('XQCHCHPLANWINDOWS', value)
+	},
+	xqchPlanAdjustWindowIds(context, value) {
+		context.commit('XQCHPLANADJUSTWINDOWIDS', value)
+	},
+	xqchPlanAdjustSelectionDatas(context, value) {
+		context.commit('XQCHPLANADJUSTSELECTIONDATAS', value)
+	},
+	xqchTransferSelectionData(context, value) {
+		context.commit('XQCHTRANSFERSELECTIONDATA', value)
+	},
+	postConfilctCheckData(context, value) {
+		context.commit('POSTCONFILCTCHECKDATA', value)
+	},
+	xqchAdjustPlanStatus(context, value) {
+		context.commit('XQCHADJUSTPLANSTATUS', value)
+	},
+
 
+}
+//准备mutations：用于操作数据(state)
+const mutations = {
+	USERTOKENAUTHORIZATION(state, value) {
+		state.userTokenAuthorization = value
+		sessionStorage.setItem("temptoken", value)
+	},
+	USERLOGINNAME(state, value) {
+		state.userLoginName = value
+		sessionStorage.setItem("tempname", value)
+	},
+	USERLOGINTYPEID(state, value) {
+		state.userLoginTypeId = value
+		sessionStorage.setItem("temptypeid", value)
+	},
+	USEROWNMENUS(state, value) {
+		state.userOwnMenus = value
+		sessionStorage.setItem("tempmeuns", value)
+	},
+	USERINFO(state, value) {
+		state.userInfo = Object.assign({}, state.userInfo, value)
+	},
+	JCFWSATELLITEVISIBLE(state, value) {
+		state.jcfwSatelliteVisible = value
+	},
+	JCFWSATATIONVISIBLE(state, value) {
+		state.jcfwSatationVisible = value
+	},
+	JCFWSATELLITECOMPUTEVISIBLE(state, value) {
+		state.jcfwSatelliteComputeVisible = value
+	},
+	JCFWPASSWAYDIALOGVISIBLE(state, value) {
+		state.jcfwPasswayDialogVisible = value
+	},
+	JCFWCURVEDIALOGVISIBLE(state, value) {
+		state.jcfwCurveDialogVisible = value
+	},
+	JCFWCURVESTATIONORMIDSTATION(state, value) {
+		state.jcfwCurveStationOrMidStation = value
+	},
+	JCFWPASSWAYCOMPUTEMETHOD(state, value) {
+		state.jcfwPasswayComputeMethod = value
+	},
+	JCFWPASSWAYCLICKEDROWDATA(state, value) {
+		state.jcfwPasswayClickedRowData = value
+	},
+	JCFWCURVECLICKEDROWDATA(state, value) {
+		state.jcfwCurveClickedRowData = value
+	},
+	XQGLCONTENTVISIBLE(state, value) {
+		state.xqglContentVisible = value
+	},
+	XQGLMAPPOINTLONLAT(state, value) {
+		state.xqglMapPointLonLat = value
+	},
+	XQGLMAPRECTANGLELONLATS(state, value) {
+		state.xqglMapRectangleLonLats = value
+	},
+	XQGLMAPPOINTVISIBLE(state, value) {
+		state.xqglMapPointVisible = value
+	},
+	XQGLMAPRECTANGLEVISIBLE(state, value) {
+		state.xqglMapRectangleVisible = value
+	},
+	XQGLPAGECHBUTTONCLICK(state, value) {
+		state.xqglPageCHbuttonClick = value + 1
+	},
+	XQGLCLICKEDTARGETLIST(state, value) {
+		let findItem = state.xqglClickedTargetList.find(item => {
+			return item.targetId === value.targetId
+		})
+		if (!findItem) {
+			state.xqglClickedTargetList.push(value)
+		}
+	},
+	XQGLCLICKEDTARGETROWFORCESIUMSETVIEW(state, value) {
+		state.xqglClickedTargetRowForCesiumSetView = value
+	},
+	CLEARXQGLCLICKEDTARGETLIST(state, value) {
+		state.xqglClickedTargetList = value
+	},
+	XQGLCLICKEDSATELLITES(state, value) {
+		state.xqglclickedSatellites = value
+
+	},
+	XQGLCLICKEDSATELLITESFORCLICKEDTABEL(state, value) {
+		state.xqglclickedSatellitesForClickedTabel = value
+	},
+	CLEARXQGLCLICKEDSATELLITESFORCLICKEDTABEL(state, value) {
+		state.xqglclickedSatellitesForClickedTabel = value
+	},
+
+	// DELETECLICKEDSATELLITE(state, value) {
+	//     state.xqglclickedSatellitesForClickedTabel = value
+	// },
+	XQCHESTIMATEPLANTOMAINPAGEFLAG(state, value) {
+		state.xqchEstimatePlanToMainPageFlag = value
+	},
+	XQCHPGANDCHSAMEID(state, value) {
+		state.xqchPGandCHsameId = value
+	},
+	XQCHPLANESTIMATESELECTROWTOTALTIMES(state, value) {
+		state.xqchPlanEstimateSelectRowTotalTimes = value
+	},
+	XQCHSELECEDITEMS(state, value) {
+		state.xqchSelecedItems = value
+	},
+	XQCHCHPLANTABLEDATA(state, value) {
+		state.xqchCHplanTableData = value
+	},
+	XQCHPLANESTIMATEVSCHPLANS(state, value) {
+		state.xqchPlanEstimateVsCHPlans = value
+	},
+	XQCHCHPLANWINDOWS(state, value) {
+		state.xqchCHplanWindows = value
+	},
+	XQCHPLANADJUSTWINDOWIDS(state, value) {
+		state.xqchPlanAdjustWindowIds = value
+	},
+	XQCHPLANADJUSTSELECTIONDATAS(state, value) {
+		state.xqchPlanAdjustSelectionDatas = value
+	},
+	XQCHTRANSFERSELECTIONDATA(state, value) {
+		state.xqchTransferSelectionData = value
+	},
+	POSTCONFILCTCHECKDATA(state, value) {
+		state.postConfilctCheckData = value
+	},
+	XQCHADJUSTPLANSTATUS(state, value) {
+		state.xqchAdjustPlanStatus = value
+	},
+
+
+	changeXQListShow(state, value) {
+		state.XQListShow = value;
+	}
 
+}
+//准备state：用于存储数据
+const state = {
+	// 需求列表 在所有导航页 显示/隐藏
+	XQListShow: false,
 
 
-    //登陆用户名，密码
-    userInfo: {
-        username: 'admin',
-        password: 'admin',
-        username1: '123',
-        password1: '123',
-    },
-    //用户登录token
-    userTokenAuthorization: sessionStorage.getItem("temptoken"),
-    //用户登录名
-    userLoginName: sessionStorage.getItem("tempname"),
-    //用户登录权限值
-    userLoginTypeId: sessionStorage.getItem("temptypeid"),
-    //用户登录拥有的菜单配置
-    userOwnMenus: sessionStorage.getItem("tempmeuns"),
+	//登陆用户名，密码
+	userInfo: {
+		username: 'admin',
+		password: 'admin',
+		username1: '123',
+		password1: '123',
+	},
+	//用户登录token
+	userTokenAuthorization: sessionStorage.getItem("temptoken"),
+	//用户登录名
+	userLoginName: sessionStorage.getItem("tempname"),
+	//用户登录权限值
+	userLoginTypeId: sessionStorage.getItem("temptypeid"),
+	//用户登录拥有的菜单配置
+	userOwnMenus: sessionStorage.getItem("tempmeuns"),
 
-    
-    //基础服务页，控制三个表格 显示/隐藏
-    jcfwSatelliteVisible: true,
-    jcfwSatationVisible: true,
-    jcfwSatelliteComputeVisible: true,
 
-    //基础服务页，控制 轨道计算 时间选择弹框 显示/隐藏
-    jcfwPasswayDialogVisible: false,
-    //基础服务页，控制 测站预报 时间选择弹框 显示/隐藏
-    jcfwCurveDialogVisible: false,
-    //基础服务页，控制 测站预报弹框 下的 地面站 和 中继卫星的显示/隐藏
-    jcfwCurveStationOrMidStation: '',
-    //基础服务，卫星轨道计算方法
-    jcfwPasswayComputeMethod: '',
-    //基础服务，卫星轨道计算 单击某行 获得的数据
-    jcfwPasswayClickedRowData: '',
-    //基础服务，测站预报  单击某行  获得的数据
-    jcfwCurveClickedRowData: '',
+	//基础服务页，控制三个表格 显示/隐藏
+	jcfwSatelliteVisible: true,
+	jcfwSatationVisible: true,
+	jcfwSatelliteComputeVisible: true,
 
-    //需求管理页面，地图选点的经纬度数据
-    xqglMapPointLonLat: [],
+	//基础服务页，控制 轨道计算 时间选择弹框 显示/隐藏
+	jcfwPasswayDialogVisible: false,
+	//基础服务页，控制 测站预报 时间选择弹框 显示/隐藏
+	jcfwCurveDialogVisible: false,
+	//基础服务页，控制 测站预报弹框 下的 地面站 和 中继卫星的显示/隐藏
+	jcfwCurveStationOrMidStation: '',
+	//基础服务，卫星轨道计算方法
+	jcfwPasswayComputeMethod: '',
+	//基础服务，卫星轨道计算 单击某行 获得的数据
+	jcfwPasswayClickedRowData: '',
+	//基础服务，测站预报  单击某行  获得的数据
+	jcfwCurveClickedRowData: '',
 
-    //需求管理页面，地图 框选 的经纬度数据
-    xqglMapRectangleLonLats: [],
+	//需求管理页面，地图选点的经纬度数据
+	xqglMapPointLonLat: [],
 
-    //需求管理页面，地图点选，被选中
-    xqglMapPointVisible: false,
+	//需求管理页面，地图 框选 的经纬度数据
+	xqglMapRectangleLonLats: [],
 
-    //需求管理页面，地图框选，被选中
-    xqglMapRectangleVisible: false,
+	//需求管理页面，地图点选，被选中
+	xqglMapPointVisible: false,
 
-    //需求管理页面，整个内容 显示/隐藏
-    xqglContentVisible: true,
+	//需求管理页面，地图框选，被选中
+	xqglMapRectangleVisible: false,
 
-    //需求管理页面，筹划按钮，点击后更改该值为2，满足导航组件的 响应
-    xqglPageCHbuttonClick: 1,
+	//需求管理页面，地图点选，被选中
+	xqglMapLineVisible: false,
 
-    //需求管理页面，已选目标列表的表格内容
-    xqglClickedTargetList: [],
-    //需求管理页面，点击已选目标列表用于cesium视图居中显示
-    xqglClickedTargetRowForCesiumSetView: {},
+	//需求管理页面，地图框选，被选中
+	xqglMapPointsVisible: false,
+	xqglMapMovePointVisible: false,
 
-    //需求管理页面，卫星选中列表的行数
-    xqglclickedSatellites: [],
+	//需求管理页面，整个内容 显示/隐藏
+	xqglContentVisible: true,
 
-    //需求管理页面，卫星选中列表使用数据
-    xqglclickedSatellitesForClickedTabel: [],
-    copyClickdSatellitesList: [],
+	//需求管理页面，筹划按钮，点击后更改该值为2，满足导航组件的 响应
+	xqglPageCHbuttonClick: 1,
 
-    
+	//需求管理页面，已选目标列表的表格内容
+	xqglClickedTargetList: [],
+	//需求管理页面，点击已选目标列表用于cesium视图居中显示
+	xqglClickedTargetRowForCesiumSetView: {},
 
-    
+	//需求管理页面，卫星选中列表的行数
+	xqglclickedSatellites: [],
 
-    //需求筹划页面 第一页 到 第二页的 跳转标识
-    xqchEstimatePlanToMainPageFlag: null,
+	//需求管理页面，卫星选中列表使用数据
+	xqglclickedSatellitesForClickedTabel: [],
+	copyClickdSatellitesList: [],
 
-    //需求筹划页面方案评估信息表格 和 筹划方案表格 共有id，设置相同颜色
-    xqchPGandCHsameId: "",
-    xqchPlanEstimateSelectRowTotalTimes: "",
 
-    //需求筹划页面 一条评估信息  所对应的 筹划方案 数据
-    xqchSelecedItems: [],
+	//需求筹划页面 第一页 到 第二页的 跳转标识
+	xqchEstimatePlanToMainPageFlag: null,
 
-    //需求筹划页面 第二页 需求筹划请求到的 表格数据
-    xqchCHplanTableData: [],
+	//需求筹划页面方案评估信息表格 和 筹划方案表格 共有id，设置相同颜色
+	xqchPGandCHsameId: "",
+	xqchPlanEstimateSelectRowTotalTimes: "",
 
-    //需求筹划页面 第二页 每一条方案评估数据 对应的 多条筹划方案数据 
-    xqchPlanEstimateVsCHPlans: [],
+	//需求筹划页面 一条评估信息  所对应的 筹划方案 数据
+	xqchSelecedItems: [],
 
-    //需求筹划页面 第二页 每一条方案评估数据 对应的 多条筹划方案数据的windowIds
-    xqchCHplanWindows: [],
+	//需求筹划页面 第二页 需求筹划请求到的 表格数据
+	xqchCHplanTableData: [],
 
-    //需求筹划页面 第二页 方案调整的选中的id（即是windowId)
-    xqchPlanAdjustWindowIds: [],
+	//需求筹划页面 第二页 每一条方案评估数据 对应的 多条筹划方案数据
+	xqchPlanEstimateVsCHPlans: [],
 
-    //需求筹划页面 第二页 方案调整的选中数据
-    xqchPlanAdjustSelectionDatas: [],
+	//需求筹划页面 第二页 每一条方案评估数据 对应的 多条筹划方案数据的windowIds
+	xqchCHplanWindows: [],
 
-    //需求筹划页面 第二页 数传列表选中数据
-    xqchTransferSelectionData: [],
+	//需求筹划页面 第二页 方案调整的选中的id（即是windowId)
+	xqchPlanAdjustWindowIds: [],
 
-    //需求筹划页面 第二页 冲突情况检测 请求数据
-    postConfilctCheckData: [],
+	//需求筹划页面 第二页 方案调整的选中数据
+	xqchPlanAdjustSelectionDatas: [],
 
-    //需求筹划页面 第二页 点击  修改方案 的状态
-    xqchAdjustPlanStatus: false,
+	//需求筹划页面 第二页 数传列表选中数据
+	xqchTransferSelectionData: [],
 
+	//需求筹划页面 第二页 冲突情况检测 请求数据
+	postConfilctCheckData: [],
 
+	//需求筹划页面 第二页 点击  修改方案 的状态
+	xqchAdjustPlanStatus: false,
 
 
 }
 
 //创建并暴露store
 export default new Vuex.Store({
-    actions,
-    mutations,
-    state,
-    modules: {
-        user,
-        jcfw,
-        xqgl,
-        xqjy,
-        xqch,
-        rwjs,
-    }
-})
+	actions,
+	mutations,
+	state,
+	modules: {
+		user,
+		jcfw,
+		xqgl,
+		xqjy,
+		xqch,
+		rwjs,
+	}
+})

src/store/xqgl.js

@@ -16,6 +16,7 @@ export default {
             state.getXqtb = !state.getXqtb;
         },
         changeToFilterSate(state){
+            debugger
             state.toFilterSate = !state.toFilterSate;
         },
         setInvestigationMeans(state, val){
@@ -29,4 +30,4 @@ export default {
         },
     },
     actions: {},
-}
+}