From 5e3f6dc1253883bbdef87974cfa950171f87f9ec Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 13 八月 2025 17:55:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004
---
src/router/index.js | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index b67a1df..2ee88bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,6 +57,7 @@
component: () => import('@/views/error/401'),
hidden: true
},
+
{
path: '',
component: Layout,
@@ -70,6 +71,33 @@
}
]
},
+ // {
+ // path: '/equipment',
+ // component: Layout,
+ // redirect: '/equipment/iot-monitor',
+ // children: [
+ // {
+ // path: 'iot-monitor',
+ // component: () => import('@/views/equipmentManagement/iotMonitor/index.vue'),
+ // name: 'IoTMonitor',
+ // meta: { title: 'IoT鐩戞帶', icon: 'monitor', noCache: true }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/main/MobileChat',
+ // component: Layout,
+ // redirect: '',
+ // hidden: true,
+ // children: [
+ // {
+ // path: '',
+ // component: () => import('@/views/chatHome/chatHomeIndex/MobileChat'),
+ // name: 'MobileChat',
+ // meta: { title: 'AI瀵硅瘽', icon: 'dashboard', affix: true}
+ // }
+ // ]
+ // },
{
path: '/user',
component: Layout,
@@ -137,7 +165,7 @@
permissions: ['monitor:job:list'],
children: [
{
- path: 'index',
+ path: 'index/:jobId(\\d+)',
component: () => import('@/views/monitor/job/log'),
name: 'JobLog',
meta: { title: '璋冨害鏃ュ織', activeMenu: '/monitor/job' }
@@ -166,10 +194,9 @@
scrollBehavior(to, from, savedPosition) {
if (savedPosition) {
return savedPosition
- } else {
- return { top: 0 }
}
+ return { top: 0 }
},
-});
+})
-export default router;
+export default router
--
Gitblit v1.9.3