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

src/utils/threejs/main.worker.ts

@@ -37,7 +37,7 @@ export function initModalWorker() {
     'cf/ddcf_2023-12-09.glb',
     'cf/dsmove_2023-06-02.glb',
     'cf/fixedCf_2023-11-29.glb',
-    'jbfj/jbfj-hd_2023-10-19.glb',
+    'jbfj/jbfj-hd_2023-12-12.glb',
     'jbfj/jbfj-fm_2023-06-02.glb',
     'jbfj/jbfj-fc_2023-06-02.glb',
     'ztfj/dj1_2023-06-02.glb',

src/views/vent/monitorManager/mainFanMonitor/index.vue

@@ -605,9 +605,6 @@
         frequencyVal.value = selectData['Fan2FreqHz']
       }
     }
-
-    
-    
   };
 
   const changeMotor = (e) => {
@@ -802,7 +799,8 @@
     mountedThree(player1.value).then(async () => {
       // await setModelType('mainWindRect');
       getMonitor(true);
-      addText('mainWindRect');
+      addText();
+      // addText();
       // play('initiatePlay', 'front', frequencyVal.value, 'open', 'tubPositivePath');
     });
   });

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

@@ -221,8 +221,8 @@ export const playAnimate = async (selectData, duration?) => {
   if (!mainWindObj) return;
   if (modalType === 'mainWindRect') {
     if (selectData) {
-      if (selectData['Fan1FreqHz'] == undefined || selectData['Fan1FreqHz'] == null) selectData['Fan1FreqHz'] = 50;
-      if (selectData['Fan2FreqHz'] == undefined || selectData['Fan2FreqHz'] == null) selectData['Fan2FreqHz'] = 50;
+      if (selectData['Fan1FreqHz'] == undefined || selectData['Fan1FreqHz'] == null || !selectData['Fan1FreqHz']) selectData['Fan1FreqHz'] = 50;
+      if (selectData['Fan2FreqHz'] == undefined || selectData['Fan2FreqHz'] == null || !selectData['Fan2FreqHz']) selectData['Fan2FreqHz'] = 50;
       mainWindObj.resetSmokeParam('front', selectData.Fan1FreqHz, duration);
       mainWindObj.resetSmokeParam('back', selectData.Fan2FreqHz, duration);
       if (selectData.Fan1StartStatus == 1) {

src/views/vent/monitorManager/nitrogen/index.vue

@@ -2,9 +2,9 @@
   <div class="nitrogen-box">
     <customHeader >智能压风管控系统</customHeader>
     <!-- 锦界 -->
-    <nitrogenHome v-if="btnActive == 'nitrogen_page'" />
+    <!-- <nitrogenHome v-if="btnActive == 'nitrogen_page'" /> -->
     <!-- 布尔台 -->
-    <!-- <nitrogenHome1 v-if="btnActive == 'nitrogen_page'" /> -->
+    <nitrogenHome1 v-if="btnActive == 'nitrogen_page'" />
     <nitrogenEcharts v-if="btnActive == 'yfj_monitor_echarts'"/>
     <nitrogenHistory v-if="btnActive == 'yfj_history'"/>
     <nitrogenHandleHistory v-if="btnActive == 'yfj_handler_history'"/>