浏览代码

[Mod 0000] 优化设备监测组件

hongrunxia 4 天之前
父节点
当前提交
1bda50555f

+ 1 - 1
.env.development

@@ -31,5 +31,5 @@ VITE_GLOB_API_URL_PREFIX=
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"],["micro-vent-doc", "//localhost:5173/", "micro-vent-doc"],["micro-need-air", "//182.92.126.35:8093/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

+ 11 - 0
src/router/routes/basic.ts

@@ -119,6 +119,17 @@ export const QIANKUN_ROUTE: AppRouteRecordRaw = {
       },
       },
       ver: '1',
       ver: '1',
     },
     },
+    {
+      path: '/micro-vent-doc/:path(.*)*',
+      name: 'micro-vent-doc',
+      component: () => import('/@/components/vent/micro/ventDoc.vue'),
+      meta: {
+        title: '内业管理系统',
+        hideBreadcrumb: true,
+        hideMenu: true,
+      },
+      ver: '1',
+    },
   ],
   ],
   ver: '1',
   ver: '1',
 };
 };

+ 1 - 1
src/store/constant.ts

@@ -1,2 +1,2 @@
 export const MOCK_LOGIN_UESRNAME = 'autoAdmin';
 export const MOCK_LOGIN_UESRNAME = 'autoAdmin';
-export const MOCK_LOGIN_PASSWORD = 'autoAdmin123';
+export const MOCK_LOGIN_PASSWORD = 'TOdspLGTgSCYCmlXsE1ynw=='; //autoAdmin123;

+ 4 - 4
src/views/vent/monitorManager/safetyMonitor/index.vue

@@ -6,7 +6,7 @@
           <GroupMonitorTable :dataSource="dataSource" :columnsType="`${deviceType}_monitor`" />
           <GroupMonitorTable :dataSource="dataSource" :columnsType="`${deviceType}_monitor`" />
         </template>
         </template>
         <template v-else-if="activeKey == '1' && deviceType">
         <template v-else-if="activeKey == '1' && deviceType">
-          <template v-if="hasPermission('btn:noGb')">
+          <template v-if="hasPermission('btn:noGb') && deviceType.startsWith('safetymonitor')">
             <MonitorTable
             <MonitorTable
               ref="monitorTable"
               ref="monitorTable"
               :columnsType="`${deviceType}_monitor`"
               :columnsType="`${deviceType}_monitor`"
@@ -178,7 +178,7 @@
         </div>
         </div>
       </a-tab-pane>
       </a-tab-pane>
     </a-tabs>
     </a-tabs>
-    <div class="right-btn-group">
+    <div class="right-btn-group" v-if="deviceType.startsWith('safetymonitor')">
       <div class="update-btn">
       <div class="update-btn">
         <span>同步分站:</span>
         <span>同步分站:</span>
         <a-select
         <a-select
@@ -192,8 +192,8 @@
         <div class="btn btn1" @click="updateSubstation">确定</div>
         <div class="btn btn1" @click="updateSubstation">确定</div>
       </div>
       </div>
       <div class="export-btn"><div class="btn btn1" @click="exportData" v-if="!hasPermission('safety:hideWarning')">一键导出</div></div>
       <div class="export-btn"><div class="btn btn1" @click="exportData" v-if="!hasPermission('safety:hideWarning')">一键导出</div></div>
-      <div class="export-btn m-l-20px"
-       v-if="!hasPermission('safety:hideWarning')" ><div class="btn btn2" @click="goSystem"><send-outlined />安全监控系统</div></div
+      <div class="export-btn m-l-20px" v-if="!hasPermission('safety:hideWarning')"
+        ><div class="btn btn2" @click="goSystem"><send-outlined />安全监控系统</div></div
       >
       >
     </div>
     </div>
   </div>
   </div>

+ 1 - 1
src/views/vent/monitorManager/safetyMonitor/safety.data.ts

@@ -223,4 +223,4 @@ export const chartsColumnsreal = [
     dataIndex: 'sourcePressure',
     dataIndex: 'sourcePressure',
   },
   },
 ];
 ];
-export const isHaveNoAction = ['safetymonitor', 'wasichoufang'];
+export const isHaveNoAction = ['safetymonitor', 'wasichoufang', 'atomizing'];