Browse Source

[Mod 0000] 优化乌伦木兰主风机工况曲线; 局部风机模型监测数据位置调整

hongrunxia 1 week ago
parent
commit
4648d711a4

+ 1 - 1
src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.base.ts

@@ -513,7 +513,7 @@ class ModelContext {
         fanLocalCSS3D.name = 'text6';
         fanLocalCSS3D.scale.set(0.04, 0.04, 0.04);
         fanLocalCSS3D.rotation.y = -Math.PI / 2;
-        fanLocalCSS3D.position.set(-84.23, 6.01, -0.03);
+        fanLocalCSS3D.position.set(-84.23, 6.95, -19.47);
         this.group.add(fanLocalCSS3D);
       }
     }

+ 4 - 4
src/views/vent/monitorManager/mainFanMonitor/components/conditionAssistance.vue

@@ -119,7 +119,7 @@
     max: number;
   };
   const columns = ref([]);
-  const showFre = ref(false); // 是否显示频率曲线, 是显示,不是显示角度
+  const showFre = ref(true); // 是否显示频率曲线, 是显示,不是显示角度
   const isMock = false;
   let option = reactive({});
   // 注册 modal
@@ -520,11 +520,11 @@
     () => props.selectData,
     async (selectData) => {
       deviceData.value = selectData;
-      if (selectData && selectData['adjustmentMethod_mainFanInfo'] == 'angleadjust') {
+      if (selectData && selectData['adjustmentMethod_mainFanInfo'] != 'angleadjust') {
         // 说明是角度了调节
-        showFre.value = false;
-      } else {
         showFre.value = true;
+      } else {
+        showFre.value = false;
       }
     },
     { immediate: true }

+ 37 - 37
src/views/vent/monitorManager/mainFanMonitor/main.data.ts

@@ -812,8 +812,8 @@ export const assistanceData = {
 
 export const setOption = (deviceType?) => {
   let yMax = 4500;
-  // const { sysOrgCode } = useGlobSetting();
-  const sysOrgCode = 'sdmtjtwlmlmk';
+  const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtwlmlmk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     // 这里判断白家渠还是五当沟
     if (deviceType == 'fanmain_bjq') {
@@ -1153,8 +1153,8 @@ export const initData1 = () => {
 
 // 大柳塔武当沟
 export const initData = (deviceType?) => {
-  // const { sysOrgCode } = useGlobSetting();
-  const sysOrgCode = 'sdmtjtwlmlmk';
+  const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtwlmlmk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     return initDataDlt(deviceType);
   } else if (sysOrgCode == 'sdmtjtswmk') {
@@ -1188,8 +1188,8 @@ const initDataWlml = () => {
     a: -15.607,
     b: 6242.3,
     c: -621571,
-    min: 198,
-    max: 220,
+    min: 204,
+    max: 212,
   });
   data.push({
     angle: -2,
@@ -1197,8 +1197,8 @@ const initDataWlml = () => {
     a: -8.3134,
     b: 3178.9,
     c: -300224,
-    min: 198,
-    max: 220,
+    min: 204,
+    max: 211,
   });
   data.push({
     angle: 0,
@@ -1206,36 +1206,36 @@ const initDataWlml = () => {
     a: -8.9632,
     b: 3751.3,
     c: -389068,
-    min: 198,
-    max: 220,
+    min: 216,
+    max: 227.2,
+  });
+  data.push({
+    angle: 1,
+    Hz: 1,
+    a: -12.77,
+    b: 5415.9,
+    c: -571193,
+    min: 216,
+    max: 226.8,
+  });
+  data.push({
+    angle: 2,
+    Hz: 2,
+    a: -12.432,
+    b: 5635.5,
+    c: -635361,
+    min: 234.5,
+    max: 242.4,
+  });
+  data.push({
+    angle: 3,
+    Hz: 3,
+    a: -2.9424,
+    b: 1147.7,
+    c: -104620,
+    min: 234.5,
+    max: 243.5,
   });
-  // data.push({
-  //   angle: 1,
-  //   Hz: 1,
-  //   a: -12.77,
-  //   b: 5415.9,
-  //   c: -571193,
-  //   min: 250,
-  //   max: 275,
-  // });
-  // data.push({
-  //   angle: 2,
-  //   Hz: 2,
-  //   a: -12.432,
-  //   b: 5635.5,
-  //   c: -635361,
-  //   min: 272,
-  //   max: 290,
-  // });
-  // data.push({
-  //   angle: 3,
-  //   Hz: 3,
-  //   a: -2.9424,
-  //   b: 1147.7,
-  //   c: -104620,
-  //   min: 290,
-  //   max: 310,
-  // });
   return data;
 };