From 51da4ca35854d45ca89aa8cfdfdfc7729f708a72 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 17 二月 2025 10:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev-gly
---
src/router/index.js | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index cc05e07..91a52f6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -93,12 +93,6 @@
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
export const dynamicRoutes = [
{
- // 鍘熸潗鏂欐姤妫�
- path: '/rawMaterialInspection',
- component: Layout,
- hidden: true,
- },
- {
// 鍘熸潗鏂欎笅鍗�
path: '/materialOrder',
component: Layout,
@@ -135,14 +129,14 @@
component: Layout,
hidden: true,
permissions: ['system:role:edit'],
- // children: [
- // {
- // path: 'user/:roleId(\\d+)',
- // component: () => import('@/views/system/role/authUser'),
- // name: 'AuthUser',
- // meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role' }
- // }
- // ]
+ children: [
+ {
+ path: 'user/:roleId(\\d+)',
+ component: () => import('@/views/system/role/authUser'),
+ name: 'AuthUser',
+ meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role' }
+ }
+ ]
},
{
// 鏁版嵁瀛楀吀
@@ -150,14 +144,21 @@
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
- // children: [
- // {
- // path: 'index/:dictId(\\d+)',
- // component: () => import('@/views/system/dict/data'),
- // name: 'Data',
- // meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict' }
- // }
- // ]
+ children: [
+ {
+ path: 'index/:dictId(\\d+)',
+ component: () => import('@/views/system/dict/data'),
+ name: 'Data',
+ meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict' }
+ }
+ ]
+ },
+ {
+ // 鏁版嵁瀛楀吀
+ path: '/customer',
+ component: Layout,
+ hidden: true,
+ permissions: ['customer:edit'],
},
{
path: '/monitor/job-log',
--
Gitblit v1.9.3