Browse Source

通风监测预警-更新

lxh 1 month ago
parent
commit
ac2e3109c8

+ 1 - 1
src/views/vent/home/configurable/configurable.data.ts

@@ -1290,7 +1290,7 @@ export const testConfigDustGreen: Config[] = [
       // mock: BDdustMock,
     },
     showStyle: {
-      size: 'width:390px;height:535px;',
+      size: 'width:390px;height:530px;',
       version: '新版',
       position: 'top:15px;right:15px;',
     },

+ 7 - 7
src/views/vent/monitorManager/alarmMonitor/warn/fireWarn.vue

@@ -77,7 +77,7 @@ function getMonitor(flag?) {
       }
       getMonitor(false);
     },
-    flag ? 0 : 1000
+    flag ? 0 : 1500
   );
 }
 
@@ -160,7 +160,7 @@ function fireMenuToggle(ind) {
         activeIndex1.value = 0;
         currentLoad.value = '';
         getClearList();
-        getMonitor(true);
+        getMonitor();
         loading.value = false;
       }, 1000);
       break;
@@ -171,7 +171,7 @@ function fireMenuToggle(ind) {
         activeIndex1.value = 0;
         currentLoad.value = '';
         getClearList();
-        getMonitor(true);
+        getMonitor();
         loading.value = false;
       }, 1000);
       break;
@@ -181,7 +181,7 @@ function fireMenuToggle(ind) {
         clearTimeout(timer);
         activeIndex1.value = 0;
         currentLoad.value = '';
-        getMonitor(true);
+        getMonitor();
         loading.value = false;
       }, 1000);
       break;
@@ -212,7 +212,7 @@ function cardClick(ind, item) {
       getClearList();
       strType.value = item.strtype;
       currentLoad.value = '';
-      getMonitor(true);
+      getMonitor();
       loading.value = false;
     }, 1000);
   } else {
@@ -220,7 +220,7 @@ function cardClick(ind, item) {
     setTimeout(() => {
       clearTimeout(timer);
       activeIndex1.value = ind;
-      getMonitor(true);
+      getMonitor();
       loading.value = false;
     }, 1000);
   }
@@ -251,7 +251,7 @@ function getClearList() {
 
 onMounted(() => {
   getMenuList();
-  getMonitor(true);
+  getMonitor();
 });
 onUnmounted(() => {
   if (timer) {

+ 6 - 8
src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -110,7 +110,7 @@ function getMonitor(flag?) {
       await getWindDeviceList();
       getMonitor(false);
     },
-    flag ? 0 : 1000
+    flag ? 0 : 2000
   );
 }
 //获取巷道阻力分析数据
@@ -247,17 +247,15 @@ function btnClick(ind) {
 
 //菜单选项切换
 function cardClick(ind, item) {
-  if (!activeIndex.value) {
-    clearTimeout(timer);
+  clearTimeout(timer);
+  if (!activeIndex.value && !loading.value) {
     activeIndex1.value = ind;
     loading.value = true;
     setTimeout(() => {
-      getMonitor(true);
+      getMonitor();
       loading.value = false;
-    }, 1000);
-  } else {
-    return;
-  }
+    }, 2000);
+  } 
 }
 
 //获取通风监控测点信息