Merge branch 'develop_jzl'

gassafety-web/src/utils/gaodeMap.js

@@ -112,6 +112,10 @@ class gaodeMap {
           this.view.drawerOpacity = true;
         }
       }
+      // 每次地图移动结束，就让地图可以缩放
+      let options = this.myMap.getStatus();
+      options.scrollWheel = true;
+      this.myMap.setStatus(options);
     });
 
     this.districtBoundaries();
@@ -584,10 +588,13 @@ class gaodeMap {
       polyline.setOptions({ strokeColor: "#F7FE38" });
       return;
     }
-    
+
     // 当选择的是新建的时候，线是点不了的
     if (this.lineType == 1 || this.view.targetNum == 1) return;
-    if((this.view.targetNum==2||this.view.targetNum==3)&&e.type=="mouseover"){
+    if (
+      (this.view.targetNum == 2 || this.view.targetNum == 3) &&
+      e.type == "mouseover"
+    ) {
       this.polyLinesColorClear(polyline);
     }
     // 上方导航的高

gassafety-web/src/views/enterprise/mapView/components/RightBototmData.vue

@@ -28,9 +28,10 @@
           style="width: 100%"
           height="170"
         >
-          <el-table-column prop="deviceCode" label="编号" width="100">
+        
+          <el-table-column prop="deviceCode" label="设备编号" width="100">
           </el-table-column>
-          <el-table-column prop="deviceName" label="名称" width="">
+          <el-table-column prop="deviceName" label="设备名称" width="">
           </el-table-column>
           <el-table-column prop="alarmType" label="报警类型" width="80">
           </el-table-column>
@@ -41,7 +42,7 @@
         </el-table>
       </div>
     </div>
-
+    
     <div class="right">
       <template v-for="(item, index) in list">
         <div

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

@@ -603,8 +603,9 @@ export default {
             item;
           // 获取polyLine
           const device = this.gaoMap.markers.filter((item) => {
-            const id = item.getExtData().deviceId;
-            return deviceId == id;
+            const { deviceId: id, troubleId } = item.getExtData();
+            // 因为隐患也有 deviceId，为了防止隐患直接遍成报警状态，所以要排除隐患，没有troubleId的就不是隐患
+            return !troubleId && deviceId == id;
           })[0];
           if (device) {
             const options = device.getExtData();
@@ -1636,7 +1637,6 @@ input[type="radio"] {
           color: #053b6a;
           font-weight: 600;
         }
-
       }
       .deviceList {
         cursor: pointer;
@@ -1667,7 +1667,6 @@ input[type="radio"] {
           white-space: nowrap;
           // border-right: 1px solid #cccccc;
         }
-        
       }
       .no {
         width: 25px;
@@ -1677,7 +1676,7 @@ input[type="radio"] {
         // border-right: none;
         flex: 1;
         text-align: center;
-        margin-left:10px;
+        margin-left: 10px;
       }
       .code {
         width: 100px;