Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -945,13 +945,20 @@ export default {
       } else {
         this.gaoMap.markerShow(8, false);
       }
-
+      // 值班人员
       if (this.leftBarNum.includes(9)) {
         this.gaoMap.markerShow(9, true);
         // this.panTo(item);
       } else {
         this.gaoMap.markerShow(9, false);
       }
+      // 摄像头
+      if (this.leftBarNum.includes(10)) {
+        this.gaoMap.markerShow(10, true);
+        // this.panTo(item);
+      } else {
+        this.gaoMap.markerShow(10, false);
+      }
     },
     panTo(item, bool) {
       this.gaoMap.myMap.setZoom(12);