Преглед изворни кода

[Mod 0000] 解决局部风机工况曲线不显示,以及计算错误问题

hongrunxia пре 20 часа
родитељ
комит
0cadca6934

+ 1 - 1
src/components/Upload/src/UploadPreviewModal.vue

@@ -88,7 +88,7 @@
 </script>
 <style lang="less">
   @ventSpace: zxm;
-  
+
   .upload-preview-modal {
     .@{ventSpace}-upload-list {
       display: none;

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

@@ -6,9 +6,9 @@
     :width="isComputeGas ? '1350px' : '950px'"
     v-bind="$attrs"
     @ok="onSubmit"
-    :closeFunc="onCancel"
+    @cancel="onSubmit"
     :canFullscreen="false"
-    :destroyOnClose="true"
+    destroyOnClose
     :footer="null"
     :maskClosable="false"
   >
@@ -204,6 +204,7 @@
   });
 
   function computeAssistance() {
+    debugger;
     assistanceData.value = initData();
     lineNum = 0;
     const assistanceDataList = [];
@@ -656,11 +657,11 @@
   }
 
   function onSubmit() {
-    emit('close');
-    closeModal();
     ChartRef.value = null;
     uQ.value = undefined;
     uH.value = undefined;
+    uQ1.value = undefined;
+    gasWarningVal.value = undefined;
     formType.value = '';
     refresh.value = true;
     xData.length = 0;
@@ -671,6 +672,8 @@
     monitorData.value = [];
     clearTimeout(timer);
     timer = undefined;
+    closeModal();
+    emit('close');
   }
 
   async function onCancel() {

+ 3 - 3
src/views/vent/monitorManager/fanLocalMonitor/fanLocal.data.ts

@@ -3585,9 +3585,9 @@ export const option = reactive<EChartsOption>({
       formatter: '{value}',
       color: '#0071A5',
     },
-    min: 15,
-    max: 60,
-    name: 'Hz',
+    min: 360,
+    max: 9000,
+    name: 'Pa',
     nameTextStyle: {
       fontWeight: 600,
       fontSize: 13,

+ 8 - 5
src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -1515,11 +1515,12 @@
         }
         //进行工况决策
         if (selectData.Fan1StartStatus == '1') {
+          debugger;
           openAssistance(true, {
             // m3: selectData.m3 || 675.87,
-            m3: 675.87,
-            frequency: 30,
-            // m3: 525.87,  //5.0测试数据
+            // m3: 675.87,
+            frequency: 35,
+            m3: 525.87, //5.0测试数据
             // frequency: 35,
             // frequency: selectData.Fan1fHz || selectData.Fan1FreqHz || selectData.Fan1Loop_Frequency,
             gasWarningVal: gasWarningVal.value,
@@ -1528,8 +1529,10 @@
         } else if (selectData.Fan2StartStatus == '1') {
           openAssistance(true, {
             // m3: selectData.m3 || 675.87,
-            m3: 675.87,
-            frequency: 30,
+            // m3: 675.87,
+            // frequency: 45,
+            frequency: 35,
+            m3: 525.87, //5.0测试数据
             // frequency: selectData.Fan2fHz || selectData.Fan2FreqHz || selectData.Fan2Loop_Frequency,
             gasWarningVal: gasWarningVal.value,
             isCompute: false,