update

src/components/xqglComponents/xqDetails.vue

@@ -47,10 +47,16 @@
 		<!-- 侦察需求详情的表格内容 -->
 		<div class="table1TB-area">
 			<el-table ref="multipleTable" :data="XQTBviserble ? getTableXQTBData : getTableXQHQData" height="450"
-								style="width: 100%" tooltip-effect="light" @row-click="handleClick" @row-contextmenu="rightClick">
-				<el-table-column align="center" type="selection" width="55"></el-table-column>
+								style="width: 100%" tooltip-effect="light">
+				<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>
+					</template>
+				</el-table-column>
 			</el-table>
 		</div>
 		<!-- <div class="table1TB-area" v-show="XQTBviserble">
@@ -73,14 +79,14 @@
 			<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="targetPopVis = false"-->
+		<!--							 @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>
 
 
-		<el-dialog :visible.sync="taskShow" title="请选择轨道计算时间" width="300px">
+		<el-dialog :visible.sync="taskShow" show-close title="请选择任务条件" width="300px">
 			<div style="margin: 10px 0">请选择任务来源</div>
 			<div class="passwayDatePicker">
 				<el-select
@@ -116,10 +122,20 @@
 				<el-button type="primary" @click="getTaskList">确 定</el-button>
 			</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>
+			<div slot="footer">
+				<el-button @click="taskShow=false">取 消</el-button>
+				<el-button type="primary" @click="getTaskList">确 定</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
-
 <script>
 import {
 	postClickedTagetListData,
@@ -150,10 +166,45 @@ export default {
 	components: {xqglTableTB, xqglTableHQ, targetPop, mapPop, excelPop},
 	data() {
 		return {
+			taskInfolabels: {
+				rate: "频次",
+				InvestigativeMeans: "侦察手段",
+				satelliteSelected: "卫星ID",
+
+				demandSources: "需求来源",
+
+				proposeDepartment: "提出部门",
+				demandDescribe: "需求来源描述",
+
+				isaccurate: "是否精确",
+
+				isEmcon: "是否电磁静默",
+				reqInterval: "最小观测间隔时间",
+
+				receivingStation: "接收站名",
+
+				workMode: "工作模式",
+
+				sensorID: "传感器代号",
+
+				sensorMode: "传感器模式",
+
+				pitchAngle: "俯仰角",
+
+				groundResolution: "分辨率",
+
+				priorInfo: "先验信息",
+
+				productDest: "产品目的地",
+
+				points: "目标点集"
+			},
+
 			targetPopVis: false,
 			mapPopVis: false,
 			excelPopVis: false,
 			taskShow: false,
+			taskInfoShow: false,
 			mapPointSelect: '',
 			selRow: {},
 			taskDatetimeRange: ["", ""],
@@ -163,6 +214,7 @@ export default {
 			//需求提报，需求获取动态追加类
 			clickTBtipStyle: '',
 			clickHQtipStyle: '',
+			seltask: {},
 			//需求提报，需求获取操作区域是否显示
 			operateTBvserble: true,
 			operateHQvserble: false,
@@ -186,7 +238,7 @@ export default {
 					label: '目标类型',
 				},
 				{
-					prop: ' targetCode',
+					prop: 'parentId',
 					label: '目标编号',
 				},
 				{
@@ -243,6 +295,22 @@ export default {
 		...mapMutations("xqgl", ["setParentId"]),
 		handleCheckAll() {
 		},
+		showTaskInfo(row) {
+			this.taskInfoShow = true;
+
+			const satelliteSelected = JSON.parse(row.satelliteSelected)
+			let ids = []
+			for (const i in satelliteSelected) {
+				ids.push(satelliteSelected[i].satelliteId)
+
+			}
+			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.groundResolution = this.seltask.groundResolution + '米'
+		},
 		selectAll() {
 			this.selTasks = [];
 			if (this.checkeALl) {
@@ -542,7 +610,7 @@ export default {
 
 <style lang='scss' scoped>
 .leftArea-investigationDetails {
-	width: 37%;
+	width: 38%;
 	height: 560px;
 	background: url('@/assets/ClipImage/dikuang/xuqiuxiangqing.png');
 	background-size: 100% 100%;

src/utils/request.js

@@ -15,8 +15,10 @@ requests.interceptors.request.use((config) => {
     if (method.toLowerCase() === 'options') {
         return
     }
-    if (token !== '') {
+    if (token != null && token != '') {
         config.headers.Authorization = token;
+    }else{
+        router.push({name: "login"});
     }
     if (window.occupyUserFlag === 1) {
         delete config.headers.Authorization;