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

src/api/sys/user.ts

@@ -69,6 +69,9 @@ export function autoLoginApi(params: AutoLoginParams, mode: ErrorMessageMode = '
     {
       url: Api.autoLogin,
       params,
+      headers: {
+        token: 'MTIzNDU2',
+      },
     },
     {
       errorMessageMode: mode,

src/hooks/vent/useAutoLogin.ts

@@ -1,40 +1,46 @@
-// 本来应该是后端做，出于工期考虑转到前端
-
 import QueryString from 'qs';
 import { useUserStore } from '/@/store/modules/user';
 import { RouteLocationNormalized } from 'vue-router';
 import { useMessage } from '../web/useMessage';
+import { AUTO_LOGIN_URL_QUERY } from '/@/router/constant';
+import { AxiosError } from 'axios';
 
 /** 自动登录功能的Hook，该Hook是为了部署在同一局域网内的多套系统之间能够无缝切换 */
 export function useAutoLogin() {
   /** 启用自动登录功能来跳转新的页面 */
-  function open(url: string, redirect?: string, target?: string) {
+  function open(url: string, target?: string) {
     const userStore = useUserStore();
     const qs = QueryString.stringify({
-      autoLogin: true,
+      [AUTO_LOGIN_URL_QUERY.key]: AUTO_LOGIN_URL_QUERY.val,
       username: userStore.getUserInfo.username,
       workNo: userStore.getUserInfo.workNo,
-      redirect,
     });
     window.open(`${url}?${qs}`, target);
   }
 
-  /** 用在路由守卫里，执行自动登录的逻辑，如果存在符合自动登录标准的query则执行自动登录 */
-  async function doAutoLogin(route: RouteLocationNormalized) {
-    const userStore = useUserStore();
+  /** 用在路由守卫里，执行自动登录的逻辑，如果存在符合自动登录标准的query则执行自动登录，返回是否需要重定向 */
+  async function doAutoLogin(route: RouteLocationNormalized): Promise<void> {
     if (!route.query) return;
-    const { autoLogin, username, workNo } = route.query;
-    if (!autoLogin || !username || !workNo) return;
+    if (route.query[AUTO_LOGIN_URL_QUERY.key] !== AUTO_LOGIN_URL_QUERY.val) return;
+
+    const { username, workNo } = route.query;
+    if (!username || !workNo) return;
+
     const params = {
       username: username as string,
       workNo: workNo as string,
       checkKey: new Date().getTime(),
     };
+    const userStore = useUserStore();
     try {
-      await userStore.autoLogin(params);
-    } catch (e: any) {
+      await userStore.autoLogin({
+        ...params,
+        goHome: false,
+      });
+      return;
+    } catch (e) {
       const message = useMessage().createMessage;
-      message.error(e.message);
+      message.error((e as AxiosError).message);
       return;
     }
   }

src/hooks/vent/useThree.ts

@@ -181,7 +181,6 @@ class UseThree {
 
         const modalNameArr = Object.prototype.toString.call(modalNames) === '[object Array]' ? modalNames : [modalNames];
         const len = modalNameArr.length;
-        debugger;
         for (let i = 0; i < len; i++) {
           resolvePromise[i] = new Promise(async (childResolve, reject) => {
             try {
@@ -235,7 +234,6 @@ class UseThree {
                       }
                     });
 
-                    debugger;
                     if (isBlender) {
                       object = object.children[0];
                     }

src/qiankun/index.ts

@@ -62,11 +62,9 @@ const mountMicroApp = (path, toPath?) => {
 
 // 卸载app的方法
 const unmountMicroApps = (multipleApp) => {
-  debugger;
   if (JSON.stringify(activeApps) !== '{}' && multipleApp.some) {
     for (const key in activeApps) {
       const isExist = multipleApp.some((name) => name == key);
-      debugger;
       if (isExist) {
         activeApps[key].unmount();
         activeApps[key] = null;

src/router/constant.ts

@@ -10,6 +10,8 @@ export const QIANKUN_ROUTE_OUTER_NAME = 'MicroAppOuter';
 
 export const AUTO_LOGIN_URL_QUERY = { key: 'auto-login', val: '1' };
 
+export const MOCK_LOGIN_URL_QUERY = { key: 'mock-login', val: '1' };
+
 export const SKIP_SSO_URL_QUERY = { key: 'skipsso', val: '1' };
 
 // 暂时修改

src/router/guard/permissionGuard.ts

@@ -15,7 +15,7 @@ import { OAUTH2_THIRD_LOGIN_TENANT_ID } from '/@/enums/cacheEnum';
 import { useGlobSetting } from '/@/hooks/setting';
 
 import _ from 'lodash';
-import { AUTO_LOGIN_URL_QUERY, SKIP_SSO_URL_QUERY } from '../constant';
+import { AUTO_LOGIN_URL_QUERY, MOCK_LOGIN_URL_QUERY, SKIP_SSO_URL_QUERY } from '../constant';
 import { useSso } from '/@/hooks/web/useSso';
 import { useAutoLogin } from '/@/hooks/vent/useAutoLogin';
 
@@ -43,12 +43,13 @@ export function createPermissionGuard(router: Router) {
   const permissionStore = usePermissionStoreWithOut();
   const { doAutoLogin } = useAutoLogin();
 
-  router.beforeEach(async (to, from, next) => {
+  router.beforeEach(async (to, from) => {
     RootRoute.redirect = glob.homePath || PageEnum.BASE_HOME;
 
     if (_.isEmpty(history.state.current)) {
       _.assign(history.state, { current: from.fullPath });
     }
+
     if (
       from.path === ROOT_PATH &&
       to.path === (glob.homePath || PageEnum.BASE_HOME) &&
@@ -56,10 +57,10 @@ export function createPermissionGuard(router: Router) {
       userStore.getUserInfo.homePath !== (glob.homePath || PageEnum.BASE_HOME)
     ) {
       // mountMicroApp(userStore.getUserInfo.homePath);
-      next(userStore.getUserInfo.homePath);
       document.title = '首页';
-      return;
+      return userStore.getUserInfo.homePath;
     }
+
     // 如果符合自动登录的相关条件则直接执行自动登录，覆盖原有的登录信息
     await doAutoLogin(to);
 
@@ -77,9 +78,8 @@ export function createPermissionGuard(router: Router) {
 
         try {
           if (!isSessionTimeout) {
-            next((to.query?.redirect as string) || '/');
             document.title = '';
-            return;
+            return (to.query?.redirect as string) || '/';
           }
         } catch {}
         //update-begin---author:wangshuai ---date:20220629  for：[issues/I5BG1I]vue3不支持auth2登录------------
@@ -90,27 +90,24 @@ export function createPermissionGuard(router: Router) {
         // if (to.query.tenantId) {
         //   setAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID, to.query.tenantId);
         // }
-        next({ path: OAUTH2_LOGIN_PAGE_PATH });
         document.title = '登录';
+        return { path: OAUTH2_LOGIN_PAGE_PATH };
         ///
 
         //update-end---author:wangshuai ---date:20230224  for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------
-        return;
+        return true;
         //update-end---author:wangshuai ---date:20220629  for：[issues/I5BG1I]vue3不支持auth2登录------------
       }
-      next();
-
       document.title = to.meta.title;
-      return;
+      return true;
     }
 
     // token does not exist
     if (!token) {
       // You can access without permission. You need to set the routing meta.ignoreAuth to true
       if (to.meta.ignoreAuth) {
-        next();
         document.title = to.meta.title;
-        return;
+        return true;
       }
       // query如果没有明确要求跳过sso则执行sso登录
       if (to.query[SKIP_SSO_URL_QUERY.key] !== SKIP_SSO_URL_QUERY.val) {
@@ -119,15 +116,15 @@ export function createPermissionGuard(router: Router) {
         if (redirectSso) return;
       }
       // query中要求自动登录的执行自动登录
-      if (to.query[AUTO_LOGIN_URL_QUERY.key] === AUTO_LOGIN_URL_QUERY.val) {
+      if (to.query[MOCK_LOGIN_URL_QUERY.key] === MOCK_LOGIN_URL_QUERY.val) {
         const userStore = useUserStoreWithOut();
         await userStore.mockLogin({
           goHome: false,
         });
-        return next({
+        return {
           path: to.path,
           query: to.query,
-        });
+        };
       }
 
       //update-begin---author:wangshuai ---date:20220629  for：[issues/I5BG1I]vue3 Auth2未实现------------
@@ -135,13 +132,13 @@ export function createPermissionGuard(router: Router) {
       if (whitePathList.includes(to.path as PageEnum)) {
         // 在免登录白名单，如果进入的页面是login页面并且当前是OAuth2app环境，就进入OAuth2登录页面
         if (to.path === LOGIN_PATH && isOAuth2AppEnv()) {
-          next({ path: OAUTH2_LOGIN_PAGE_PATH });
           document.title = '登录';
+          return { path: OAUTH2_LOGIN_PAGE_PATH };
         } else {
           //在免登录白名单，直接进入
           // mountMicroApp(to.path);
-          next();
           document.title = to.meta.title;
+          return true;
         }
       } else {
         //update-begin---author:wangshuai ---date:20230302  for：只有首次登陆并且是企业微信或者钉钉的情况下才会调用------------
@@ -192,16 +189,14 @@ export function createPermissionGuard(router: Router) {
         };
       }
       // mountMicroApp(redirectData.path);
-      next(redirectData);
       document.title = '';
-      return;
+      return redirectData;
     }
     //==============================【首次登录并且是企业微信或者钉钉的情况下才会调用】==================
     //判断是免登录页面,如果页面包含/tenantId/,那么就直接前往主页
     if (isOAuth2AppEnv() && to.path.indexOf('/tenantId/') != -1) {
-      next(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
       document.title = '首页';
-      return;
+      return userStore.getUserInfo.homePath || PageEnum.BASE_HOME;
     }
     //==============================【首次登录并且是企业微信或者钉钉的情况下才会调用】==================
 
@@ -212,9 +207,8 @@ export function createPermissionGuard(router: Router) {
       to.fullPath !== (userStore.getUserInfo.homePath || glob.homePath || PageEnum.BASE_HOME)
     ) {
       // mountMicroApp(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
-      next(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
       document.title = '首页';
-      return;
+      return userStore.getUserInfo.homePath || PageEnum.BASE_HOME;
     }
 
     // get userinfo while last fetch time is empty
@@ -224,15 +218,14 @@ export function createPermissionGuard(router: Router) {
       } catch (err) {
         console.info(err);
         // mountMicroApp(to.path);
-        next();
         document.title = to.meta.title;
+        return true;
       }
     }
     if (permissionStore.getIsDynamicAddedRoute) {
       // mountMicroApp(to.path);
-      next();
       document.title = to.meta.title;
-      return;
+      return true;
     }
 
     const routes = await permissionStore.buildRoutesAction();
@@ -248,14 +241,13 @@ export function createPermissionGuard(router: Router) {
 
     if (to.name === PAGE_NOT_FOUND_ROUTE.name) {
       // 动态添加路由后，此处应当重定向到fullPath，否则会加载404页面内容
-      next({ path: to.fullPath, replace: true, query: to.query });
+      return { path: to.fullPath, replace: true, query: to.query };
     } else {
       const redirectPath = (from.query.redirect || to.path) as string;
       const redirect = decodeURIComponent(redirectPath);
-      const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect };
-      // mountMicroApp(nextData.path);
-      next(nextData);
+      // mountMicroApp(return Data.path);
       document.title = '';
+      return to.path === redirect ? { ...to, replace: true } : { path: redirect };
     }
   });
 }

src/store/modules/user.ts

@@ -192,7 +192,7 @@ export const useUserStore = defineStore({
           router.addRoute(QIANKUN_ROUTE as unknown as RouteRecordRaw);
           permissionStore.setDynamicAddedRoute(true);
         }
-        await this.setLoginInfo({ ...data, isLogin: true });
+        this.setLoginInfo({ ...data, isLogin: true });
         //update-begin-author:liusq date:2022-5-5 for:登录成功后缓存拖拽模块的接口前缀
         localStorage.setItem(JDragConfigEnum.DRAG_BASE_URL, useGlobSetting().domainUrl);
         //update-end-author:liusq date:2022-5-5 for: 登录成功后缓存拖拽模块的接口前缀
@@ -405,17 +405,14 @@ export const useUserStore = defineStore({
         mode?: ErrorMessageMode;
       }
     ) {
-      try {
-        const { goHome = true, mode, ...loginParams } = params;
-        const data = await autoLoginApi(loginParams, mode);
-        const { token, userInfo } = data;
-        // save token
-        this.setToken(token);
-        this.setTenant(userInfo.loginTenantId);
-        return this.afterLoginAction(goHome, data);
-      } catch (error) {
-        return Promise.reject(error);
-      }
+      const { goHome = true, mode, ...loginParams } = params;
+      const data = await autoLoginApi(loginParams, mode);
+      const { token, userInfo } = data;
+      // save token
+      this.setToken(token);
+      this.setTenant(userInfo.loginTenantId);
+      await this.afterLoginAction(goHome, data);
+      return;
     },
   },
 });

src/utils/threejs/useThree.ts

@@ -267,10 +267,11 @@ class UseThree {
                     }
                     object.animations = gltf.animations;
                     object.name = modalNameStr;
-                    group?.add(object);
+                    if (group) group.add(object);
                     childResolve(object);
                   },
                   (err) => {
+                    debugger;
                     console.log(err);
                   }
                 );
@@ -290,7 +291,7 @@ class UseThree {
                       if (glft.animations.length > 0) {
                         object.animations = glft.animations;
                       }
-                      group?.add(object);
+                      if (group) group.add(object);
                       childResolve(object);
                       const modalArr = await db.modal.where('modalName').equals(modalNameStr).toArray();
                       if (modalArr.length < 1) {

src/views/vent/deviceManager/comment/warningTabel/BaseModal.vue

@@ -119,7 +119,6 @@
   }
 
   function setPoint(value) {
-    debugger;
     const data = value[0];
     option.value = [
       {

src/views/vent/deviceManager/comment/warningTabel/BaseModal1.vue

@@ -50,7 +50,6 @@
     isUpdate.value = unref(data.isUpdate);
     title.value = unref(data.title);
     await resetFields();
-    debugger;
     if (data.isUpdate) {
       await setFieldsValue({ ...data.record });
       pointData.value = [data.record['monitorId']];

src/views/vent/deviceManager/comment/warningTabel/warning.data.ts

@@ -436,7 +436,6 @@ export const monitorWarningFormSchemas = (param) =>
           labelField: 'strname',
           valueField: 'id',
           onChange: (e, option) => {
-            debugger;
             if (option) formModel['strtype'] = option['strtype'];
           },
         };

src/views/vent/home/billboard/index.vue

@@ -136,8 +136,8 @@
   // 页面跳转
   function openHandler(ip: string) {
     // const url = `http://localhost:3100/login`;
-    const url = `http://${ip}:8092/login`;
-    open(url, routePathMap[props.billboardType]);
+    const url = `http://${ip}:8092/${routePathMap[props.billboardType]}`;
+    open(url);
   }
 
   // 返回首页

src/views/vent/home/clique/components/dialog-modal.vue

@@ -215,8 +215,8 @@
   // 重新向到新的页面，业务上讲是公司端跳转矿端
   function redictTo() {
     if (!props.centerDetail.ip) return;
-    const url = `http://${props.centerDetail.ip}:8092/login`;
-    open(url, '/micro-vent-3dModal/dashboard/analysis');
+    const url = `http://${props.centerDetail.ip}:8092/micro-vent-3dModal/dashboard/analysis`;
+    open(url);
   }
 </script>
 <style lang="less" scoped>

src/views/vent/home/colliery/clique.data.ts

@@ -92,6 +92,9 @@ let latestData = [];
 let latestTime = 0;
 export function getDate(workData) {
   // debugger;
+  if (workData.length <= 0) {
+    return [];
+  }
   const workTypeList = cloneDeep(workData);
   workData = latestData;
   const getTime = (val) => {

src/views/vent/home/colliery/index.vue

@@ -211,34 +211,34 @@
         lineList.value = res.sys_majorpath;
       } else {
         let paramArr: any = [];
-        paramArr.push({
-          deviceName: '关键路线1',
-          deviceType: 'sys_majorpath',
-          deviceID: Math.random() * 100,
-          majorpath: {
-            drag_1: 380,
-            drag_2: 167,
-            drag_3: 333,
-            drag_total: Math.abs(
-              Number(
-                res.fanmain && res.fanmain[0]
-                  ? res.fanmain[0].readData.Fan1FanPre ||
-                      res.fanmain[0].readData.Fan2FanPre ||
-                      res.fanmain[0].readData.DataPa ||
-                      680 + (Math.random() * 2 - 1 * 5)
-                  : 680 + (Math.random() * 2 - 1 * 5)
-              )
-            ),
-            m3_total: Number(
-              res.fanmain && res.fanmain[0]
-                ? res.fanmain[0].readData.Fan1m3 ||
-                    res.fanmain[0].readData.Fan2m3 ||
-                    res.fanmain[0].readData.m3 ||
-                    8138 + (Math.random() * 2 - 1 * 20)
-                : 8138 + (Math.random() * 2 - 1 * 20)
-            ),
-          },
-        });
+        // paramArr.push({
+        //   deviceName: '关键路线1',
+        //   deviceType: 'sys_majorpath',
+        //   deviceID: Math.random() * 100,
+        //   majorpath: {
+        //     drag_1: 380,
+        //     drag_2: 167,
+        //     drag_3: 333,
+        //     drag_total: Math.abs(
+        //       Number(
+        //         res.fanmain && res.fanmain[0]
+        //           ? res.fanmain[0].readData.Fan1FanPre ||
+        //               res.fanmain[0].readData.Fan2FanPre ||
+        //               res.fanmain[0].readData.DataPa ||
+        //               680 + (Math.random() * 2 - 1 * 5)
+        //           : 680 + (Math.random() * 2 - 1 * 5)
+        //       )
+        //     ),
+        //     m3_total: Number(
+        //       res.fanmain && res.fanmain[0]
+        //         ? res.fanmain[0].readData.Fan1m3 ||
+        //             res.fanmain[0].readData.Fan2m3 ||
+        //             res.fanmain[0].readData.m3 ||
+        //             8138 + (Math.random() * 2 - 1 * 20)
+        //         : 8138 + (Math.random() * 2 - 1 * 20)
+        //     ),
+        //   },
+        // });
         lineList.value = paramArr;
       }
 
@@ -246,15 +246,15 @@
         workList.value = res.sys_surface_caimei;
       } else {
         let paramArr: any = [];
-        paramArr.push({
-          deviceName: '工作面',
-          deviceType: 'sys_surface_caimei',
-          deviceID: '11111',
-          history: [],
-          jin: 100,
-          hui: 200,
-          xufengliang: 300,
-        });
+        // paramArr.push({
+        //   deviceName: '工作面',
+        //   deviceType: 'sys_surface_caimei',
+        //   deviceID: '11111',
+        //   history: [],
+        //   jin: 100,
+        //   hui: 200,
+        //   xufengliang: 300,
+        // });
         workList.value = getDate(paramArr);
       }
       warnData.value = res.warn || [];

src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -63,7 +63,7 @@ export function getMonitorComponent() {
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.bd.vue'));
   }
   const BundleModal = defineAsyncComponent(() => import('./modal/bundle.modal.vue'));
-  const FiremonNormalModal = defineAsyncComponent(() => import('./modal/firemonNormal.modal.vue'));
+  const FiremonModal = defineAsyncComponent(() => import('./modal/firemon.modal.vue'));
   const DustModal = defineAsyncComponent(() => import('./modal/dust.modal.vue'));
   const BallvalveModal = defineAsyncComponent(() => import('./modal/ballvalve.modal.vue'));
   const AtomizingModal = defineAsyncComponent(() => import('./modal/atomizing.modal.vue'));
@@ -396,7 +396,7 @@ export const haveDetailArr = [
   'safetymonitor',
   'nitrogen',
   'atomizing',
-  'firemon_normal',
+  'firemon',
 ];
 
 export const locationFormConfig = {

src/views/vent/monitorManager/deviceMonitor/components/device/modal/bundle.modal.vue

@@ -1,10 +1,21 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="register" :title="`束管监测详情 ${currentTime}`" width="1200px" @ok="handleOk"
-    @cancel="handleCancel" wrapClassName="bundle-modal">
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    :title="`束管监测详情 ${currentTime}`"
+    width="1200px"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    wrapClassName="bundle-modal"
+  >
     <div class="fiber-modal">
       <div class="modal-left">
-        <div v-for="device in deviceList" class="link-item"
-          :class="{ 'active-device-title': device.deviceID === activeDeviceID }" :key="device.deviceID">
+        <div
+          v-for="device in deviceList"
+          class="link-item"
+          :class="{ 'active-device-title': device.deviceID === activeDeviceID }"
+          :key="device.deviceID"
+        >
           <span class="" @click="selectDevice(device.deviceID)">{{ device.strinstallpos }}</span>
         </div>
       </div>
@@ -17,8 +28,7 @@
             </div>
             <div class="item-container">
               <div class="title">一氧化碳</div>
-              <div class="value">{{ posMonitor.coval !== undefined && posMonitor.coval !== null ? posMonitor.coval : '-'
-                }} <span>ppm</span> </div>
+              <div class="value">{{ posMonitor.coval !== undefined && posMonitor.coval !== null ? posMonitor.coval : '-' }} <span>ppm</span> </div>
             </div>
           </div>
           <div class="top-item">
@@ -27,8 +37,7 @@
             </div>
             <div class="item-container">
               <div class="title">二氧化碳</div>
-              <div class="value">{{ posMonitor.co2val !== undefined && posMonitor.co2val !== null ? posMonitor.co2val :
-                '-' }} <span>%</span></div>
+              <div class="value">{{ posMonitor.co2val !== undefined && posMonitor.co2val !== null ? posMonitor.co2val : '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -37,8 +46,7 @@
             </div>
             <div class="item-container">
               <div class="title">甲烷</div>
-              <div class="value">{{ posMonitor.gasval !== undefined && posMonitor.gasval !== null ? posMonitor.gasval :
-                '-' }} <span>%</span></div>
+              <div class="value">{{ posMonitor.gasval !== undefined && posMonitor.gasval !== null ? posMonitor.gasval : '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -47,8 +55,7 @@
             </div>
             <div class="item-container">
               <div class="title">乙烯</div>
-              <div class="value">{{ posMonitor.ch2val !== undefined && posMonitor.ch2val !== null ? posMonitor.ch2val :
-                '-' }} <span>ppm</span></div>
+              <div class="value">{{ posMonitor.ch2val !== undefined && posMonitor.ch2val !== null ? posMonitor.ch2val : '-' }} <span>ppm</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -57,8 +64,7 @@
             </div>
             <div class="item-container">
               <div class="title">乙炔</div>
-              <div class="value">{{ posMonitor.chval !== undefined && posMonitor.chval !== null ? posMonitor.chval : '-'
-                }} <span>ppm</span></div>
+              <div class="value">{{ posMonitor.chval !== undefined && posMonitor.chval !== null ? posMonitor.chval : '-' }} <span>ppm</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -67,8 +73,7 @@
             </div>
             <div class="item-container">
               <div class="title">氧气</div>
-              <div class="value">{{ posMonitor.o2val !== undefined && posMonitor.o2val !== null ? posMonitor.o2val : '-'
-                }} <span>%</span></div>
+              <div class="value">{{ posMonitor.o2val !== undefined && posMonitor.o2val !== null ? posMonitor.o2val : '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item warning-box">
@@ -77,11 +82,14 @@
             </div>
             <div class="item-container">
               <div class="title">风险等级</div>
-              <div :class="{
-                value1: posMonitor['syswarnLevel_str'] == '绿色预警',
-                value2: posMonitor['syswarnLevel_str'] == '黄色预警',
-                value3: posMonitor['syswarnLevel_str'] == '红色预警',
-              }">{{ posMonitor['syswarnLevel_str'] || '-'}}</div>
+              <div
+                :class="{
+                  value1: posMonitor['syswarnLevel_str'] == '绿色预警',
+                  value2: posMonitor['syswarnLevel_str'] == '黄色预警',
+                  value3: posMonitor['syswarnLevel_str'] == '红色预警',
+                }"
+                >{{ posMonitor['syswarnLevel_str'] || '-' }}</div
+              >
             </div>
           </div>
           <div class="top-item warning-box">
@@ -95,11 +103,20 @@
           </div>
         </div>
         <div class="right-bottom">
-          <span class="base-title">设备监测曲线&nbsp; <span style="color: red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' :
-              '' }}</span></span>
+          <span class="base-title"
+            >设备监测曲线&nbsp; <span style="color: red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' : '' }}</span></span
+          >
           <div class="echarts-box">
-            <BarAndLine class="echarts-line" :xAxisPropType="xAxisPropType" :dataSource="historyList" height="100%"
-              width="65%" :chartsColumns="chartsColumns" :option="echatsOption" chartsType="listMonitor" />
+            <BarAndLine
+              class="echarts-line"
+              :xAxisPropType="xAxisPropType"
+              :dataSource="historyList"
+              height="100%"
+              width="65%"
+              :chartsColumns="chartsColumns"
+              :option="echatsOption"
+              chartsType="listMonitor"
+            />
 
             <!-- 爆炸三角形 -->
             <div style="width: 35%; height: 100%; margin: 0px auto">
@@ -112,428 +129,428 @@
   </BasicModal>
 </template>
 <script lang="ts">
-import { defineComponent, ref, watch, shallowRef, onMounted } from 'vue';
-import { BasicModal, useModalInner } from '/@/components/Modal';
-import BarAndLine from '/@/components/chart/BarAndLine.vue';
-import blastDelta from './blastDelta.vue';
-import { SvgIcon } from '/@/components/Icon';
-import dayjs from 'dayjs';
-import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
-import { chartsColumnList } from '../device.data';
-import { listdays, getHistoryData } from '../device.api';
-
-export default defineComponent({
-  components: { BasicModal, BarAndLine, SvgIcon, blastDelta },
-  props: {
-    dataSource: { type: Array },
-    activeID: { type: String },
-  },
-  setup(props) {
-    const currentTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
-    const modelRef = ref({});
-    const loading = ref(true);
-    const activeDeviceID = ref('');
-    const deviceList = ref<any[]>([]);
-    const historyList = ref<any[]>([]);
-    const posList = ref<any[]>([]);
-    const posMonitor = shallowRef({});
-
-    const echatsOption = {
-      grid: {
-        top: '29%',
-        left: '3',
-        right: '45',
-        bottom: '3%',
-        containLabel: true,
-      },
-      toolbox: {
-        feature: {},
-      },
-    };
-
-    const chartsColumnArr = getTableHeaderColumns('bundletube_chart');
-    const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
-    const xAxisPropType = ref('ttime');
-    const [register, { setModalProps, closeModal }] = useModalInner();
-
-    function handleVisibleChange(visible) {
-      if (visible) {
+  import { defineComponent, ref, watch, shallowRef, onMounted } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import BarAndLine from '/@/components/chart/BarAndLine.vue';
+  import blastDelta from './blastDelta.vue';
+  import { SvgIcon } from '/@/components/Icon';
+  import dayjs from 'dayjs';
+  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { chartsColumnList } from '../device.data';
+  import { listdays, getHistoryData } from '../device.api';
+
+  export default defineComponent({
+    components: { BasicModal, BarAndLine, SvgIcon, blastDelta },
+    props: {
+      dataSource: { type: Array },
+      activeID: { type: String },
+    },
+    setup(props) {
+      const currentTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
+      const modelRef = ref({});
+      const loading = ref(true);
+      const activeDeviceID = ref('');
+      const deviceList = ref<any[]>([]);
+      const historyList = ref<any[]>([]);
+      const posList = ref<any[]>([]);
+      const posMonitor = shallowRef({});
+
+      const echatsOption = {
+        grid: {
+          top: '29%',
+          left: '3',
+          right: '45',
+          bottom: '3%',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+      };
+
+      const chartsColumnArr = getTableHeaderColumns('bundletube_chart');
+      const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
+      const xAxisPropType = ref('ttime');
+      const [register, { setModalProps, closeModal }] = useModalInner();
+
+      function handleVisibleChange(visible) {
+        if (visible) {
+          loading.value = true;
+          setModalProps({ loading: true, confirmLoading: true });
+
+          setTimeout(() => {
+            loading.value = false;
+            setModalProps({ loading: false, confirmLoading: false });
+          }, 1000);
+        }
+      }
+
+      // 选择监测
+      function selectDevice(id) {
         loading.value = true;
         setModalProps({ loading: true, confirmLoading: true });
-
         setTimeout(() => {
           loading.value = false;
+          activeDeviceID.value = id;
           setModalProps({ loading: false, confirmLoading: false });
-        }, 1000);
+        }, 300);
+        getListdays();
       }
-    }
 
-    // 选择监测
-    function selectDevice(id) {
-      loading.value = true;
-      setModalProps({ loading: true, confirmLoading: true });
-      setTimeout(() => {
-        loading.value = false;
-        activeDeviceID.value = id;
-        setModalProps({ loading: false, confirmLoading: false });
-      }, 300);
-      getListdays();
-    }
-
-    function handleOk(e) {
-      e.preventDefault();
-      closeModal();
-    }
+      function handleOk(e) {
+        e.preventDefault();
+        closeModal();
+      }
 
-    function handleCancel(e) {
-      e.preventDefault();
-      closeModal();
-    }
+      function handleCancel(e) {
+        e.preventDefault();
+        closeModal();
+      }
 
-    //获取历史数据
-    async function getListdays() {
-      if (posMonitor.value.stationtype && posMonitor.value.stationtype != 'redis') {
-        xAxisPropType.value = 'ttime';
-        const ttime_begin = dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss');
-        const ttime_end = dayjs().format('YYYY-MM-DD HH:mm:ss');
-        const pageNo = 1;
-        const pageSize = 100;
-        const skip = 8;
-        const strtype = posMonitor.value.deviceType;
-        let res = await listdays({
-          ttime_begin,
-          ttime_end,
-          pageNo,
-          pageSize,
-          skip,
-          strtype,
-          column: 'createTime',
-          gdeviceid: activeDeviceID.value,
-        });
-        console.log(res, '束管历史数据');
-        let data = res.datalist.records;
-        if (data.length != 0) {
-          data.forEach((el) => {
-            Object.assign(el, el.readData);
-          });
-        }
-        historyList.value = data;
-      } else {
-        const params = {
-          pageNum: 1,
-          pageSize: 100,
-          startTime: dayjs(new Date().getTime() - 3 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss'),
-          endTime: dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss'),
-          deviceId: activeDeviceID.value,
-          interval: '1h',
-          isEmployee: true,
-        };
-        xAxisPropType.value = 'time';
-        const result = await getHistoryData({ ...params });
-        if (result['records'].length != 0) {
-          result['records'].forEach((el) => {
-            el.ch2val = el.C2H4;
-            el.chval = el.C2H2;
-            el.co2val = el.CO2;
-            el.coval = el.CO;
-            el.gasval = el.CH4;
-            el.o2val = el.O2;
+      //获取历史数据
+      async function getListdays() {
+        if (posMonitor.value.stationtype && posMonitor.value.stationtype != 'redis') {
+          xAxisPropType.value = 'ttime';
+          const ttime_begin = dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss');
+          const ttime_end = dayjs().format('YYYY-MM-DD HH:mm:ss');
+          const pageNo = 1;
+          const pageSize = 100;
+          const skip = 8;
+          const strtype = posMonitor.value.deviceType;
+          let res = await listdays({
+            ttime_begin,
+            ttime_end,
+            pageNo,
+            pageSize,
+            skip,
+            strtype,
+            column: 'createTime',
+            gdeviceid: activeDeviceID.value,
           });
+          console.log(res, '束管历史数据');
+          let data = res.datalist.records;
+          if (data.length != 0) {
+            data.forEach((el) => {
+              Object.assign(el, el.readData);
+            });
+          }
+          historyList.value = data;
+        } else {
+          const params = {
+            pageNum: 1,
+            pageSize: 100,
+            startTime: dayjs(new Date().getTime() - 3 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss'),
+            endTime: dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss'),
+            deviceId: activeDeviceID.value,
+            interval: '1h',
+            isEmployee: true,
+          };
+          xAxisPropType.value = 'time';
+          const result = await getHistoryData({ ...params });
+          if (result['records'].length != 0) {
+            result['records'].forEach((el) => {
+              el.ch2val = el.C2H4;
+              el.chval = el.C2H2;
+              el.co2val = el.CO2;
+              el.coval = el.CO;
+              el.gasval = el.CH4;
+              el.o2val = el.O2;
+            });
+          }
+          historyList.value = result['records'];
         }
-        historyList.value = result['records'];
       }
-    }
 
-    watch(
-      [() => props.dataSource, () => props.activeID],
-      ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
-        // if (newActiveID != oldActiveID) {
-        //   activeDeviceID.value = newActiveID as string;
-        // }
-        activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
-        deviceList.value = newDataSource?.filter((item: any, index) => {
-          if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-            // activeDeviceID.value = item.deviceID;
-            posMonitor.value = Object.assign(item, item.readData);
-          }
-          item.readTime = item.readTime?.substring(11);
-          return item;
-        });
-      },
-      { immediate: true }
-    );
-    onMounted(() => {
-      getListdays();
-    });
-    return {
-      register,
-      model: modelRef,
-      currentTime,
-      handleVisibleChange,
-      selectDevice,
-      handleOk,
-      handleCancel,
-      deviceList,
-      historyList,
-      activeDeviceID,
-      posMonitor,
-      echatsOption,
-      posList,
-      chartsColumns,
-      xAxisPropType,
-    };
-  },
-});
+      watch(
+        [() => props.dataSource, () => props.activeID],
+        ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
+          // if (newActiveID != oldActiveID) {
+          //   activeDeviceID.value = newActiveID as string;
+          // }
+          activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
+          deviceList.value = newDataSource?.filter((item: any, index) => {
+            if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
+              // activeDeviceID.value = item.deviceID;
+              posMonitor.value = Object.assign(item, item.readData);
+            }
+            item.readTime = item.readTime?.substring(11);
+            return item;
+          });
+        },
+        { immediate: true }
+      );
+      onMounted(() => {
+        getListdays();
+      });
+      return {
+        register,
+        model: modelRef,
+        currentTime,
+        handleVisibleChange,
+        selectDevice,
+        handleOk,
+        handleCancel,
+        deviceList,
+        historyList,
+        activeDeviceID,
+        posMonitor,
+        echatsOption,
+        posList,
+        chartsColumns,
+        xAxisPropType,
+      };
+    },
+  });
 </script>
 <style lang="less">
-.bundle-modal {
-  .zxm-modal {
-    top: 30px !important;
+  .bundle-modal {
+    .zxm-modal {
+      top: 30px !important;
+    }
   }
-}
 </style>
 
 <style lang="less" scoped>
-.fiber-modal {
-  width: 100%;
-  height: 650px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-
-  .modal-left {
-    width: 200px;
-    height: 100%;
-    overflow-y: auto;
-    background: #ffffff11;
-    padding: 5px;
-    border-radius: 5px;
-
-    .active-device-title {
-      color: aqua;
-    }
+  .fiber-modal {
+    width: 100%;
+    height: 650px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+
+    .modal-left {
+      width: 200px;
+      height: 100%;
+      overflow-y: auto;
+      background: #ffffff11;
+      padding: 5px;
+      border-radius: 5px;
+
+      .active-device-title {
+        color: aqua;
+      }
 
-    .link-item {
-      position: relative;
-      cursor: pointer;
-      line-height: 30px;
-      padding-left: 30px;
+      .link-item {
+        position: relative;
+        cursor: pointer;
+        line-height: 30px;
+        padding-left: 30px;
 
-      span:hover {
-        color: #89ffff;
-      }
+        span:hover {
+          color: #89ffff;
+        }
 
-      &::after {
-        content: '';
-        position: absolute;
-        display: block;
-        width: 8px;
-        height: 8px;
-        top: 12px;
-        left: 10px;
-        transform: rotateZ(45deg) skew(10deg, 10deg);
-        background: #45d3fd;
+        &::after {
+          content: '';
+          position: absolute;
+          display: block;
+          width: 8px;
+          height: 8px;
+          top: 12px;
+          left: 10px;
+          transform: rotateZ(45deg) skew(10deg, 10deg);
+          background: #45d3fd;
+        }
       }
     }
-  }
 
-  .modal-right {
-    width: calc(100% - 220px);
-    overflow-y: auto;
-
-    .base-title {
-      line-height: 32px;
-      position: relative;
-      padding-left: 20px;
-
-      &::after {
-        content: '';
-        position: absolute;
-        display: block;
-        width: 4px;
-        height: 12px;
-        top: 4px;
-        left: 10px;
-        background: #45d3fd;
-        border-radius: 4px;
-      }
-    }
+    .modal-right {
+      width: calc(100% - 220px);
+      overflow-y: auto;
 
-    .right-top {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-      flex-wrap: wrap;
-      margin-bottom: 10px;
+      .base-title {
+        line-height: 32px;
+        position: relative;
+        padding-left: 20px;
+
+        &::after {
+          content: '';
+          position: absolute;
+          display: block;
+          width: 4px;
+          height: 12px;
+          top: 4px;
+          left: 10px;
+          background: #45d3fd;
+          border-radius: 4px;
+        }
+      }
 
-      .top-item {
-        width: 220px;
-        height: 100px;
+      .right-top {
         display: flex;
         flex-direction: row;
-        justify-content: center;
-        border: 1px solid rgba(25, 237, 255, 0.4);
-        box-shadow: inset 0 0 10px rgba(0, 197, 255, 0.6);
-        background: rgba(0, 0, 0, 0.06666666666666667);
-        padding-top: 20px;
-        margin: 10px 0;
-
-        .icon {
-          margin-right: 10px;
-          margin-top: 5px;
-          color: #fdb146;
-        }
+        justify-content: space-between;
+        flex-wrap: wrap;
+        margin-bottom: 10px;
 
-        .item-container {
-          width: 110px;
+        .top-item {
+          width: 220px;
+          height: 100px;
           display: flex;
-          flex-direction: column;
+          flex-direction: row;
           justify-content: center;
-
-          div {
-            text-align: center;
+          border: 1px solid rgba(25, 237, 255, 0.4);
+          box-shadow: inset 0 0 10px rgba(0, 197, 255, 0.6);
+          background: rgba(0, 0, 0, 0.06666666666666667);
+          padding-top: 20px;
+          margin: 10px 0;
+
+          .icon {
+            margin-right: 10px;
+            margin-top: 5px;
+            color: #fdb146;
           }
 
-          .title {
-            font-size: 18px;
-          }
+          .item-container {
+            width: 110px;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
 
-          .value {
-            text-shadow: 0 0 25px #00fbfe;
-            background: linear-gradient(0deg, #45d3fd, #45d3fd, #61ddb1, #61ddb1);
-            font-style: normal;
-            background-size: cover;
-            font-family: electronicFont;
-            font-size: 30px;
-            -webkit-background-clip: text;
-            background-clip: text;
-            -webkit-text-fill-color: transparent;
-            position: relative;
-            top: -8px;
-
-            span {
-              font-family: Arial, Helvetica, sans-serif;
+            div {
+              text-align: center;
+            }
+
+            .title {
               font-size: 18px;
-              color: aliceblue;
+            }
+
+            .value {
+              text-shadow: 0 0 25px #00fbfe;
+              background: linear-gradient(0deg, #45d3fd, #45d3fd, #61ddb1, #61ddb1);
+              font-style: normal;
+              background-size: cover;
+              font-family: electronicFont;
+              font-size: 30px;
+              -webkit-background-clip: text;
+              background-clip: text;
+              -webkit-text-fill-color: transparent;
+              position: relative;
+              top: -8px;
+
+              span {
+                font-family: Arial, Helvetica, sans-serif;
+                font-size: 18px;
+                color: aliceblue;
+              }
             }
           }
         }
-      }
 
-      .warning-box {
-        padding-top: 0px;
+        .warning-box {
+          padding-top: 0px;
 
-        .icon {
-          margin-top: 20px;
+          .icon {
+            margin-top: 20px;
 
-          :deep(.icon-style) {
-            width: auto;
-            color: #fdb146;
+            :deep(.icon-style) {
+              width: auto;
+              color: #fdb146;
+            }
           }
-        }
 
-        .warning-value {
-          font-size: 18px;
-          color: #61ddb1;
-        }
+          .warning-value {
+            font-size: 18px;
+            color: #61ddb1;
+          }
 
-        .value1 {
-          font-size: 18px;
-          color: rgb(145, 230, 9) !important;
-        }
+          .value1 {
+            font-size: 18px;
+            color: rgb(145, 230, 9) !important;
+          }
 
-        .value2 {
-          font-size: 18px;
-          // color: rgb(0, 242, 255) !important;
-          color: #ffff35 !important;
-        }
+          .value2 {
+            font-size: 18px;
+            // color: rgb(0, 242, 255) !important;
+            color: #ffff35 !important;
+          }
 
-        .value3 {
-          font-size: 18px;
-          // color: #ffff35 !important;
-          color: #ff0000 !important;
-        }
+          .value3 {
+            font-size: 18px;
+            // color: #ffff35 !important;
+            color: #ff0000 !important;
+          }
 
-        .value4 {
-          font-size: 18px;
-          color: #ffbe69 !important;
-        }
+          .value4 {
+            font-size: 18px;
+            color: #ffbe69 !important;
+          }
 
-        .value5 {
-          font-size: 18px;
-          color: #ff6f00 !important;
-        }
+          .value5 {
+            font-size: 18px;
+            color: #ff6f00 !important;
+          }
 
-        .value6 {
-          font-size: 18px;
-          color: #ff0000 !important;
+          .value6 {
+            font-size: 18px;
+            color: #ff0000 !important;
+          }
         }
       }
-    }
 
-    .right-center {
-      margin-top: 20px;
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
+      .right-center {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
 
-      .table-box {
-        position: relative;
-        width: 500px;
-        height: 250px;
-      }
+        .table-box {
+          position: relative;
+          width: 500px;
+          height: 250px;
+        }
 
-      .warning-box {
-        width: calc(100% - 520px);
+        .warning-box {
+          width: calc(100% - 520px);
 
-        .warning-container {
-          width: 100%;
-          height: convert;
-          background: #009acd00;
+          .warning-container {
+            width: 100%;
+            height: convert;
+            background: #009acd00;
 
-          :deep(.dv-scroll-board) {
-            .row-item {
-              height: 40px !important;
-              line-height: 40px !important;
-            }
+            :deep(.dv-scroll-board) {
+              .row-item {
+                height: 40px !important;
+                line-height: 40px !important;
+              }
 
-            .header-item {
-              border-top: 1px solid #91e9fe !important;
-              border-bottom: 1px solid #91e9fe !important;
+              .header-item {
+                border-top: 1px solid #91e9fe !important;
+                border-bottom: 1px solid #91e9fe !important;
+              }
             }
           }
         }
       }
-    }
 
-    .right-bottom {
-      margin-top: 20px;
+      .right-bottom {
+        margin-top: 20px;
 
-      .echarts-box {
-        width: 100%;
-        height: 320px;
-        position: relative;
-        display: flex;
-        justify-content: space-between;
+        .echarts-box {
+          width: 100%;
+          height: 320px;
+          position: relative;
+          display: flex;
+          justify-content: space-between;
 
-        .echarts-line {
-          width: calc(100% + 80px);
-          position: absolute;
+          .echarts-line {
+            width: calc(100% + 80px);
+            position: absolute;
+          }
         }
       }
     }
   }
-}
 
-:deep(.zxm-table-body) {
-  border: 1px solid rgba(57, 232, 255, 0.2) !important;
+  :deep(.zxm-table-body) {
+    border: 1px solid rgba(57, 232, 255, 0.2) !important;
 
-  .zxm-table-tbody>tr>td {
-    border: none !important;
+    .zxm-table-tbody > tr > td {
+      border: none !important;
+    }
   }
-}
 
-:deep(.zxm-table-cell) {
-  border-right: none !important;
-}
+  :deep(.zxm-table-cell) {
+    border-right: none !important;
+  }
 </style>

src/views/vent/monitorManager/deviceMonitor/components/device/modal/firemonNormal.modal.vue → src/views/vent/monitorManager/deviceMonitor/components/device/modal/firemon.modal.vue

@@ -135,7 +135,7 @@
         },
       };
 
-      const chartsColumnArr = getTableHeaderColumns('firemon_normal_chart');
+      const chartsColumnArr = getTableHeaderColumns('firemon_chart');
       const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
       const xAxisPropType = ref('ttime');
       const [register, { setModalProps, closeModal }] = useModalInner();

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

@@ -39,7 +39,6 @@
   watch(
     () => route.fullPath,
     () => {
-      debugger;
       const { type, deviceType, deviceid } = route.query;
       if (type === 'tunMonitor') {
         pageResult.value = {};
@@ -66,7 +65,6 @@
   );
 
   onMounted(() => {
-    debugger;
     const { type, deviceType, topage } = route.query;
     deviceKind.value = deviceType as string;
     if (!topage) {

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.three.ts

@@ -263,6 +263,7 @@ export const addCssText = () => {
       group.add(fanLocalCSS3D);
     }
   }
+
   if (!group.getObjectByName('text2')) {
     const element = document.getElementById('outBox') as HTMLElement;
     if (element) {
@@ -309,6 +310,17 @@ export const addCssText = () => {
       group.add(fanLocalCSS3D);
     }
   }
+  if (!group.getObjectByName('text6')) {
+    const element = document.getElementById('inputBox1') as HTMLElement;
+    if (element) {
+      const fanLocalCSS3D = new CSS3DObject(element);
+      fanLocalCSS3D.name = 'text6';
+      fanLocalCSS3D.scale.set(0.04, 0.04, 0.04);
+      fanLocalCSS3D.rotation.y = -Math.PI / 2;
+      fanLocalCSS3D.position.set(-84.23, 4.97, -18.92);
+      group.add(fanLocalCSS3D);
+    }
+  }
 };
 
 // export const playSmoke = (controlType, deviceType, frequency, state) => {

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

@@ -24,8 +24,16 @@
           </div>
         </div>
         <div class="elementTag" id="outBox">
-          <div class="elementContent elementContent-r" v-if="selectData.windQuantity2 || selectData.gas1 || selectData.ductOutletAirVolume_merge">
-            <p v-if="selectData.windQuantity2 || selectData.m3 || selectData.ductOutletAirVolume_merge"
+          <div
+            class="elementContent elementContent-r"
+            v-if="
+              selectData.windQuantity2 ||
+              selectData.gas1 ||
+              (selectData.windOutSpeed1 && selectData.windOutSpeed_merge) ||
+              selectData.ductOutletAirVolume_merge
+            "
+          >
+            <p v-if="selectData.windQuantity2 || selectData.m3 || selectData.ductOutletAirVolume_merge || selectData.windOutSpeed_merge"
               >迎头供风量：<span class="value">{{
                 selectData.windQuantity2
                   ? selectData.windQuantity2
@@ -40,6 +48,12 @@
             <p v-if="selectData.gas1"
               >迎头瓦斯浓度：<span class="value">{{ selectData.gas1 ? selectData.gas1 : '-' }}</span> <span class="unit"> %</span></p
             >
+            <p v-if="selectData.windOutSpeed1 || selectData.windOutSpeed_merge"
+              >风筒出口风速<span class="value">{{
+                selectData.windOutSpeed1 ? selectData.windOutSpeed1 : selectData.windOutSpeed_merge ? selectData.windOutSpeed_merge : '-'
+              }}</span>
+              <span class="unit"> %</span></p
+            >
           </div>
         </div>
         <div class="elementTag" id="returnBox">
@@ -74,6 +88,16 @@
             >
           </div>
         </div>
+        <div class="elementTag" id="inputBox1">
+          <div class="elementContent" v-if="selectData.windInputSpeed1 || selectData.windInputSpeed_merge">
+            <p v-if="selectData.windInputSpeed1 || selectData.windInputSpeed_merge"
+              >风筒入口风速：<span class="value">{{
+                selectData.windInputSpeed1 ? selectData.windInputSpeed1 : selectData.windInputSpeed_merge ? selectData.windInputSpeed_merge : '-'
+              }}</span>
+              <span class="unit"> m/s</span></p
+            >
+          </div>
+        </div>
       </div>
     </div>
   </div>

src/views/vent/monitorManager/mainFanMonitor/mainWind.xj.threejs.ts

@@ -682,7 +682,7 @@ class mainXjWindRect {
     this.group = new THREE.Group();
     debugger;
     return new Promise(async (resolve) => {
-      this.model.setGLTFModel(['ztfj-xj']).then(async (gltf) => {
+      this.model.setGLTFModel('ztfj-xj').then(async (gltf) => {
         const ztfjModal = gltf[0].children[0];
         ztfjModal.name = 'ztfj';
         ztfjModal.position.set(4.64, 4.11, 1.52);

src/views/vent/monitorManager/nitrogen/components/nitrogenHome.vue

@@ -88,8 +88,8 @@
         ><p style="padding: 0 5px"></p> ) -->
       </div>
     </div>
-    <div class="total-data">
-      <div class="vent-flex-row item-box">
+    <div class="total-data" v-if="totalData.length > 0">
+      <div class="vent-flex-row">
         <div class="item" v-for="(data, index) in totalData" :key="index"
           >{{ data.title + '(' + data.unit + ')' }}：<span class="val">{{
             monitorData[data.code] ? formatNum(monitorData[data.code]) : '-'
@@ -97,6 +97,14 @@
         >
       </div>
     </div>
+    <div class="total-data" v-if="totalData1.length > 0">
+      <div class="vent-flex-row item-box">
+        <div class="item" v-for="(data, index) in totalData1[monitorDataGroupFlag - 1]" :key="index"
+          ><div>{{ data.title + '(' + data.unit + ')' }}：</div
+          ><div class="val">{{ monitorData[data.code] ? formatNum(monitorData[data.code]) : '-' }}</div>
+        </div>
+      </div>
+    </div>
     <div class="nitrogen-container">
       <div v-if="monitorData['netStatus'] == 0" class="device-state">网络断开</div>
       <div class="top-box">
@@ -178,7 +186,7 @@
   import { formatNum } from '/@/utils/ventutil';
   import { useCamera } from '/@/hooks/system/useCamera';
 
-  const { monitorDataGroupArr, preFanMonitorData, preMonitorList, cqgMonitorList, prefix, getSysState, totalData, btnSet, controlSet } =
+  const { monitorDataGroupArr, preFanMonitorData, preMonitorList, cqgMonitorList, prefix, getSysState, totalData, totalData1, btnSet, controlSet } =
     await getMonitorData();
   const loading = ref(true);
   const monitorDataGroupFlag = ref(1);
@@ -494,9 +502,11 @@
         width: 600px;
         flex-wrap: wrap;
         .item {
-          width: 250px;
+          // width: 250px;
           margin-left: 30px;
           .val {
+            display: inline-box;
+            width: 150px;
             color: #00d8ff;
           }
         }

src/views/vent/monitorManager/nitrogen/nitrogen.data.1.ts

@@ -59,8 +59,8 @@ export const bottomBtnList = ref([
 ]);
 
 export async function getMonitorData() {
-  // const { sysOrgCode } = useGlobSetting();
-  const sysOrgCode = 'sdmtjtbetmk';
+  const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtbetmk';
   switch (sysOrgCode) {
     case 'yjmdsankuang': // 窑街三矿
       return await import('./nitrogen.dataYJ');

src/views/vent/monitorManager/nitrogen/nitrogen.dataBet.ts

@@ -72,27 +72,32 @@ export const preFanMonitorData = [
     unit: 'h',
   },
 ];
-export const totalData = [
-  {
-    title: '压1出风流量',
-    code: 'PreSys_TotalOutPipeFlow1',
-    unit: 'm³/min',
-  },
-  {
-    title: '压2出风流量',
-    code: 'PreSys_TotalOutPipeFlow2',
-    unit: 'm³/min',
-  },
-  {
-    title: '压1出风压力',
-    code: 'PreSys_TotalOutPipePre1',
-    unit: 'bar',
-  },
-  {
-    title: '压2出风压力',
-    code: 'PreSys_TotalOutPipePre2',
-    unit: 'bar',
-  },
+export const totalData = [];
+export const totalData1 = [
+  [
+    {
+      title: '压风系统1出风流量',
+      code: 'PreSys_TotalOutPipeFlow1',
+      unit: 'm³/min',
+    },
+    {
+      title: '压风系统1出风压力',
+      code: 'PreSys_TotalOutPipePre1',
+      unit: 'bar',
+    },
+  ],
+  [
+    {
+      title: '压风系统2出风流量',
+      code: 'PreSys_TotalOutPipeFlow2',
+      unit: 'm³/min',
+    },
+    {
+      title: '压风系统2出风压力',
+      code: 'PreSys_TotalOutPipePre2',
+      unit: 'bar',
+    },
+  ],
 ];
 export type State = {
   isRun: boolean;

src/views/vent/performance/comment/CADModal.vue

@@ -35,7 +35,7 @@
   import { onMounted } from 'vue';
   import CADViewer from '/@/views/vent/performance/fileDetail/commen/CADViewer.vue';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { AUTO_LOGIN_URL_QUERY, SKIP_SSO_URL_QUERY } from '/@/router/constant';
+  import { MOCK_LOGIN_URL_QUERY, SKIP_SSO_URL_QUERY } from '/@/router/constant';
 
   const { sysOrgCode } = useGlobSetting();
   // 不是布尔台的使用 mxcad 模式，是布尔台的使用 iframe 模式以避免“法律风险”
@@ -60,7 +60,7 @@
       // 当以 iframe 模式运行时，origin 在生产模式下需要指向本项目公司端所部署的地址
       const origin = import.meta.env.PROD ? 'http://10.248.235.101:8092' : window.location.origin;
       // const origin = import.meta.env.DEV ? 'http://182.92.126.35:8092' : window.location.origin;
-      iframesrc.value = `${origin}/fileManager/cad-viewer?${SKIP_SSO_URL_QUERY.key}=${SKIP_SSO_URL_QUERY.val}&${AUTO_LOGIN_URL_QUERY.key}=${AUTO_LOGIN_URL_QUERY.val}&id=${record.id}&filename=${record.fileName}`;
+      iframesrc.value = `${origin}/fileManager/cad-viewer?${SKIP_SSO_URL_QUERY.key}=${SKIP_SSO_URL_QUERY.val}&${MOCK_LOGIN_URL_QUERY.key}=${MOCK_LOGIN_URL_QUERY.val}&id=${record.id}&filename=${record.fileName}`;
     }
   });