瓦斯修改、注氮添加监测字段

src/qiankun/index.ts

@@ -22,18 +22,23 @@ function filterApps() {
   return apps;
 }
 
-const mountMicroApp = path => {
+const mountMicroApp = (path, toPath?) => {
   const microApps = filterApps()
   const app = microApps.find(item => path.startsWith(item['activeRule']))
+  debugger
   if (app) {
     const instance = activeApps[app['activeRule']]
     if (instance) {
       instance.update()
     } else {
+      if(toPath){
+        app['props']['publicPath'] = toPath
+      }
       activeApps[app['activeRule']] = loadMicroApp(app) // 手动加载子应用
     }
   }
 }
+
 // 卸载app的方法
 const unmountMicroApps = async multipleApp => { 
   for (const key in activeApps) {

src/router/routes/index.ts

@@ -19,18 +19,20 @@ const routeModuleList: AppRouteModule[] = [];
 //   routeModuleList.push(...modList);
 // });
 
-await getRemoteSetting();
-const glob = useGlobSetting();
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, QIANKUN_ROUTE, ...routeModuleList];
-export const RootRoute: AppRouteRecordRaw = {
-  path: '/',
-  name: 'Root',
-  redirect: glob.homePath || PageEnum.BASE_HOME,
-  meta: {
-    title: 'Root',
-  },
-  ver: '1',
-};
+export const RootRoute: AppRouteRecordRaw = await(async() => {
+  await getRemoteSetting();
+  const glob = useGlobSetting();
+  return {
+    path: '/',
+    name: 'Root',
+    redirect: glob.homePath || PageEnum.BASE_HOME,
+    meta: {
+      title: 'Root',
+    },
+    ver: '1',
+  } as AppRouteRecordRaw;
+})();
 
 export const LoginRoute: AppRouteRecordRaw = {
   path: '/login',

src/store/modules/user.ts

@@ -186,7 +186,7 @@ export const useUserStore = defineStore({
         //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: 登录成功后缓存拖拽模块的接口前缀
-        goHome && (await router.replace((userInfo && userInfo.homePath) || PageEnum.BASE_HOME));
+        goHome && (await router.replace((userInfo && userInfo.homePath) || glob.homePath || PageEnum.BASE_HOME));
         // update-begin-author:sunjianlei date:20230306 for: 修复登录成功后，没有正确重定向的问题
         let redirect = router.currentRoute.value?.query?.redirect as string;
         // 判断是否有 redirect 重定向地址
@@ -310,13 +310,13 @@ export const useUserStore = defineStore({
 
       // }
       goLogin &&
-      (await router.push({
-        path: PageEnum.BASE_LOGIN,
-        query: {
-          // 传入当前的路由，登录成功后跳转到当前路由
-          redirect: router.currentRoute.value.fullPath,
-        },
-      }));
+        (await router.push({
+          path: PageEnum.BASE_LOGIN,
+          query: {
+            // 传入当前的路由，登录成功后跳转到当前路由
+            redirect: router.currentRoute.value.fullPath,
+          },
+        }));
       //update-end---author:wangshuai ---date:20230224  for：[QQYUN-3440]新建企业微信和钉钉配置表，通过租户模式隔离------------
     },
     /**

src/utils/env.ts

@@ -96,6 +96,7 @@ export function isProdMode(): boolean {
 }
 
 export function getHomePath(key): string {
+  debugger
   let homePath = '';
   switch (key) {
     case 'styleOne':

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

@@ -273,7 +273,7 @@ onMounted(() => {
     pageType.value = 'model3D'
   }
 
-  mountMicroApp('/micro-vent-3dModal')
+  mountMicroApp('/micro-vent-3dModal', '/modelchannel/model3D/home')
 
   getList();
   timer = Number(

src/views/vent/monitorManager/compressor/components/nitrogenHome1.vue

@@ -105,6 +105,35 @@
               </template>
             </ventBox1>
           </div>
+          <div class="item item-l">
+            <ventBox1 class="vent-margin-t-10">
+              <template #title>
+                <div>下风测详情</div>
+              </template>
+              <template #container>
+                <div class="monitor-box">
+                  <div class="state-item" v-for="(data, index) in downWindData" :key="index">
+                    <div class="item-col">
+                      <span class="state-title">{{ Object.values(data)[0] }} :</span>
+                      <span class="state-val">{{
+                        (monitorData.length > 0 && monitorData[0][Object.keys(data)[0]]) >= 0
+                        ? monitorData[0][Object.keys(data)[0]] ? parseFloat(monitorData[0][Object.keys(data)[0]]).toFixed(2) : '-'
+                        : '-'
+                      }}</span>
+                    </div>
+                    <div class="item-col" v-if="Object.keys(data)[1]">
+                      <span class="state-title">{{ Object.values(data)[1] }} :</span>
+                      <span class="state-val">{{
+                        (monitorData.length > 0 && monitorData[0][Object.keys(data)[1]]) >= 0
+                        ? monitorData[0][Object.keys(data)[1]] ? parseFloat(monitorData[0][Object.keys(data)[1]]).toFixed(2) : '-'
+                        : '-'
+                      }}</span>
+                    </div>
+                  </div>
+                </div>
+              </template>
+            </ventBox1>
+          </div>
         </div>
         <!-- 右边控制状态 -->
         <div class="lr-box right-box">
@@ -245,6 +274,16 @@ const deviceParameterData = [
     AirCompressor_LoadTime: '加载时间(h)',
   },
 ];
+const downWindData = [
+  {
+    o2Val: '下风侧氧气(%)',
+    temperature: '下风测温度(℃)',
+  },
+  {
+    fumes: '下风测烟雾(­%)',
+  },
+];
+
 const propTypeArr = ref([])
 const chartsColumns = ref([])
 watch(monitorDataGroupNum, () => {
@@ -324,8 +363,6 @@ async function getDataSource(systemID) {
   const res = await getDevice({ devicetype: 'sys', systemID, type: 'all' });
   console.log(res, 'res---------------');
 
- 
-
   if (res) {
     const result =res;
     if (!result || result.msgTxt.length < 1) return;

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

@@ -1,6 +1,6 @@
 <template>
   <div class="scene-box" >
-    <DeviceVue ref="DeviceRef" v-if="routerParam !== 'home'" :pageData="pageData" />
+    <DeviceVue ref="DeviceRef" v-if="routerParam !== 'home' && routerParam !== 'timesolution' && routerParam !== 'model3D'" :pageData="pageData" />
     <Network ref="NetworkRef" v-if="routerParam === 'timesolution'" :pageResult="pageResult" @changePageType="changePageType"/>
   </div>
   <div id="vent-model" style="width: 100%; height: 100%; position: absolute"></div>
@@ -45,7 +45,7 @@ watch(() => route.fullPath, (fullPath) => {
 })
 
 onMounted(() => {
-  mountMicroApp('/micro-vent-3dModal')
+  mountMicroApp('/micro-vent-3dModal', '/dashboard/analysis')
   
   // start()
   

src/views/vent/monitorManager/gasPumpMonitor/components/gasPumpHome.vue

@@ -357,7 +357,10 @@ onUnmounted(() => {
     display: flex;
     flex-wrap: wrap;
     width: 690px;
-    padding: 10px 12px;
+    padding: 10px 12px 10px 15px;
+    border: 1px solid #d3e1ff55;
+    background-color: #061c2a55;
+    box-shadow: 0 0 10px #c3c7cd;
     .gas-monitor-row{
       display: flex;
       flex-direction: row;
@@ -366,7 +369,7 @@ onUnmounted(() => {
       line-height: 32px;
       .title{
         width: 250px;
-        color: #b5e9ff;
+        color: #baeaff;
       }
       .value{
         width: 80px;

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

@@ -82,8 +82,8 @@ export const setModelType = (type) => {
         await animateCamera(
           oldCameraPosition,
           { x: 0.544, y: 0.3335, z: 0.29222 },
-          { x: 2.251260457704923, y: 2.249230134562109, z: 5.528231094367331 },
-          { x: 0.750543563879473, y: 0.33743172913019404, z: -0.10376343561678486 },
+          { x: -0.18283701989485915, y: 1.5585182112304712, z: 6.23432935897143 },
+          { x: -0.15497121991536436, y: 0.3354979232986092, z: -0.10561004136342216 },
           model,
           0.6
         );

src/views/vent/monitorManager/gateMonitor/gate.threejs.qd.ts

@@ -109,7 +109,7 @@ class Fm3 {
         y: 100,
       },
       {
-        text: `巷道径高度(m):`,
+        text: `径通行高度(m):`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -125,7 +125,7 @@ class Fm3 {
         y: 155,
       },
       {
-        text: `巷道径宽度(m): `,
+        text: `径通行宽度(m): `,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',

src/views/vent/monitorManager/gateMonitor/gate.threejs.yy.ts

@@ -109,7 +109,7 @@ class Fm1 {
         y: 100,
       },
       {
-        text: `巷道径高度(m):`,
+        text: `径通行高度(m):`,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',
@@ -125,7 +125,7 @@ class Fm1 {
         y: 155,
       },
       {
-        text: `巷道径宽度(m): `,
+        text: `径通行宽度(m): `,
         font: 'normal 30px Arial',
         color: '#00FF00',
         strokeStyle: '#007400',