Merge branch 'master' of http://124.221.234.135:13000/zklt-CD/orbit-ch-web

src/components/cesiumViewer/cesiumViewer.vue

@@ -176,7 +176,7 @@ export default {
 					pitch: Cesium.Math.toRadians(-88)
 				}
 			});
-			cesiumEntityUtils.formatterDateToUTC8(viewer, true);
+			cesiumEntityUtils.formatterDateToUTC8(viewer, false);
 			cesiumEntityUtils.polylineMaterial();
 			window.viewer = viewer
 			// this.addGlobleLine()
@@ -728,8 +728,8 @@ export default {
 			// 投影可见任务，相机开关机
 			// console.log("this.projectEntitys:", this.projectEntitys);
 			tasks.proTasks.forEach(proTask => {
-				proTask.startTime = this.timeToUTM(proTask.startTime)
-				proTask.endTime = this.timeToUTM(proTask.endTime)
+				// proTask.startTime = this.timeToUTM(proTask.startTime)
+				// proTask.endTime = this.timeToUTM(proTask.endTime)
 				cesiumEntityUtils.projectionVisible(viewer, this.projectEntitys[proTask.satelliteCode], proTask)
 			})
 

src/components/rwjsComponents/wxyxzt.vue

@@ -308,7 +308,12 @@ export default {
           })
           this.taskStartTime = res.data.taskStartTime;
           this.taskEndTime = res.data.taskEndTime;
-          isFirstGet && this.getSubpoints(this.taskStartTime, this.taskEndTime);
+          // 星下点更改为查询方案里面的卫星，之前是查所有星下点
+          let satelliteCodes = []
+          this.wxrwxxTableData.forEach(item => {
+            satelliteCodes.push(item.satelliteCode)
+          })
+          isFirstGet && this.getSubpoints(this.taskStartTime, this.taskEndTime, satelliteCodes);
         } else {
           this.$message.error(res.msg);
         }
@@ -341,16 +346,16 @@ export default {
       const allTasks = tasks.filter(i => i.parentId.startsWith(parentId));
       allTasks.forEach(item => {
         this.cdTasks.push({
-          startTime: item.controlStartTime,
-          endTime: item.controlEndTime,
+          startTime: this.UTMToTtime(item.controlStartTime), //连线时间相对北京时间需要减8小时
+          endTime: this.UTMToTtime(item.controlEndTime),
           stationName: item.controlStationName,
           satelliteCode: item.satelliteCode,
           stationCode: item.controlStationCode,
           type: "CK"
         })
         this.cdTasks.push({
-          startTime: item.dataStartTime,
-          endTime: item.dataEndTime,
+          startTime: this.UTMToTtime(item.dataStartTime),
+          endTime: this.UTMToTtime(item.dataEndTime),
           stationName: item.dataStationName,
           satelliteCode: item.satelliteCode,
           stationCode: item.dataStationCode,
@@ -363,7 +368,14 @@ export default {
         })
       })
     },
-
+    timeToUTM(strTime) {
+			let d = this.$moment(strTime)
+			return d.subtract(8, 'h').format("YYYY-MM-DD HH:mm:ss")
+		},
+    UTMToTtime(strTime) {
+			let d = this.$moment(strTime)
+			return d.add(8, 'h').format("YYYY-MM-DD HH:mm:ss")
+		},
   },
   mounted() {
     this.getWXTasks();

src/utils/cesiumEntityUtils.js

@@ -703,7 +703,9 @@ export default {
                 )
             })
         }
-        const material = new Cesium.PolylineTrailLinkMaterialProperty(Cesium.Color.RED, 700);
+        // const material = new Cesium.PolylineTrailLinkMaterialProperty(Cesium.Color.RED, 700);
+        const materialCK = new Cesium.PolylineTrailLinkMaterialProperty(Cesium.Color.RED, 700);
+        const materialSC = new Cesium.PolylineTrailLinkMaterialProperty2(Cesium.Color.GREEN, 700);
         const source = viewer.dataSources.getByName(dsId)[0];
         const lineEntity = source.entities.add({
             availability: TimeInterval,
@@ -717,7 +719,8 @@ export default {
                     return positions;
                 }, false),
                 with: 100,
-                material: lineColor ? lineColor : material,
+                // material: lineColor ? lineColor : material,
+                material: inDirection == 'CK' ? materialCK : materialSC,
             }
         })
         return lineEntity;