Merge remote-tracking branch 'origin/master'

# Conflicts:
#	screen-demo/src/views/templateInstance.vue

screen-demo/src/views/templateInstance.vue

@@ -391,6 +391,33 @@ export default {
         this.trees = res.data
       })
     },
+//     startpick() {
+//       let _this = this;
+//       new CTMapOl.loadCesium({domId: 'map'}, (map) => {
+//         _this.viewer = map._viewer
+//       })
+//   // this.viewer = this.map._view
+//   //     console.log("this.map=",this.map)
+//       console.log("viewer=",this.viewer)
+//   this.CesiumEventHandlerclick = null
+//   if (this.CesiumEventHandlerclick) {
+//     this.endpick()
+//   }
+//       // this.CesiumEventHandlerclick = CTMapOl.thrdime.cameracontrol.startpickcood(this.viewer, (e, f) => {
+//       this.CesiumEventHandlerclick = new CTMapOl.thrdime.cameracontrol.startpickcood(this.viewer, (e, f) => {
+//     console.log(e, f)
+//     let dom1 = document.getElementById("coodlon")
+//     dom1.innerHTML = f.longitude / Math.PI * 180
+//         alert(dom1.innerHTML)
+//     let dom2 = document.getElementById("coodlat")
+//     dom2.innerHTML = f.latitude / Math.PI * 180
+//     let dom3 = document.getElementById("coodh")
+//     dom3.innerHTML = f.height
+//   })
+// },
+// endpick() {
+//   new CTMapOl.thrdime.cameracontrol.stoppickcood(this.viewer, this.CesiumEventHandlerclick)
+// },
     selfHistory(){
       //页面初始m, 历史城市数组=接口返回
       this.history.navigation.currentCity = null;
@@ -726,7 +753,8 @@ export default {
         ).then(res => {
           let result = res.rows;
           let keys1 = result.map(item => item.regionName) ;
-          let keys2 = result.map(item => item.realNum );
+          // let keys2 = result.map(item => item.realNum );
+          let keys2 = result.map(item => item.allNum);
           this.echarts2q(keys1,keys2);
         });
       } else if (num == 1) {
@@ -1605,6 +1633,52 @@ export default {
       this.map = e;
       this.targetId = targetId;
       this.mapInstance = e?.map || e;
+
+      // 折线
+      // let options = {
+      //   path: [[116.43, 55.92, 100], [117.43, 55.92, 50], [106.43, 29.92, 100000],[128.43, 55.92, 100000]],
+      //   zoomto: true,
+      //   strokeOpacity: 0.8,
+      // }
+      //
+      // new CTMapOl.cesiumComponent.Polyline(options)
+      // let _this = this;
+      // CTMapOl.loadCesium({domId: 'map'}, (map) => {
+      //   console.log("mapmapmap=",map)
+      //   _this.viewer = map._viewer
+      // })
+      // // this.viewer = this.map._view
+      // //     console.log("this.map=",this.map)
+      // console.log("viewer=",this.viewer)
+      // this.CesiumEventHandlerclick = null
+      // if (this.CesiumEventHandlerclick) {
+      //   this.endpick()
+      // }
+      // // window.CESIUM_BASE_URL = '../../public/cesium/Build/CesiumUnminified';
+      // // window.CESIUM_BASE_URL = '../../public/cesium/Build/Cesium';
+      // window.CESIUM_BASE_URL = '../../public/Cesium2/Cesium';
+      // this.CesiumEventHandlerclick = CTMapOl.thrdime.cameracontrol.startpickcood(this.viewer, (e, f) => {
+      //   console.log(e, f)
+      //   let dom1 = document.getElementById("coodlon")
+      //   dom1.innerHTML = f.longitude / Math.PI * 180
+      //   alert(dom1.innerHTML)
+      //   let dom2 = document.getElementById("coodlat")
+      //   dom2.innerHTML = f.latitude / Math.PI * 180
+      //   let dom3 = document.getElementById("coodh")
+      //   dom3.innerHTML = f.height
+      // })
+      // this.startpick()
+
+      // 导航 路线规划
+      // let option = {
+      //   width: '8',
+      //   color: '#f40'
+      // };
+      // let toolRoute = new CTMapOl.extend.ToolRoute(e.map, option);
+      // toolRoute.route([125,43], [125.8,43.8]).then(data => {
+      //   toolRoute.drawPath(data.routs)
+      // })
+      // 获取摄像头点位列表信息
       this.$requestSDK(
           "/jilin-devloper/jilin/querySiteCodeAndDevices",
           {},
@@ -1621,6 +1695,15 @@ export default {
           }
         }
       });
+      // 添加打点
+      // if (this.markPoints.length) {
+      //   // 添加打点
+      //   if (this.mapType === "3D" || this.mapType === "2D") {
+      //     this.addPoint3D(e);
+      //   } else { // 当前地图mapType satellite
+      //     this.addPoint(this.map.map);
+      //   }
+      // }
       this.$nextTick(() => {
         this.show = true;
       });
@@ -2534,10 +2617,11 @@ progress::-webkit-progress-value {
     border: 1px solid #B1DEFD;
   }
   .router-item {
+    background-image: linear-gradient(to bottom, #132132, #496fa6) !important;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 1px;
-    font-size: 11px;
+    margin-bottom: 0px;
+    font-size: 14px;
   }
 }