Merge branch 'develop_jzl'

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

@@ -773,10 +773,14 @@ export default {
                 const iten = item[i];
                 // 不是隐患也不是值班人员
                 if (!iten.troubleId && !iten.userId) {
-                  return iten.deviceId == device.getExtData().deviceId;
+                  if(iten.deviceId == device.getExtData().deviceId){
+                    return true
+                  }
                 }
               }
-            })[0][0];
+            })[0]?.filter(item=>{
+              return item.deviceId == device.getExtData().deviceId
+            })[0];
             // console.log("myDevice", myDevice);
             myDevice.alarmState = options.alarmState;
             // const imageName = device.getExtData()
@@ -1462,7 +1466,7 @@ export default {
     },
     // 搜索
     async search() {
-      this.searchClear();
+      this. Clear();
       map.clearMap();
       this.gaoMap.placeSearch.clear();
       if (!(!this.gaoMap.searchSelectAdcode && !this.gaoMap.searchSelectName)) {