update

src/assets/DicData/KeyName_CN.js

@@ -1,6 +1,6 @@
 const dictionary = {
 	observationPurpose: {
-		1: "快响应急侦察",
+		1: "快响应急观测",
 		2: "陆地伪装识别",
 		3: "早期异常监测",
 		4: "海上搜索发现",

src/assets/mockData/mockData.js

@@ -5,7 +5,7 @@ exports.mockData = {
             needcode: "fptyrotfqmmbidjvtvxmz",
             needname: "海洋156海上其他",
             prioritylevel: 18,
-            purpose: "应急侦察",
+            purpose: "应急观测",
             starttime: "1981-02-12 01:19:10",
             status: "未提交",
             targername: "中国大陆",
@@ -15,7 +15,7 @@ exports.mockData = {
             needcode: "hllnztguwcnblojpckisre",
             needname: "海洋156海上其他",
             prioritylevel: 15,
-            purpose: "常规侦察",
+            purpose: "常规观测",
             starttime: "1996-09-29 15:32:46",
             status: "已完成",
             targername: "中国大陆",
@@ -25,7 +25,7 @@ exports.mockData = {
             needcode: "gjjiwhjylzoibliofukxtr",
             needname: "海洋158海上船只",
             prioritylevel: 15,
-            purpose: "一般侦察",
+            purpose: "一般观测",
             starttime: "1985-10-15 16:11:28",
             status: "已提交",
             targername: "南太平洋",
@@ -35,7 +35,7 @@ exports.mockData = {
             needcode: "nswscwuxqvtjreqbpjvif",
             needname: "海洋156海上其他",
             prioritylevel: 14,
-            purpose: "一般侦察",
+            purpose: "一般观测",
             starttime: "1990-02-04 21:53:24",
             status: "已提交",
             targername: "马六甲海湾",
@@ -45,7 +45,7 @@ exports.mockData = {
             needcode: "fnvsjwdmuiitpolqthzqh",
             needname: "海洋156海上其他",
             prioritylevel: 10,
-            purpose: "应急侦察",
+            purpose: "应急观测",
             starttime: "1981-05-01 01:50:14",
             status: "已提交",
             targername: "中国大陆",
@@ -55,7 +55,7 @@ exports.mockData = {
             needcode: "fgdgalxuuxbibtxjxdnill",
             needname: "海洋156海上其他",
             prioritylevel: 19,
-            purpose: "应急侦察",
+            purpose: "应急观测",
             starttime: "1993-09-15 04:45:36",
             status: "已提交",
             targername: "马六甲海湾",
@@ -65,7 +65,7 @@ exports.mockData = {
             needcode: "oooltllzauixwilkkwgnr",
             needname: "海洋156海上船只",
             prioritylevel: 11,
-            purpose: "应急侦察",
+            purpose: "应急观测",
             starttime: "1996-06-09 07:20:50",
             status: "已提交",
             targername: "南太平洋",
@@ -75,7 +75,7 @@ exports.mockData = {
             needcode: "ebnbtebngbkhehaqrltpk",
             needname: "海洋156海上其他",
             prioritylevel: 17,
-            purpose: "常规侦察",
+            purpose: "常规观测",
             starttime: "1998-12-29 02:08:00",
             status: "已提交",
             targername: "马六甲海湾",
@@ -935,4 +935,4 @@ exports.mockData = {
             role: "普通浏览员"
         },
     ],
-}
+}

src/components/rwjsComponents/rwyxzt.vue

@@ -155,7 +155,7 @@ export default {
         this.rwxxTempHoverRow = row
       },
       rwxxPaginationHandleSizeChange(val){
-        //val 为 每页的数据 条数 
+        //val 为 每页的数据 条数
 
       },
       rwxxPaginationHandleCurrentChange(val){
@@ -179,7 +179,7 @@ export default {
       },
       getRwxxTableData(data={}){
         const purposeDic = {
-          1: "快响应急侦察",
+          1: "快响应急观测",
           2: "陆地伪装识别",
           3: "早期异常监测",
           4: "海上搜索发现",
@@ -214,14 +214,14 @@ export default {
           if (res.code === 200) {
             this.wxgcxxTableData = res.data;
             // this.wxgcxxTableData.forEach(item => {
-              
+
             // })
           } else {
             this.$message.error(res.msg);
           }
         })
       }
-      
+
     },
     mounted(){
       this.getRwxxTableData();
@@ -404,7 +404,7 @@ export default {
             padding: 0px;
             margin: 0px 2px;
             font-size: 12px;
-            min-width: 2px; 
+            min-width: 2px;
             height: 24px;
             width: 24px;
             line-height: 24px;
@@ -417,7 +417,7 @@ export default {
           }
           /deep/ .el-pagination .el-pagination__jump{
             color: #fff;
-            margin-left: 4px; 
+            margin-left: 4px;
           }
           /deep/ .el-pagination__editor.el-input{
             background: transparent;
@@ -432,7 +432,7 @@ export default {
           }
         }
       }
-      
+
     }
     .wxgcxx-area{
       width: 587px;
@@ -508,4 +508,4 @@ export default {
     background: #282828;
   }
 }
-</style>
+</style>

src/components/rwjsComponents/wxyxzt.vue

@@ -70,7 +70,7 @@ export default {
         //   list:['WXJ10-1','WXJ10-2','WXJ10-3','WXJ10-4','WXJ11-1','WXJ11-2','WXJ11-3','WXJ11-4','WXJ11-5']
         // },
         // {
-        //   name:'电子侦察卫星',
+        //   name:'电子观测卫星',
         //   list:['WXJ12-1','WXJ12-2','WXJ12-3','WXJ12-4','WXJ12-1','WXJ12-2','WXJ12-3']
         // },
         // {

src/components/tables/xqglTable_WXConfilct.vue

@@ -77,11 +77,11 @@ export default {
         },
         {
           prop: 'stime',
-          name: '侦察开始时间'
+          name: '观测开始时间'
         },
         {
           prop: 'etime',
-          name: '侦察结束时间'
+          name: '观测结束时间'
         }
       ],
       tableDatas: [{
@@ -352,4 +352,4 @@ export default {
 /deep/ .el-table tbody tr:hover > td {
   background-color: transparent !important;
 }
-</style>
+</style>

src/components/tables/xqglTable_XQListTable.vue

@@ -132,7 +132,7 @@ export default{
       return {
         //总数据
         xqglXQListTable: [],
-       
+
       }
     },
     methods:{
@@ -160,7 +160,7 @@ export default{
                 var purposeChinese = element.observationPurpose;
                 switch(purposeChinese){
                     case 1:
-                        element.observationPurposeChinese = "快响应急侦察";
+                        element.observationPurposeChinese = "快响应急观测";
                         break;
                     case 2:
                         element.observationPurposeChinese = "陆地伪装识别";
@@ -202,7 +202,7 @@ export default{
     mounted() {
         // this.xqglXQListTable = this.mockData.mockData.xqglXQListTableData;
         this.getData();
-        
+
     },
 }
 </script>
@@ -251,4 +251,4 @@ export default{
 }
 
 
-</style>
+</style>

src/components/tables/xqglTable_XQTB.vue

@@ -80,7 +80,7 @@ export default{
       rightClick(row, column, event){
         console.log('row, column, event:',row, column, event)
         // event.preventDefault();
-        
+
         this.rightClickSentData['row'] = row
         this.rightClickSentData['event'] = event
         this.$emit("getRightClickValue", this.rightClickSentData)
@@ -104,7 +104,7 @@ export default{
           element["typeChinese"] = "";
           element["statusChinese"] = "";
           if (element.observationPurpose === 1) {
-            element.observationPurposeChinese = '快响应急侦察';
+            element.observationPurposeChinese = '快响应急观测';
           }
           if (element.observationPurpose === 2) {
             element.observationPurposeChinese = '陆地伪装识别';
@@ -138,7 +138,7 @@ export default{
           if (element.status === 1) {
             element.statusChinese = '已提交';
           }
-          
+
         });
         // return this.tableXQTBData;
         return tempTableXQTBData;
@@ -195,4 +195,4 @@ export default{
 /deep/.el-table tbody tr:hover > td {
   background-color: transparent !important;
 }
-</style>
+</style>

src/components/xqglComponents/targetPop.vue

@@ -36,7 +36,7 @@
             <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-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>
@@ -52,7 +52,7 @@
 
     </div>
 </template>
-  
+
 <script>
 import { mapState, mapMutations } from 'vuex';
 import { getXQTBListViaPointTarget } from '@/api/xqglApi.js';
@@ -82,7 +82,7 @@ export default {
             observationPurposeOpt: [
                 {
                     value: 1,
-                    label: '快响应急侦察',
+                    label: '快响应急观测',
                 },
                 {
                     value: 2,
@@ -155,18 +155,18 @@ export default {
 
     },
     mounted() {
-        
+
     }
 };
 </script>
-  
+
 <style lang='scss' scoped>
 .XQ-target {
     width: 356px;
     height: 418px;
     position: absolute;
     top: 74px;
-    left: 524px;
+    left: 100%;
     z-index: 1;
     background: url('@/assets/ClipImage/dikuang/tanchuang/dianmubiao.png');
     background-size: 100% 100%;
@@ -320,4 +320,4 @@ export default {
     }
 
 }
-</style>
+</style>

src/components/xqglComponents/taskInfos.vue

@@ -0,0 +1,354 @@
+<script>
+export default {
+	name: "taskInfos",
+	props: {
+		seltask: {},
+	},
+	data() {
+		return {
+			taskInfolabels: [
+				{
+					label: "需求来源",
+					prop: "demandSources",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "提出部门",
+					type: 'select',
+					prop: "proposeDepartment",
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "需求来源描述",
+					prop: "demandDescribe",
+					type: 'input'
+				},
+				{
+					label: "需求提出时间",
+					prop: "createTime",
+					type: "time"
+				},
+				{
+					label: "是否精确",
+					prop: "isaccurate",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "是"
+						},
+						{
+							value: 1,
+							label: "否"
+						},
+					]
+				},
+				{
+					label: "是否电磁静默",
+					prop: "isEmcon",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "国家/地区",
+					prop: "region",
+					type: 'input'
+				},
+				{
+					label: "目标观测时长",
+					prop: "targetPreprocess",
+					type: 'input'
+				},
+				{
+					label: "观测手段",
+					prop: "InvestigativeMeans",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "最小观测间隔时间",
+					prop: "reqInterval",
+					type: 'time'
+				},
+				{
+					label: "卫星",
+					prop: "satelliteSelected",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "频次",
+					prop: "rate",
+					type: 'input',
+				}, {
+					label: "接收开始时间",
+					prop: "startTime",
+					type: 'time'
+				}, {
+					label: "接收结束时间",
+					prop: "endTime",
+					type: 'time'
+				},
+				{
+					label: "接收站名",
+					prop: "receivingStation",
+					type: 'input',
+				},
+				{
+					label: "工作模式",
+					prop: "workMode",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "传感器代号",
+					prop: "sensorID",
+					type: 'input',
+				},
+				{
+					label: "传感器模式",
+					prop: "sensorMode",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "成像次数",
+					prop: "imageTime",
+					type: 'input',
+				},
+				{
+					label: "俯仰角",
+					prop: "pitchAngle",
+					type: 'input',
+				},
+				{
+					label: "分辨率",
+					prop: "groundResolution",
+					type: 'input',
+				},
+				{
+					label: "先验信息",
+					prop: "priorInfo",
+					type: 'input',
+				},
+				{
+					label: "产品目的地",
+					prop: "productDest",
+					type: 'select',
+					options: [
+						{
+							value: 0,
+							label: "气象海洋"
+						},
+						{
+							value: 0,
+							label: "水利交通"
+						},
+						{
+							value: 0,
+							label: "防灾减灾"
+						},
+						{
+							value: 0,
+							label: "城乡规划"
+						},
+						{
+							value: 0,
+							label: "农林渔牧"
+						}
+					]
+				},
+				{
+					label: "目标点集",
+					prop: "points",
+					type: 'input',
+				},
+			],
+			form: {}
+		}
+	},
+	watch: {
+		seltask(to, from) {
+			this.form = this.seltask
+		},
+	},
+}
+</script>
+
+<template>
+	<el-form :inline="true" :model="form" class="demo-form-inline">
+		<el-form-item v-for="(task, key) in taskInfolabels" :key="key" :label="task.label + ':'">
+			<el-select
+					v-if="task.type=='select'"
+					v-model="form[task.prop]"
+					collapse-tags
+			>
+				<el-option
+						v-for="(item, i) in task.options"
+						:key="i"
+						:label="item.label"
+						:value="item.value"
+				/>
+			</el-select>
+			<el-input v-if="task.type=='input'" v-model="form[task.prop]" disabled placeholder="无"></el-input>
+			<el-date-picker
+					v-if="task.type=='time'"
+					v-model="form[task.prop]"
+					placeholder="选择日期时间"
+					type="datetime">
+			</el-date-picker>
+		</el-form-item>
+	</el-form>
+</template>
+
+<style lang="scss" scoped>
+
+</style>

src/components/xqglComponents/xqDetails.vue

@@ -17,11 +17,20 @@
 					手动导入<i class="el-icon-arrow-down el-icon--right"></i>
 				</el-button>
 				<el-dropdown-menu slot="dropdown">
-					<el-dropdown-item v-if="commonFunction.getUserConfig($store.state.userOwnMenus, 20001).available"
-														command="selectPoint">地图点选
+					<el-dropdown-item
+							command="selectPoint">点目标
 					</el-dropdown-item>
-					<el-dropdown-item v-if="commonFunction.getUserConfig($store.state.userOwnMenus, 20002).available"
-														command="selectPoints">地图框选
+					<el-dropdown-item
+							command="selectLine">线目标
+					</el-dropdown-item>
+					<el-dropdown-item
+							command="selectRegion">区域目标
+					</el-dropdown-item>
+					<el-dropdown-item
+							command="selectPoints">点群目标
+					</el-dropdown-item>
+					<el-dropdown-item
+							command="selectMovePoint">移动目标
 					</el-dropdown-item>
 				</el-dropdown-menu>
 			</el-dropdown>
@@ -44,7 +53,7 @@
 				<el-button class="get-XQ" type="primary">获取详情</el-button>
 			</div>
 		</div>
-		<!-- 侦察需求详情的表格内容 -->
+		<!-- 观测需求详情的表格内容 -->
 		<div class="table1TB-area">
 			<el-table ref="multipleTable" :data="XQTBviserble ? getTableXQTBData : getTableXQHQData" height="450"
 								style="width: 100%" tooltip-effect="light">
@@ -123,14 +132,9 @@
 			</div>
 		</el-dialog>
 		<el-dialog :visible.sync="taskInfoShow" show-close title="详细信息" width="60%">
-			<el-form :inline="true" :model="seltask" class="demo-form-inline">
-
-				<el-form-item v-for="(item, key) in taskInfolabels" :key="item" :label="item + ':'">
-					<el-input v-model="seltask[key]" disabled placeholder="无"></el-input>
-				</el-form-item>
-			</el-form>
+			<task-infos :seltask="seltask"></task-infos>
 			<div slot="footer">
-				<el-button @click="taskShow=false">取 消</el-button>
+				<el-button @click="taskInfoShow=false">取 消</el-button>
 				<el-button type="primary" @click="getTaskList">确 定</el-button>
 			</div>
 		</el-dialog>
@@ -160,43 +164,37 @@ import excelPop from './excelPop.vue';
 
 import {mapState, mapMutations} from 'vuex'
 import {selAllTargetList} from "@/api/rwjsApi";
+import TaskInfos from "@/components/xqglComponents/taskInfos.vue";
 
 export default {
 	name: "xqDetails",
-	components: {xqglTableTB, xqglTableHQ, targetPop, mapPop, excelPop},
+	components: {TaskInfos, xqglTableTB, xqglTableHQ, targetPop, mapPop, excelPop},
 	data() {
 		return {
 			taskInfolabels: {
-				rate: "频次",
-				InvestigativeMeans: "侦察手段",
-				satelliteSelected: "卫星ID",
-
 				demandSources: "需求来源",
-
 				proposeDepartment: "提出部门",
 				demandDescribe: "需求来源描述",
-
+				createTime: "需求提出时间",
 				isaccurate: "是否精确",
-
 				isEmcon: "是否电磁静默",
+				region: "国家/地区",
+				targetPreprocess: "目标观测时长",
+				InvestigativeMeans: "观测手段",
 				reqInterval: "最小观测间隔时间",
-
+				satelliteSelected: "卫星",
+				rate: "频次",
+				startTime: "接收开始时间",
+				endTime: "接收结束时间",
 				receivingStation: "接收站名",
-
 				workMode: "工作模式",
-
 				sensorID: "传感器代号",
-
 				sensorMode: "传感器模式",
-
+				imageTime: "成像次数",
 				pitchAngle: "俯仰角",
-
 				groundResolution: "分辨率",
-
 				priorInfo: "先验信息",
-
 				productDest: "产品目的地",
-
 				points: "目标点集"
 			},
 
@@ -309,6 +307,7 @@ export default {
 
 			this.seltask.isaccurate = this.seltask.isaccurate == 0 ? '是' : '否'
 			this.seltask.isEmcon = this.seltask.isEmcon == 0 ? '是' : '否'
+			this.seltask.pitchAngle += '°'
 			this.seltask.groundResolution = this.seltask.groundResolution + '米'
 		},
 		selectAll() {
@@ -428,7 +427,7 @@ export default {
 
 			this.popIsShow('mapPopVis');
 		},
-		//侦察需求详情表格下的“目标库导入”绑定的事件
+		//观测需求详情表格下的“目标库导入”绑定的事件
 		getXQfromTargetBase() {
 			this.$emit("clickTarget");
 			//Excel导入，隐藏
@@ -440,7 +439,7 @@ export default {
 			this.popIsShow('excelPopVis');
 		},
 
-		//侦察需求详情某行被 左键 点击时，从子组件表格中获取数据
+		//观测需求详情某行被 左键 点击时，从子组件表格中获取数据
 		getDataFromSonXQTB(getData) {
 			console.log("子组件传过来的行数据：", getData);
 			console.log('rowClickFlag:', getData.rowData.id);
@@ -552,7 +551,7 @@ export default {
 
 		getxqtbList() {//getxqglTBTableFromClickedTargetList
 			const purposeDic = {
-				1: '快响应急侦察',
+				1: '快响应急观测',
 				2: '陆地伪装识别',
 				3: '早期异常监测',
 				4: '海上搜索发现',

src/mock/index.js

@@ -112,7 +112,7 @@ var table4PassData = Mock.mock({
 var xqglTableTBData = Mock.mock({
     'data|20': [{
         'target': '@cword(5,25)',
-        'goal|1': Array('应急侦察', '常规侦察', '普通侦察'),
+        'goal|1': Array('应急观测', '常规观测', '普通观测'),
         'status|1':  Array('未提交', '已提交'),
         'type|1': Array('点目标', '区域目标'),
         'number': '@word(20,25)',
@@ -145,7 +145,7 @@ var xqglXQListTable = Mock.mock({
         'needname|1': Array('海洋156海上船只','海洋156海上其他','海洋158海上船只'),
         'needcode': '@word(21,22)',
         'targername|1':  Array('中国大陆','南太平洋','马六甲海湾'),
-        'purpose|1':  Array('应急侦察','常规侦察','一般侦察'),
+        'purpose|1':  Array('应急观测','常规观测','一般观测'),
         'starttime': '@date(yyyy-MM-dd HH:mm:ss)',
         'endtime': '@date(yyyy-MM-dd HH:mm:ss)',
         'prioritylevel|1-20':1,
@@ -375,4 +375,4 @@ Mock.mock('/api/news', 'get', {
 Mock.mock('/api/post/news', 'post', {
     status: 200,
     msg: '获取数据成功post'
-})
+})