1. 优化自动登录时页面顶部人员信息隐藏

src/layouts/default/header/index.vue

@@ -46,7 +46,7 @@
     <!-- action  -->
     <div :class="`${prefixCls}-action`">
       <div class="right-position">
-        <UserDropDown v-if="showUserDropdown" :theme="getHeaderTheme" />
+        <UserDropDown v-if="!showUserDropdown" :theme="getHeaderTheme" />
       </div>
     </div>
   </Header>

src/layouts/default/sider/bottomSideder.vue

@@ -66,7 +66,6 @@
   import { getActions } from '/@/qiankun/state';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { router } from '/@/router';
   import { unmountMicroApps } from '/@/qiankun';
 
   export default defineComponent({

src/router/guard/permissionGuard.ts

@@ -15,7 +15,6 @@ import { OAUTH2_THIRD_LOGIN_TENANT_ID } from '/@/enums/cacheEnum';
 import { useGlobSetting } from '/@/hooks/setting';
 
 import _ from 'lodash';
-import { mountMicroApp } from '/@/qiankun';
 import { AUTO_LOGIN_URL_QUERY } from '../constant';
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN;

src/utils/threejs/main.worker.ts

@@ -60,9 +60,10 @@ export function initModalWorker() {
     // 'fire/workFace_2023-06-29.glb',
     'fire/tunFace_2023-07-14.glb',
     'fire/nitrogen_2023-06-02.glb',
-    'fire/nitrogenUnderground_2023-09-15.glb',
+    // 'fire/nitrogenUnderground_2023-09-15.glb',
+    'fire/nitrogenUnderground_2024-04-09.glb',
     'fire/grout_2023-06-02.glb',
-    'fire/Bertai_2024-04-09.glb',
+    'fire/Bertai_2023-11-29.glb',
     'fire/balancePress_2024-03-14.glb',
     'yafeng/compressor_2023-07-10.glb',
     'gas/gasPump_2024-03-04.glb',

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

@@ -268,32 +268,12 @@ export const detailCtrl = [
 
 export const modelMonitor = [
   {
-    title: '泵站内温度(℃)',
-    code: 'TemperatureSensor_Temp',
+    title: '抽放管道甲烷正压侧1(%)',
+    code: 'gas1',
   },
   {
-    title: '水仓液位(m)',
-    code: 'LiquidLevelSensor_Level',
-  },
-  {
-    title: '泵站温度低报警',
-    code: 'TemperatureSensor_TemperatureLowAlarm',
-    type: 'warning',
-  },
-  {
-    title: '泵站温度高报警',
-    code: 'TemperatureSensor_TemperatureHighAlarm',
-    type: 'warning',
-  },
-  {
-    title: '水仓液位低报警',
-    code: 'LiquidLevelSensor_LowWaterAlarm',
-    type: 'warning',
-  },
-  {
-    title: '水仓液位高报警',
-    code: 'LiquidLevelSensor_HighWaterAlarm',
-    type: 'warning',
+    title: '抽放管道甲烷负压侧1(%)',
+    code: 'gas2',
   },
   {
     title: '1#瓦斯泵A相绕组温度(℃)',

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

@@ -171,7 +171,7 @@
       Object.assign(selectData, currentData);
       if (currentDeviceType.value == 'pump_over') {
         setModelType('gasPump');
-      } else if (currentDeviceType.value == 'pump_under') {
+      } else if (currentDeviceType.value.startsWith('pump_under')) {
         setModelType('gasPumpUnder');
       }
     }