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

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

@@ -73,6 +73,7 @@ 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.device_arr = Object.values(res.device);