1. 完成瓦斯出气、进气、出水、进水等路径定义

2. 主风机工况曲线图单位修改
3. 瓦斯抽采泵模型添加阀门状态监测

src/views/vent/monitorManager/gasPumpMonitor/gasPump.data.ts

@@ -298,8 +298,13 @@ export const modelMonitorTags = [
     domId: 'jsf1',
     title: '进水阀1#',
     code: '',
-    value: '0',
+    value: '1',
     position: [-5.26, 0.19, 0.6],
+    path: [
+      -12.284, 0.962, -0.359, -3.929, 0.942, -0.359, -3.839, 0.942, -0.227, -3.944, 0.942, -0.06, -4.356, 0.942, -0.06, -4.356, 0.725, -0.06, -5.173,
+      0.942, -0.06, -5.173, 0.725, -0.06,
+    ],
+    radius: 5,
   },
   {
     domId: 'jsf2',
@@ -307,6 +312,8 @@ export const modelMonitorTags = [
     code: '',
     value: '0',
     position: [-8.72, 0.29, 0.6],
+    path: [-10.61, 0.124, 0.808, -9.008, 0.123, 0.808, -9.008, 0.123, 0.019, -9.003, 0.215, 0.001, -8.839, 0.219, 0.001, -8.833, 0.271, 0.001],
+    radius: 5,
   },
   {
     domId: 'csf1',
@@ -314,6 +321,11 @@ export const modelMonitorTags = [
     code: '',
     value: '0',
     position: [-5.74, 0.38, 0.27],
+    path: [
+      -5.614, 0.29, 0.206, -5.614, 0.213, 0.212, -5.614, 0.175, 0.218, -5.614, 0.175, 0.589, -9.268, 0.175, 0.589, -9.725, 0.178, 0.593, -9.757,
+      0.178, 0.547, -9.757, 0.178, 0.007, -9.827, 0.178, -0.04, -10.612, 0.178, -0.04,
+    ],
+    radius: 5,
   },
   {
     domId: 'csf2',
@@ -321,6 +333,11 @@ export const modelMonitorTags = [
     code: '',
     value: '0',
     position: [-9.42, 0.38, 0.3],
+    path: [
+      -9.268, 0.175, 0.237, -9.268, 0.178, 0.593, -9.725, 0.178, 0.593, -9.757, 0.178, 0.547, -9.757, 0.178, 0.007, -9.827, 0.178, -0.04, -10.612,
+      0.178, -0.04,
+    ],
+    radius: 5,
   },
   {
     domId: 'jqf1',
@@ -328,6 +345,11 @@ export const modelMonitorTags = [
     code: '',
     value: '0',
     position: [-4.41, 1.46, -0.03],
+    path: [
+      -12.284, 0.962, -0.359, -3.929, 0.942, -0.359, -3.839, 0.942, -0.227, -3.944, 0.942, -0.06, -4.356, 0.942, -0.06, -4.356, 0.725, -0.06, -5.173,
+      0.942, -0.06, -5.173, 0.725, -0.06,
+    ],
+    radius: 5,
   },
   {
     domId: 'jqf2',
@@ -335,6 +357,8 @@ export const modelMonitorTags = [
     code: '',
     value: '0',
     position: [-7.7, 1.31, -0.14],
+    path: [-12.284, 0.962, -0.359, -7.276, 0.962, -0.377, -7.276, 0.942, -0.181, -7.414, 0.962, -0.063, -7.986, 0.942, -0.063, -8.78, 0.942, -0.063],
+    radius: 5,
   },
   {
     domId: 'cqf1',
@@ -342,6 +366,11 @@ export const modelMonitorTags = [
     code: '',
     value: '0',
     position: [-6.2, 1.55, 0.06],
+    path: [
+      -5.628, 0.606, -0.08, -5.628, 0.788, -0.08, -5.732, 0.914, -0.08, -5.962, 0.914, -0.08, -6.067, 1.094, -0.08, -6.067, 1.498, -0.08, -6.197,
+      1.619, -0.08, -12.284, 1.619, -0.08,
+    ],
+    radius: 5,
   },
   {
     domId: 'cqf2',
@@ -349,6 +378,11 @@ export const modelMonitorTags = [
     code: '',
     value: '0',
     position: [-9.58, 1.55, -0.13],
+    path: [
+      -9.257, 0.606, -0.069, -9.257, 0.819, -0.069, -9.388, 0.916, -0.069, -9.593, 0.916, -0.069, -9.697, 1.073, -0.069, -9.697, 1.618, -0.069,
+      -12.284, 1.619, -0.08,
+    ],
+    radius: 5,
   },
 ];
 

src/views/vent/monitorManager/gasPumpMonitor/gasPump.threejs.ts

@@ -54,6 +54,7 @@ export const setModelType = (type) => {
         model.scene.remove(gasPumpUnderObj.group);
       }
       group = gasPumpBaseObj.group;
+      model.isRender = false;
       const oldCameraPosition = { x: 15.9074, y: 5.40264, z: 27.12551 };
       setTimeout(async () => {
         model?.scene?.add(group);
@@ -75,6 +76,7 @@ export const setModelType = (type) => {
       }
       gasPumpUnderObj.addCssText();
       group = gasPumpUnderObj.group;
+      model.isRender = true;
       const oldCameraPosition = { x: 15.9074, y: 5.40264, z: 27.12551 };
       setTimeout(async () => {
         model?.scene?.add(group);
@@ -106,7 +108,7 @@ export const mountedThree = () => {
     await gasPumpUnderObj.mountedThree();
 
     addMouseEvent();
-    // render();
+    render();
     model.animate();
     resolve(null);
   });

src/views/vent/monitorManager/mainFanMonitor/components/conditionAssistance.vue

@@ -37,7 +37,7 @@
           <div ref="chartRef" class="info-echarts" style="width: 450px; height: 375px"></div>
           <div v-if="resultObj" class="result-tip">
             最佳工况点为
-            <span style="color: #9a60b4; padding: 0 10px; font-weight: 600">{{ parseInt(resultObj.Hz) }}°</span>
+            <span style="color: #9a60b4; padding: 0 10px; font-weight: 600">{{ parseInt(resultObj.Hz) + (showFre ? 'Hz' : '°') }}</span>
             <span style="color: #c60000; padding: 0 10px; font-weight: 600">{{ formatNum(resultObj.x) }} m³/s</span>
             <span style="color: #c60000; padding: 0 10px; font-weight: 600">{{ formatNum(resultObj.y) }} Pa</span></div
           >