1. 优化通风预警监测场景切换数据加载

src/views/vent/monitorManager/alarmMonitor/alarm.data.ts

@@ -72,17 +72,21 @@ export const ventTunColumns: BasicColumn[] = [
     dataIndex: 'analyse',
     customRender: ({ record }) => {
       if (record) {
-        const p = ((record['dHTotal'] - record['oldHTotal']) / record['oldHTotal']) * 100;
-        if (p == 0) {
-          return '正常';
-        } else if (p > 0 && p <= 1) {
-          return '低风险';
-        } else if (p > 1 && p <= 3) {
-          return '一般风险';
-        } else if (p > 3 && p <= 5) {
-          return '较大风险';
+        if (record['dHTotal'] && record['oldHTotal']) {
+          const p = ((record['dHTotal'] - record['oldHTotal']) / record['oldHTotal']) * 100;
+          if (p == 0) {
+            return '正常';
+          } else if (p > 0 && p <= 1) {
+            return '低风险';
+          } else if (p > 1 && p <= 3) {
+            return '一般风险';
+          } else if (p > 3 && p <= 5) {
+            return '较大风险';
+          } else {
+            return '重大风险';
+          }
         } else {
-          return '重大风险';
+          return '-';
         }
       }
     },

src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -195,6 +195,7 @@
     setTimeout(() => {
       currentDeviceId.value = item.deviceID;
       getMonitor(true);
+      loading.value = false;
     }, 1000);
   }
   //获取预警详情弹窗右侧数据
@@ -327,17 +328,18 @@
       chartListTf.value = chartTfList;
     }
   }
-  function getRealTimeNetData() {
-    const res = realTimeNetCal({ modelID: '8110' });
+  async function getRealTimeNetData() {
+    const res = await realTimeNetCal({ modelID: '8110' });
+    debugger;
     if (res && res['result']) ventTunDataSource.value = res['result']['tuns'];
   }
 
-  onMounted(() => {
+  onMounted(async () => {
     const { sysOrgCode, sysDataType } = useGlobSetting();
     showToggle.value = sysDataType;
     getMenuList();
     getMonitor();
-    getRealTimeNetData();
+    await getRealTimeNetData();
   });
   onUnmounted(() => {
     if (timer) {