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

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

@@ -62,13 +62,15 @@ export const list = (params) => {
     });
     res.sys_majorpath.forEach((e) => {
       const { drag_1, drag_2, drag_3, drag_total } = e.majorpath;
-      const { zuli = { value: '1' } } = e.readData;
+      const { zuli = { value: '1' }, retM3_merge = { value: '1' } } = e.readData;
       const drag_merge = parseInt(zuli.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: '回风区' },
       ];
+      e.dengjikong_merge = floor((1.19 * (m3_merge / 60)) / Math.sqrt(drag_merge), 2);
     });
     res.device_arr = Object.values(res.device);
 

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

@@ -307,7 +307,7 @@ export const testConfigVent: Config[] = [
             },
             {
               label: '等积孔',
-              value: '6.12',
+              value: '${dengjikong_merge}',
             },
           ],
         },
@@ -1723,7 +1723,7 @@ export const testConfigVentRealtime: Config[] = [
             },
             {
               label: '等积孔',
-              value: '6.12',
+              value: '${dengjikong}',
             },
           ],
         },

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

@@ -795,7 +795,7 @@ export const testConfigSY: Config[] = [
             },
             {
               label: '等积孔',
-              value: '6.12',
+              value: '${dengjikong}',
             },
           ],
         },

src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal.hlg.vue

@@ -708,11 +708,11 @@
                   Section_EndPosition: item.readData[`Section${index}_EndPosition`],
                   Section_AlarmTemp: item.readData[`Section${index}_AlarmTemp`],
                   isWarn:
-                    parseFloat(item.readData[`Section${index}_MaxTemp`]) > parseFloat(item.readData[`Section${index}_AlarmTemp`]) ? '报警' : '未报警',
+                    parseFloat(item.readData[`Section${index}_MaxTemp`]) > parseFloat(item.readData[`Section${index}_AlarmTemp`]) ? '未报警' : '报警',
                 });
                 posList1.push({
                   Section_AlarmTemp: `${item.readData[`Section${index}_BeginPosition`]}-${item.readData[`Section${index}_EndPosition`]}m`,
-                  value: item.readData[`Section${index}_MaxTempPos`],
+                  value: item.readData[`Section${index}_MaxTemp`],
                 });
                 if (parseFloat(item.readData[`Section${index}_MaxTemp`]) > maxTemp.value) {
                   maxTemp.value = item.readData[`Section${index}_MaxTemp`];