Bladeren bron

[Fix 0000] 修复沙坪首页首次进入无数据的问题

houzekong 4 maanden geleden
bovenliggende
commit
2d8513dd3a
1 gewijzigde bestanden met toevoegingen van 54 en 34 verwijderingen
  1. 54 34
      src/views/vent/home/configurable/configurable.api.ts

+ 54 - 34
src/views/vent/home/configurable/configurable.api.ts

@@ -2,8 +2,8 @@ import { floor, isArray, random, slice } from 'lodash-es';
 import { defHttp } from '/@/utils/http/axios';
 import { get } from '../billboard/utils';
 import { useGlobSetting } from '/@/hooks/setting';
-import { ref, reactive } from 'vue'
-
+import { reactive } from 'vue';
+import _ from 'lodash';
 
 enum Api {
   list = '/safety/ventanalyDevice/homedata2',
@@ -16,7 +16,7 @@ enum Api {
   getTotal = '/safety/ventanalyAlarmLog/total',
   sysTypeWarnList = '/safety/ventanalyAlarmLog/sysTypeWarn',
   getDisasterProportion = '/safety/ventanalyAlarmLog/getDisasterProportion',
-  system = '/ventanaly-device/monitor/device'
+  system = '/ventanaly-device/monitor/device',
 }
 
 // 搞这个缓存是由于:目前代码上的设计是多个模块发出多次请求,每个模块自己负责消费前者的响应。
@@ -99,7 +99,7 @@ export const list = (params) => {
         }
         if (isArray(e.history_report)) {
           e.history_report = slice(e.history_report, e.history_report.length - 30, e.history_report.length);
-          console.log(e, '999000')
+          console.log(e, '999000');
         }
       });
     }
@@ -453,7 +453,7 @@ export const getTotal = (params) => {
   return (cache.get(key) as Promise<any>).then(async (res) => {
     console.log(res, '多灾融合预警数据');
 
-    let dataVent = await getLevelNum()
+    let dataVent = await getLevelNum();
     const levelsList = [
       {
         name: '报警',
@@ -472,8 +472,8 @@ export const getTotal = (params) => {
         value: 0,
       },
       {
-        name: "低风险",
-        value: dataVent.vent || 0
+        name: '低风险',
+        value: dataVent.vent || 0,
       },
     ];
     //通风监测预警数据
@@ -539,13 +539,13 @@ export const getTotal = (params) => {
       return {
         label: el.systemname,
         value: el.gasNumber,
-        value1: el.pumpNumber
-      }
-    })
+        value1: el.pumpNumber,
+      };
+    });
 
     //火灾监测预警数据
-    res.fireInfos = reactive({})
-    res.fireInfos.dataOn = []
+    res.fireInfos = reactive({});
+    res.fireInfos.dataOn = [];
 
     if (res.bundletubeInfo && res.bundletubeInfo.msgTxt.length != 0 && res.bundletubeInfo.msgTxt[0].datalist.length != 0) {
       res.bundletubeInfo.msgTxt[0].datalist.forEach((el) => {
@@ -587,28 +587,27 @@ export const getTotal = (params) => {
     //粉尘监测预警数据
     res.dustInfo = [
       {
-        name: "报警",
-        value: res.info.sysInfo.dustS.levels.alarm
+        name: '报警',
+        value: res.info.sysInfo.dustS.levels.alarm,
       },
       {
-        name: "重大风险",
-        value: res.info.sysInfo.dustS.levels.red
+        name: '重大风险',
+        value: res.info.sysInfo.dustS.levels.red,
       },
       {
-        name: "较大风险",
-        value: res.info.sysInfo.dustS.levels.orange
+        name: '较大风险',
+        value: res.info.sysInfo.dustS.levels.orange,
       },
       {
-        name: "一般风险",
-        value: res.info.sysInfo.dustS.levels.yellow
+        name: '一般风险',
+        value: res.info.sysInfo.dustS.levels.yellow,
       },
       {
-        name: "低风险",
-        value: dataVent.dust ? dataVent.dust : res.info.sysInfo.dustS.levels.blue
+        name: '低风险',
+        value: dataVent.dust ? dataVent.dust : res.info.sysInfo.dustS.levels.blue,
       },
     ];
 
-
     return res;
   });
 };
@@ -625,28 +624,49 @@ export const getElectroData = (params) => {
     );
   }
   return (cache.get(key) as Promise<any>).then(async (res) => {
-    let data = res.msgTxt.find(el => el.type == 'ballvalve_auto')
+    let data = res.msgTxt.find((el) => el.type == 'ballvalve_auto');
     data.tempData = data?.datalist?.map((el, index) => {
       return {
         areaName: el.readData.areaName,
         tempStart: el.readData.tempStart,
         tempStop: el.readData.tempStop,
-        CORealtime: el.readData.CORealtime
-      }
-    })
+        CORealtime: el.readData.CORealtime,
+      };
+    });
     if (data?.datalist) {
-      data.datalist.forEach(el => {
+      data.datalist.forEach((el) => {
         el.cardData = {
-          title: el.strinstallpos, areaText: '区域', areaVal: el.readData.areaName, moduleText: '模式', moduleVal: el.readData.smokePattern, statusText: '烟雾传感器状态', statusVal: el.readData.smokeSensorStatus == 'False' ? '正常-低电平' : '异常', phoneText: '机号', phoneVal: el.readData.deviceName, tempNowText: '实时测温', tempNowVal: el.readData.tempRealtime, tempOpenText: '开启温度', tempOpenVal: el.readData.tempStart, timeText: '延时t1', timeVal: 0, tempMaxText: '最高温度', tempMaxVal: el.readData.tempMax, tempCloseText: '关闭温度', tempCloseVal: el.readData.tempMin, time3Text: '延时t3', time3Val: 0, deviceSTAT: el.readData.deviceSTAT == '1' ? true : false
-        }
-      })
-      data.chartData = data.datalist.map(el => {
+          title: el.strinstallpos,
+          areaText: '区域',
+          areaVal: el.readData.areaName,
+          moduleText: '模式',
+          moduleVal: el.readData.smokePattern,
+          statusText: '烟雾传感器状态',
+          statusVal: el.readData.smokeSensorStatus == 'False' ? '正常-低电平' : '异常',
+          phoneText: '机号',
+          phoneVal: el.readData.deviceName,
+          tempNowText: '实时测温',
+          tempNowVal: el.readData.tempRealtime,
+          tempOpenText: '开启温度',
+          tempOpenVal: el.readData.tempStart,
+          timeText: '延时t1',
+          timeVal: 0,
+          tempMaxText: '最高温度',
+          tempMaxVal: el.readData.tempMax,
+          tempCloseText: '关闭温度',
+          tempCloseVal: el.readData.tempMin,
+          time3Text: '延时t3',
+          time3Val: 0,
+          deviceSTAT: el.readData.deviceSTAT == '1' ? true : false,
+        };
+      });
+      data.chartData = data.datalist.map((el) => {
         return {
           time: el.readData.areaName,
           coRealTime: el.readData.CORealtime,
           coWarn: el.readData.COWarn,
-        }
-      })
+        };
+      });
     }
     return data;
   });