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

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,13 +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' } } = e.readData;
-      const drag_merge = parseInt(zuli.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.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);
 

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

@@ -303,11 +303,11 @@ export const testConfigVent: Config[] = [
             },
             {
               label: '矿井阻力(Pa)',
-              value: '${zuli.value}',
+              value: '${fy_merge.value}',
             },
             {
               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/device.data.ts

@@ -67,7 +67,8 @@ export function getMonitorComponent() {
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
       break;
     default:
-      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.hlg.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));

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

@@ -41,13 +41,7 @@
         <div class="right-bottom">
           <span class="base-title">测点监测曲线</span>
           <div class="echarts-box">
-            <BarAndLine
-              xAxisPropType="Section_AlarmTemp"
-              :dataSource="posList1"
-              height="100%"
-              :chartsColumns="chartsColumns"
-              :option="echatsOption"
-            />
+            <BarAndLine xAxisPropType="Section_Position" :dataSource="posList1" height="100%" :chartsColumns="chartsColumns" :option="echatsOption" />
           </div>
         </div>
       </div>
@@ -97,7 +91,7 @@
 
       const chartsColumns = [
         {
-          legend: '测点报警温度',
+          legend: '最高温度',
           seriesName: '(℃)',
           ymax: 100,
           yname: '℃',
@@ -700,6 +694,16 @@
             for (let i = 0; i < indexValues.length; i++) {
               const index = indexValues[i];
               if (item.readData[`Section${index}_BeginPosition`] && item.readData[`Section${index}_EndPosition`]) {
+                let isWarn;
+                if (parseFloat(item.readData[`Section${index}_AlarmTemp`]) > 1) {
+                  isWarn =
+                    parseFloat(item.readData[`Section${index}_AlarmTemp`]) - parseFloat(item.readData[`Section${index}_MaxTemp`]) > 0
+                      ? '报警'
+                      : '正常';
+                } else {
+                  isWarn = parseFloat(item.readData[`Section${index}_AlarmTemp`]) == 0 ? '正常' : '报警';
+                }
+
                 posList.push({
                   position: `测点${index}`,
                   Section_MaxTemp: item.readData[`Section${index}_MaxTemp`],
@@ -707,11 +711,10 @@
                   Section_BeginPosition: item.readData[`Section${index}_BeginPosition`],
                   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`]) ? '未报警' : '报警',
+                  isWarn: isWarn,
                 });
                 posList1.push({
-                  Section_AlarmTemp: `${item.readData[`Section${index}_BeginPosition`]}-${item.readData[`Section${index}_EndPosition`]}m`,
+                  Section_Position: `${item.readData[`Section${index}_BeginPosition`]}-${item.readData[`Section${index}_EndPosition`]}m`,
                   value: item.readData[`Section${index}_MaxTemp`],
                 });
                 if (parseFloat(item.readData[`Section${index}_MaxTemp`]) > maxTemp.value) {
@@ -719,7 +722,7 @@
                 }
               }
             }
-            warnLevels.value = posList.find((v) => v.isWarn == '报警') ? '报警' : '未报警';
+            warnLevels.value = posList.find((v) => v.isWarn == '报警') ? '报警' : '正常';
           }
         });
       });

src/views/vent/monitorManager/mainFanMonitor/main.data.ts

@@ -813,7 +813,7 @@ export const assistanceData = {
 export const setOption = (deviceType?) => {
   let yMax = 4500;
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtdltmkhjtj';
+  // const sysOrgCode = 'sdmtjtsgtmk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     // 这里判断白家渠还是五当沟
     if (deviceType == 'fanmain_bjq') {
@@ -835,6 +835,8 @@ export const setOption = (deviceType?) => {
     }
   } else if (sysOrgCode == 'sdmtjtjjmk') {
     yMax = 6000;
+  } else if (sysOrgCode == 'sdmtjtsgtmk') {
+    yMax = 3000;
   } else if (sysOrgCode == 'sdmtjtdltmkhjtj') {
     yMax = 3000;
   } else {
@@ -1148,7 +1150,7 @@ export const initData1 = () => {
 // 大柳塔武当沟
 export const initData = (deviceType?) => {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtdltmkhjtj';
+  // const sysOrgCode = 'sdmtjtsgtmk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     return initDataDlt(deviceType);
   } else if (sysOrgCode == 'sdmtjtswmk') {
@@ -1161,12 +1163,65 @@ export const initData = (deviceType?) => {
     return initDataJj();
   } else if (sysOrgCode == 'sdmtjtdltmkhjtj') {
     return initDataHjt();
+  } else if (sysOrgCode == 'sdmtjtsgtmk') {
+    return initDataSgt();
   } else {
     return initData1();
   }
 };
+// 石圪台
+const initDataSgt = () => {
+  const data: any[] = [];
+  data.push({
+    angle: -6,
+    Hz: -6,
+    a: -0.0438,
+    b: 14.5078,
+    c: 986.6,
+    min: 130,
+    max: 370,
+  });
+  data.push({
+    angle: -3,
+    Hz: -3,
+    a: -0.035,
+    b: 11.7875,
+    c: 1226.8,
+    min: 140,
+    max: 400,
+  });
+  data.push({
+    angle: 0,
+    Hz: 0,
+    a: -0.0354,
+    b: 13.6986,
+    c: 1078.6,
+    min: 150,
+    max: 430,
+  });
+  data.push({
+    angle: 3,
+    Hz: 3,
+    a: -0.0444,
+    b: 19.5673,
+    c: 504,
+    min: 170,
+    max: 445,
+  });
+  data.push({
+    angle: 6,
+    Hz: 6,
+    a: -0.0507,
+    b: 24.3336,
+    c: -70,
+    min: 190,
+    max: 460,
+  });
+  return data;
+};
+
 // 大柳塔白家渠
-export const initDataDlt = (deviceType?) => {
+const initDataDlt = (deviceType?) => {
   if (deviceType == 'fanmain_bjq') {
     const num = 2;
     const obj = {
@@ -1227,7 +1282,7 @@ export const initDataDlt = (deviceType?) => {
   }
 };
 
-export const initDataSw = (deviceType?) => {
+const initDataSw = (deviceType?) => {
   if (deviceType == 'fanmain_bfj') {
     // 北风井
     const num = 2;
@@ -1290,7 +1345,7 @@ export const initDataSw = (deviceType?) => {
   }
 };
 
-export const initDataHjt = () => {
+const initDataHjt = () => {
   const data: any[] = [];
   data.push({
     angle: -10,
@@ -1419,7 +1474,7 @@ const initDataBd = (deviceType?) => {
   }
 };
 
-const initDataBlt = (deviceType?) => {
+const initDataBlt = () => {
   const num = 2;
   const obj = {
     angle: 0,
@@ -1452,7 +1507,7 @@ const initDataBlt = (deviceType?) => {
   return data;
 };
 
-const initDataJj = (deviceType?) => {
+const initDataJj = () => {
   const num = 2;
   const obj = {
     angle: 0,