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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index a99b3a5..2ee88bd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,4 +1,5 @@ import { createWebHistory, createRouter } from 'vue-router' +/* Layout */ import Layout from '@/layout' /** @@ -12,6 +13,8 @@ * redirect: noRedirect // 褰撹缃� noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮 * name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓�瀹氳濉啓涓嶇劧浣跨敤<keep-alive>鏃朵細鍑虹幇鍚勭闂 * query: '{"id": 1, "name": "ry"}' // 璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁� + * roles: ['admin', 'common'] // 璁块棶璺敱鐨勮鑹叉潈闄� + * permissions: ['a:a:a', 'b:b:b'] // 璁块棶璺敱鐨勮彍鍗曟潈闄� * meta : { noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive> 缂撳瓨(榛樿 false) title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛� @@ -54,6 +57,7 @@ component: () => import('@/views/error/401'), hidden: true }, + { path: '', component: Layout, @@ -67,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, @@ -80,11 +111,16 @@ meta: { title: '涓汉涓績', icon: 'user' } } ] - }, + } +] + +// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇 +export const dynamicRoutes = [ { path: '/system/user-auth', component: Layout, hidden: true, + permissions: ['system:user:edit'], children: [ { path: 'role/:userId(\\d+)', @@ -98,6 +134,7 @@ path: '/system/role-auth', component: Layout, hidden: true, + permissions: ['system:role:edit'], children: [ { path: 'user/:roleId(\\d+)', @@ -111,6 +148,7 @@ path: '/system/dict-data', component: Layout, hidden: true, + permissions: ['system:dict:list'], children: [ { path: 'index/:dictId(\\d+)', @@ -124,9 +162,10 @@ path: '/monitor/job-log', component: Layout, hidden: true, + permissions: ['monitor:job:list'], children: [ { - path: 'index', + path: 'index/:jobId(\\d+)', component: () => import('@/views/monitor/job/log'), name: 'JobLog', meta: { title: '璋冨害鏃ュ織', activeMenu: '/monitor/job' } @@ -137,16 +176,17 @@ path: '/tool/gen-edit', component: Layout, hidden: true, + permissions: ['tool:gen:edit'], children: [ { - path: 'index', + path: 'index/:tableId(\\d+)', component: () => import('@/views/tool/gen/editTable'), name: 'GenEdit', meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen' } } ] } -]; +] const router = createRouter({ history: createWebHistory(), @@ -154,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