更新

src/views/vent/home/configurable/components/gasInject/gasInject.api.ts

@@ -6,7 +6,7 @@ import { loginCipher } from '/@/settings/encryptionSetting';
 enum Api {
 getlist = '/safety/ventanalyDevicesetLog/list',
 devicecontrol = '/safety/ventanalyMonitorData/devicecontrol',
-listdays = '/safety/ventanalyMonitorData/listdays',
+listdays = '/safety/ventanalyMonitorData/listdaysFast',
 historydata = '/safety/ventanalyMonitorData/export/historydata',
 getAlarmLogList = '/monitor/groupCompany/getAlarmLogList',
 exportXls = '/safety/ventanalyAlarmLog/exportXls',

src/views/vent/home/configurable/configurable.api.ts

@@ -18,7 +18,7 @@ enum Api {
   getDisasterProportion = '/safety/ventanalyAlarmLog/getDisasterProportion',
   system = '/ventanaly-device/monitor/device',
   getSystem = '/monitor/deviceForZhuQi',
-  listdays = '/safety/ventanalyMonitorData/listdays',
+  listdays = '/safety/ventanalyMonitorData/listdaysFast',
   todayDeviceRunStatus = '/safety/ventanalyMonitorData/todayDeviceRunStatus',
   summary = '/safety/ventanalyAlarmStatistic/summary',
 }
@@ -130,7 +130,6 @@ 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');
         }
       });
     }
@@ -444,7 +443,6 @@ export const getTotal = (params) => {
     );
   }
   return (cache.get(key) as Promise<any>).then(async (res) => {
-    console.log(res, '多灾融合预警数据');
 
     let dataVent = await getLevelNum();
     const levelsList = [
@@ -751,7 +749,8 @@ export const getSystemApi = (params) => {
 
     //抽采数据
     //let pumpData = await getCcSystem();
-    res.pumpData = res.msgTxt[res.msgTxt.length - 1].empty_device[0].datalist[0]
+    let pumpD=res.msgTxt[res.msgTxt.length - 1].empty_device.filter(v=>v.type=='pump_under_1')
+    res.pumpData = pumpD[0].datalist[0]
     res.pumpDeviceId = res.pumpData.deviceID
     res.pumpStrtype = 'pump'
     res.pumpStrtypes = res.pumpData.deviceType
@@ -766,7 +765,7 @@ export const getSystemApi = (params) => {
     })
     //单元抽采数据
     res.dyCcData = res.msgTxt[res.msgTxt.length - 1].empty_device.filter(v => v.type != 'pump_under_1' && v.type != 'sys')
-
+    res.dyCcData.sort((a, b) => parseInt(a.typeName.split('').reverse().join('')) - parseInt(b.typeName.split('').reverse().join('')));
     //抽采数据
     res.ccBoard = {
       mixStdInstant: res.pumpData.readData.mixStdInstant || '-',
@@ -805,9 +804,6 @@ export const getSystemApi = (params) => {
 
     } else {
       count.value = count.value - 2
-      console.log(count.value, ' count.value')
-      console.log(ccEchart.xData, 'res.ccEchart.xData')
-      console.log(hlgEchart.xData, 'res.hlgEchart.xData')
       ccEchart.xData.shift()
       ccEchart.yData.shift()
       ccEchart.yData1.shift()
@@ -831,7 +827,6 @@ export const getSystemApi = (params) => {
     }
     res.hlgEchart = hlgEchart
     res.ccEchart = ccEchart
-    console.log(res.ccEchart, 'res.ccEchart')
 
     //注气驱替促抽效果评价
     res.ccPjData = {
@@ -845,9 +840,8 @@ export const getSystemApi = (params) => {
     res.systemRunData = systemRun
     //异常提醒数据
     let SummaryD = await getSummary({})
-    console.log(SummaryD, 'SummaryD')
     res.warnechartD = [
-       { name: "装备运行异常", value: SummaryD.alarmTypeStats[2].count },
+      { name: "装备运行异常", value: SummaryD.alarmTypeStats[2].count },
       { name: "环境监测异常", value: SummaryD.alarmTypeStats[0].count },
       { name: "信号传输异常", value: SummaryD.alarmTypeStats[1].count },
       { name: "驱替数据异常", value: 0 },

src/views/vent/home/configurable/configurable.data.ts

@@ -821,15 +821,16 @@ export const testConfigGasInject: Config[] = [
                 },
                 min: 0,
                 splitLine: {
-                  lineStyle: {
-                    color: 'rgba(1, 63, 97)',
-                  },
+                  show: false,
                 },
                 axisTick: {
                   show: false
                 },
                 axisLine: {
-                  show: false,
+                  show: true,
+                  lineStyle: {
+                    color: 'rgba(1, 63, 97)',
+                  },
                 },
                 axisLabel: {
                   textStyle: {
@@ -849,6 +850,7 @@ export const testConfigGasInject: Config[] = [
                 },
                 min: 0,
                 splitLine: {
+                  show: false,
                   lineStyle: {
                     color: 'rgba(1, 63, 97)',
                   },