Selaa lähdekoodia

[Mod 0000] 修改可配置首页5.5版的配置和数据处理

houzekong 1 kuukausi sitten
vanhempi
commit
22b12da326

+ 10 - 7
src/views/vent/home/configurable/configurable.api.ts

@@ -1,5 +1,6 @@
 import { floor, random } from 'lodash-es';
 import { defHttp } from '/@/utils/http/axios';
+import { get } from '../billboard/utils';
 
 enum Api {
   list = '/safety/ventanalyDevice/homedata2',
@@ -62,15 +63,17 @@ export const list = (params) => {
     });
     res.sys_majorpath.forEach((e) => {
       const { drag_1, drag_2, drag_3, drag_total } = e.majorpath;
-      const { zuli = { value: '1' }, retM3_merge = { value: '1' } } = e.readData;
-      const drag_merge = parseInt(zuli.value);
-      const m3_merge = parseInt(retM3_merge.value);
+      const { fy_merge = { value: '1' } } = e.readData;
+      const drag_merge = parseInt(fy_merge.value);
+      // const m3_merge = parseInt(retM3_merge.value);
+
       e.piechart = [
-        { val: drag_1, valMock: floor((drag_1 / drag_total) * drag_merge), label: '进风区' },
-        { val: drag_2, valMock: floor((drag_2 / drag_total) * drag_merge), label: '用风区' },
-        { val: drag_3, valMock: floor((drag_3 / drag_total) * drag_merge), label: '回风区' },
+        { val: drag_1, valMock: floor((drag_1 / drag_total) * drag_merge), label: '进风区(Pa)' },
+        { val: drag_2, valMock: floor((drag_2 / drag_total) * drag_merge), label: '用风区(Pa)' },
+        { val: drag_3, valMock: floor((drag_3 / drag_total) * drag_merge), label: '回风区(Pa)' },
       ];
-      e.dengjikong_merge = floor((1.19 * (m3_merge / 60)) / Math.sqrt(drag_merge), 2);
+      e.readData.dengjikong_merge = get(res, 'midinfo[0].sysinfo.equalarea');
+      // e.dengjikong_merge = floor((1.19 * (m3_merge / 60)) / Math.sqrt(drag_merge), 2);
     });
     res.device_arr = Object.values(res.device);
 

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

@@ -303,7 +303,7 @@ export const testConfigVent: Config[] = [
             },
             {
               label: '矿井阻力(Pa)',
-              value: '${zuli.value}',
+              value: '${fy_merge.value}',
             },
             {
               label: '等积孔',