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

src/views/vent/deviceManager/configurationTable/types.ts

@@ -209,6 +209,7 @@ export interface ModuleDataChart extends ReadFrom {
     | 'bar_cylinder'
     | 'bar_cylinder_wide'
     | 'pie_halo'
+    | 'line_enhance'
     | 'pie_drag';
   /** 排序依据，该项应配置将配合 readFrom 使用 */
   sortBy?: string;

src/views/vent/home/configurable/components/detail/CustomChart.vue

@@ -489,6 +489,60 @@
       };
     }
 
+    if (type === 'line_enhance') {
+      return {
+        textStyle,
+        legend: {
+          show: legend.show,
+          top: 10,
+          right: 10,
+          textStyle,
+        },
+        tooltip: {
+          trigger: 'item',
+        },
+        grid: {
+          left: 60,
+          top: 40,
+          right: 60,
+          bottom: dataZoom.length ? 70 : 30,
+        },
+        dataZoom: baseDataZoom,
+        xAxis: xAxis.map((e) => {
+          return {
+            ...e,
+            type: 'category',
+            axisLabel: {
+              width: 100,
+              overflow: 'break',
+            },
+          };
+        }),
+        yAxis: yAxis.map((e, i) => {
+          return {
+            ...e,
+            min: (value) => {
+              return parseInt(value.min * 0.8);
+            },
+            max: (value) => {
+              return parseInt(value.max * 1.2);
+            },
+            splitLine: {
+              lineStyle: {
+                opacity: i === 0 ? 0.1 : 0,
+              },
+            },
+          };
+        }),
+        series: baseSeries.map((serie) => {
+          return {
+            ...serie,
+            type: 'line',
+          };
+        }),
+      };
+    }
+
     // 平滑曲线图
     if (type === 'line_smooth') {
       return {

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

@@ -1,4 +1,4 @@
-import { floor, random } from 'lodash-es';
+import { floor, isArray, random, slice } from 'lodash-es';
 import { defHttp } from '/@/utils/http/axios';
 import { get } from '../billboard/utils';
 
@@ -73,8 +73,17 @@ export const list = (params) => {
         { val: drag_3, valMock: floor((drag_3 / drag_total) * drag_merge), label: '回风区(Pa)' },
       ];
       e.readData.dengjikong_merge = get(res, 'midinfo[0].sysinfo.equalarea');
+      e.readData.fy_merge_int = drag_merge;
       // e.dengjikong_merge = floor((1.19 * (m3_merge / 60)) / Math.sqrt(drag_merge), 2);
     });
+    res.sys_surface_caimei.forEach((e) => {
+      if (isArray(e.history)) {
+        e.history = slice(e.history, e.history.length - 30, e.history.length);
+      }
+      if (isArray(e.history_report)) {
+        e.history_report = slice(e.history_report, e.history_report.length - 30, e.history_report.length);
+      }
+    });
     res.device_arr = Object.values(res.device);
 
     return res;

src/views/vent/monitorManager/ledMonitor/led.api.ts

@@ -18,6 +18,8 @@ export const list = (params) =>
       e.deviceId = e.id;
       e.id = temp;
     });
+
+    return r;
   });
 
 export const changeProgram = (params) => defHttp.post({ url: Api.changeProgram, params });