otmself 7 bulan lalu
induk
melakukan
3eebcfbeb2

+ 5 - 6
src/assets/DicData/KeyName_CN.js

@@ -1,11 +1,10 @@
 const dictionary = {
 	observationPurpose: {
-		1: "快响应急观测",
-		2: "陆地伪装识别",
-		3: "早期异常监测",
-		4: "海上搜索发现",
-		5: "海上持续跟踪",
-		6: "海上识别确认"
+		1: "航线监视",
+		2: "密集观测",
+		3: "区域普查",
+		4: "持续跟踪",
+		5: "应急详查"
 	},
 	taskStatus: {
 		0: "未提交",

+ 3 - 3
src/components/cesiumViewer/cesiumViewer.vue

@@ -651,7 +651,7 @@ export default {
 						})
 					})
 					cesiumEntityUtils.addCustomPoints(viewer, dsId, targetPoints)
-					dsId === 'rwjs' && cesiumEntityUtils.flyToTargetPoint(viewer, points[0].lng, points[0].lat, 8000000)
+					dsId === 'rwjs' && cesiumEntityUtils.flyToTargetPoint(viewer, points[0].lng, points[0].lat, 19000000)
 				}
 				if (type == 2) {
 					let polygon = [];
@@ -672,7 +672,7 @@ export default {
 						material: isStripe ? Cesium.Color.fromCssColorString('rgba(237,245,11,0.5)') : Cesium.Color.fromCssColorString('#f10808'),
 					})
 					cesiumEntityUtils.addCustomPolygons(viewer, dsId, targetPoylgons)
-					dsId === 'rwjs' && cesiumEntityUtils.flyToTargetPolygon(viewer, polygon, 8000000)
+					dsId === 'rwjs' && cesiumEntityUtils.flyToTargetPolygon(viewer, polygon, 19000000)
 				}
 				if ([1, 3].includes(type)) {
 					let lpoints = [];
@@ -687,7 +687,7 @@ export default {
 						points: lpoints
 					})
 					cesiumEntityUtils.addCustomLines(viewer, dsId, targetPoints)
-					dsId === 'rwjs' && cesiumEntityUtils.flyToTargetPoint(viewer, lpoints[0], lpoints[1], 8000000)
+					dsId === 'rwjs' && cesiumEntityUtils.flyToTargetPoint(viewer, lpoints[0], lpoints[1], 19000000)
 				}
 			})
 

+ 1 - 1
src/components/jcfwComponents/satelliteCompute.vue

@@ -132,7 +132,7 @@ export default {
         },
         {
           prop: 'eccentricityUse',
-          label: '偏心率\n(%)',
+          label: '偏心率',
           sortable: false,
           width: 90
         },

+ 5 - 6
src/components/rwjsComponents/rwyxzt.vue

@@ -179,12 +179,11 @@ export default {
       },
       getRwxxTableData(data={}){
         const purposeDic = {
-          1: "快响应急观测",
-          2: "陆地伪装识别",
-          3: "早期异常监测",
-          4: "海上搜索发现",
-          5: "海上持续跟踪",
-          6: "海上识别确认"
+					1: "航线监视",
+					2: "密集观测",
+					3: "区域普查",
+					4: "持续跟踪",
+					5: "应急详查"
         }
         const typeDic = {
           0: "点目标",

+ 6 - 6
src/components/tables/xqglTable_XQListTable.vue

@@ -160,22 +160,22 @@ export default{
                 var purposeChinese = element.observationPurpose;
                 switch(purposeChinese){
                     case 1:
-                        element.observationPurposeChinese = "快响应急观测";
+                        element.observationPurposeChinese = "航线监视";
                         break;
                     case 2:
-                        element.observationPurposeChinese = "陆地伪装识别";
+                        element.observationPurposeChinese = "密集观测";
                         break;
                     case 3:
-                        element.observationPurposeChinese = "早期异常监测";
+                        element.observationPurposeChinese = "区域普查";
                         break;
                     case 4:
-                        element.observationPurposeChinese = "海上搜索发现";
+                        element.observationPurposeChinese = "持续跟踪";
                         break;
                     case 5:
-                        element.observationPurposeChinese = "海上持续跟踪";
+                        element.observationPurposeChinese = "应急详查";
                         break;
                     case 6:
-                        element.observationPurposeChinese = "海上识别确认";
+                        // element.observationPurposeChinese = "海上识别确认";
                         break;
                     // default:
                     //     element.observationPurposeChinese = "";

+ 6 - 6
src/components/tables/xqglTable_XQTB.vue

@@ -104,22 +104,22 @@ export default{
           element["typeChinese"] = "";
           element["statusChinese"] = "";
           if (element.observationPurpose === 1) {
-            element.observationPurposeChinese = '快响应急观测';
+            element.observationPurposeChinese = '航线监视';
           }
           if (element.observationPurpose === 2) {
-            element.observationPurposeChinese = '陆地伪装识别';
+            element.observationPurposeChinese = '密集观测';
           }
           if (element.observationPurpose === 3) {
-            element.observationPurposeChinese = '早期异常监测';
+            element.observationPurposeChinese = '区域普查';
           }
           if (element.observationPurpose === 4) {
-            element.observationPurposeChinese = '海上搜索发现';
+            element.observationPurposeChinese = '持续跟踪';
           }
           if (element.observationPurpose === 5) {
-            element.observationPurposeChinese = '海上持续跟踪';
+            element.observationPurposeChinese = '应急详查';
           }
           if (element.observationPurpose === 6) {
-            element.observationPurposeChinese = '海上识别确认';
+            // element.observationPurposeChinese = '海上识别确认';
           }
 
           if (element.type === 0) {

+ 6 - 10
src/components/xqglComponents/targetPop.vue

@@ -84,28 +84,24 @@ export default {
 			observationPurposeOpt: [
 				{
 					value: 1,
-					label: '快响应急观测',
+					label: '航线监视',
 				},
 				{
 					value: 2,
-					label: '陆地伪装识别',
+					label: '密集观测',
 				},
 				{
 					value: 3,
-					label: '早期异常监测',
+					label: '区域普查',
 				},
 				{
 					value: 4,
-					label: '海上搜索发现',
+					label: '持续跟踪',
 				},
 				{
 					value: 5,
-					label: '海上持续跟踪',
-				},
-				{
-					value: 6,
-					label: '海上识别确认',
-				},
+					label: '应急详查',
+				}
 			],
 		};
 	},

+ 5 - 6
src/components/xqglComponents/xqDetails.vue

@@ -540,12 +540,11 @@ export default {
 
 		getxqtbList() {//getxqglTBTableFromClickedTargetList
 			const purposeDic = {
-				1: '快响应急观测',
-				2: '陆地伪装识别',
-				3: '早期异常监测',
-				4: '海上搜索发现',
-				5: '海上持续跟踪',
-				6: '海上识别确认',
+				1: "航线监视",
+				2: "密集观测",
+				3: "区域普查",
+				4: "持续跟踪",
+				5: "应急详查"
 			}
 			const typeDic = {
 				0: '点目标',

+ 1 - 1
src/pages/1-main/06-XQJY/xqjyTaskList.vue

@@ -91,7 +91,7 @@ export default {
     },
     updateDatas() {
       let parentId = sessionStorage.getItem("parentId");
-      parentId = "241104_XQCH_10000"
+      // parentId = "241104_XQCH_10000"
 
       getClickedTagetListDataForxqlbTB({
         status: 1,