3 Коміти d3b57564d6 ... 1b696b9aeb

Автор SHA1 Опис Дата
  wangkun 1b696b9aeb bugfix:1.修改一些菜单,新增趋势分析与可视化按钮跳转态势感知页面 2 днів тому
  wangkun 60c516db8d Merge branch 'master' of http://gogs.server.yumawk.com/wangkun/supervisionHtml 2 днів тому
  wangkun 66f5e8f951 feat:1.test 2 днів тому

+ 1 - 0
.env.development

@@ -5,6 +5,7 @@ VITE_BASE_API = /api
 VITE_FILE_API = /api
 VITE_BASE_PATH = http://10.10.10.30
 VITE_POSITION = close
+
 VITE_EDITOR = vscode
 # IAM 后端地址,本地开发连 10.10.10.66
 VITE_SERVER_PATH = http://10.10.10.88:9055

+ 14 - 0
src/view/layout/aside/index.vue

@@ -106,7 +106,21 @@ onUnmounted(() => {
   emitter.off('collapse')
 })
 
+// 需要整页跳转(不在右侧框架内打开)的菜单:key 为菜单管理中配置的“路由Path”
+const standaloneMenuMap = {
+  SATrend: { name: 'SA' }
+}
+
 const selectMenuItem = (index, _, ele, aaa) => {
+  const menuPath = (routerStore.routeMap[index]?.path || '').replace(/^\/+/, '')
+  const standaloneTarget = standaloneMenuMap[menuPath] || standaloneMenuMap[index]
+  if (standaloneTarget) {
+    if (standaloneTarget.name !== route.name) {
+      router.push(standaloneTarget)
+    }
+    return
+  }
+
   const query = {}
   const params = {}
   routerStore.routeMap[index]?.parameters &&

+ 2 - 2
src/view/sysApplication/deviceManager/index.vue

@@ -870,7 +870,7 @@ const formatDateTime = value => value ? String(value).replace('T', ' ') : ''
 
 const getTableData = async () => {
   try {
-    const res = await serviceList({ pageNum: page.value, pageSize: pageSize.value, searchCount: true, ...searchInfo.value })
+    const res = await serviceList({ pageNum: page.value, pageSize: pageSize.value,type:[3,7,8], searchCount: true, ...searchInfo.value })
     tableData.value = res.data?.list || []
     total.value = res.data?.total || 0
   } catch (err) {
@@ -916,4 +916,4 @@ getTableData()
 .api-dialog-actions {
   margin-bottom: 12px;
 }
-</style>
+</style>

+ 2 - 2
src/view/sysApplication/serviceManager/index.vue

@@ -873,7 +873,7 @@ const formatDateTime = value => value ? String(value).replace('T', ' ') : ''
 
 const getTableData = async () => {
   try {
-    const res = await serviceList({ pageNum: page.value, pageSize: pageSize.value, searchCount: true, ...searchInfo.value })
+    const res = await serviceList({ pageNum: page.value, pageSize: pageSize.value,type:[1,2,4,5,6], searchCount: true, ...searchInfo.value })
     tableData.value = res.data?.list || []
     total.value = res.data?.total || 0
   } catch (err) {
@@ -919,4 +919,4 @@ getTableData()
 .api-dialog-actions {
   margin-bottom: 12px;
 }
-</style>
+</style>