Merge remote-tracking branch 'origin/master'

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

screen-demo/package.json

@@ -46,7 +46,9 @@
     "parserOptions": {
       "parser": "@babel/eslint-parser"
     },
-    "rules": {}
+    "rules": {
+      "no-debugger": "off"
+    }
   },
   "browserslist": [
     "> 1%",

screen-demo/src/views/templateInstance.vue

@@ -194,38 +194,23 @@ export default {
     this.btnMethod(0)
     this.echarts3q()
     this.echarts4q()
-    // // 获取摄像头点位列表信息
-    // this.$requestSDK(
-    //   "/jilin-devloper/jilin/querySiteCodeAndDevices",
-    //   {},
-    //   {},
-    //   "post"
-    // ).then((res) => {
-    //   console.log("res querySiteCodeAndDevices=", res)
-    //   this.markPoints = [
-    //     {
-    //       longitude: 125,
-    //       latitude:43
-    //     },
-    //     {
-    //       longitude: 125.66,
-    //       latitude:43
-    //     },
-    //     {
-    //       longitude: 125.77,
-    //       latitude:43.55
-    //     }
-    //   ];
-    //   this.markPoints = res.data;
-    //   // 添加打点
-    //   if (this.map) {
-    //     if (this.mapType === "3D" || this.mapType === "2D") {
-    //       this.addPoint3D(this.map);
-    //     } else {
-    //       this.addPoint(this.map.map);
-    //     }
-    //   }
-    // });
+    // 获取摄像头点位列表信息
+    this.$requestSDK(
+      "/jilin-devloper/jilin/querySiteCodeAndDevices",
+      {},
+      {},
+      "post"
+    ).then((res) => {
+      this.markPoints = res.data;
+      // 添加打点
+      if (this.map) {
+        if (this.mapType === "3D" || this.mapType === "2D") {
+          this.addPoint3D(this.map);
+        } else {
+          this.addPoint(this.map.map);
+        }
+      }
+    });
     // 最新视频弹窗监听方式
     // this.$postMsgUtil.listen('videoListen', (data) => {
     //   // 对应业务逻辑处理
@@ -1571,7 +1556,7 @@ export default {
           let method = "post";
           // 获取摄像头channelCode信息
           this.$requestSDK(
-            "/video-demo22/queryDeviceForWE",
+            "/jilin-devloper/jilin/queryDeviceForWE",
             { deviceCode: event.id.list[0]?.deviceCode },
             header,
             method
@@ -1588,7 +1573,7 @@ export default {
           };
           // 获取摄像头详情信息
           this.$requestSDK(
-            "/video-demo22/queryDevices",
+            "/jilin-devloper/jilin/queryDevices",
             data,
             header,
             method
@@ -1664,7 +1649,7 @@ export default {
           let method = "post";
           // 获取摄像头channelCode信息
           this.$requestSDK(
-            "/video-demo22/queryDeviceForWE",
+            "/jilin-devloper/jilin/queryDeviceForWE",
             { deviceCode: features.feature.values_.value.list[0]?.deviceCode },
             header,
             method
@@ -1681,7 +1666,7 @@ export default {
           };
           // 获取摄像头详情信息
           this.$requestSDK(
-            "/video-demo22/queryDevices",
+            "/jilin-devloper/jilin/queryDevices",
             data,
             header,
             method
@@ -1860,33 +1845,15 @@ export default {
       this.map = e;
       this.targetId = targetId;
       this.mapInstance = e?.map || e;
-      // 获取摄像头点位列表信息
-      this.$requestSDK(
-        "/jilin-devloper/jilin/querySiteCodeAndDevices",
-        {},
-        {},
-        "post"
-      ).then((res) => {
-        console.log("res querySiteCodeAndDevices=", res)
-        this.markPoints = res.data;
+      // 添加打点
+      if (this.markPoints.length) {
         // 添加打点
-        if (this.map) {
-          if (this.mapType === "3D" || this.mapType === "2D") {
-            this.addPoint3D(this.map);
-          } else {
-            this.addPoint(this.map.map);
-          }
+        if (this.mapType === "3D" || this.mapType === "2D") {
+          this.addPoint3D(e);
+        } else { // 当前地图mapType satellite
+          this.addPoint(this.map.map);
         }
-      });
-      // // 添加打点
-      // 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;
       });