Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/home/colliery/components/wind-device.vue

@@ -180,14 +180,14 @@
         justify-content: space-between;
         height: 100%;
         overflow-y: hidden;
-        // align-items: start ;
-        &:hover {
-          overflow-y: auto;
-          & > .icon-item {
-            // animation-play-state: paused; lxh
-            // animation: move1 2s linear;lxh
-          }
-        }
+        // align-items: start ;    
+        // &:hover {
+        //   overflow-y: auto;
+        //   & > .icon-item {
+        //     // animation-play-state: paused; lxh
+        //     // animation: move1 2s linear;lxh
+        //   }
+        // }
         .icon-item {
           position: relative;
           display: flex;

src/views/vent/monitorManager/alarmMonitor/DetailModalFire.vue

@@ -95,20 +95,20 @@ function btnClick(ind) {
       break;
     case 1:
       activeIndex1.value = 0;
-      menuList = menuList1.external.map(el => {
-        return {
-          name: el.systemname,
-          warn: '低风险',
-          type: 'out',
-          deviceID: el.id,
-          strtype:el.strtype,
-        }
-      })
-      // menuList.length=0
+      // menuList = menuList1.external.map(el => {
+      //   return {
+      //     name: el.systemname,
+      //     warn: '低风险',
+      //     type: 'out',
+      //     deviceID: el.id,
+      //     strtype:el.strtype,
+      //   }
+      // })
+      menuList.length=0
       clearInterval(timer)
-      // current.value = ''
-      getSysWarnList(menuList[0].deviceID, 'fire');
-      strType.value=menuList[0].strtype
+      current.value = ''
+      // getSysWarnList(menuList[0].deviceID, 'fire');
+      // strType.value=menuList[0].strtype
       break;
   }
 }