Browse Source

[Feat 0000] 石圪台-新增石圪台主风机风机工况曲线
[Fix 0000] 石圪台-光纤测温监测优化

hongrunxia 1 month ago
parent
commit
d5b481ee0d

+ 12 - 3
src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal.hlg.vue

@@ -700,6 +700,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,8 +717,7 @@
                   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`,
@@ -719,7 +728,7 @@
                 }
               }
             }
-            warnLevels.value = posList.find((v) => v.isWarn == '报警') ? '报警' : '未报警';
+            warnLevels.value = posList.find((v) => v.isWarn == '报警') ? '报警' : '正常';
           }
         });
       });

File diff suppressed because it is too large
+ 625 - 573
src/views/vent/monitorManager/fanLocalMonitor/index.vue


+ 62 - 7
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,

Some files were not shown because too many files changed in this diff