From ffd514815ed3a0c008546fd7fb9945bff3603bd5 Mon Sep 17 00:00:00 2001
From: Soutfairy <1373664265@qq.com>
Date: Mon, 25 Nov 2024 12:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/en.ts                           |  1 +
 src/i18n/lang/zh-cn.ts                        |  1 +
 src/i18n/lang/zh-tw.ts                        |  1 +
 src/router/route.ts                           | 78 ++++++++++++-------
 .../{system => usermanage}/role/dialog.vue    |  0
 .../{system => usermanage}/role/index.vue     |  2 +-
 .../{system => usermanage}/user/dialog.vue    |  0
 .../{system => usermanage}/user/index.vue     |  2 +-
 8 files changed, 53 insertions(+), 32 deletions(-)
 rename src/views/{system => usermanage}/role/dialog.vue (100%)
 rename src/views/{system => usermanage}/role/index.vue (97%)
 rename src/views/{system => usermanage}/user/dialog.vue (100%)
 rename src/views/{system => usermanage}/user/index.vue (98%)

diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index a2ed5ef..293a6af 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -8,6 +8,7 @@ export default {
 		systemRole: 'systemRole',
 		systemUser: 'systemUser',
 		systemDept: 'systemDept',
+		UserManage: 'UserManage',
 		systemDic: 'systemDic',
 		article: 'article',
 		message: 'message',
diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts
index 93f8b2a..b23379e 100644
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@@ -7,6 +7,7 @@ export default {
 		systemMenu: '菜单管理',
 		systemRole: '角色管理',
 		systemUser: '用户管理',
+		UserManage: '用户管理',
 		systemDept: '部门管理',
 		systemDic: '字典管理',
 		article: '文章管理',
diff --git a/src/i18n/lang/zh-tw.ts b/src/i18n/lang/zh-tw.ts
index 9052f7a..587f020 100644
--- a/src/i18n/lang/zh-tw.ts
+++ b/src/i18n/lang/zh-tw.ts
@@ -7,6 +7,7 @@ export default {
 		systemMenu: '選單管理',
 		systemRole: '角色管理',
 		systemUser: '用戶管理',
+		UserManage: '用戶管理',
 		systemDept: '部門管理',
 		systemDic: '字典管理',
 		article: '文章管理',
diff --git a/src/router/route.ts b/src/router/route.ts
index f49449c..6a9195c 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -77,6 +77,54 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					icon: 'iconfont icon-shouye',
 				},
 			},
+			{
+				path: '/usermanage',
+				name: 'UserManage',
+				component: () => import('/@/layout/routerView/parent.vue'),
+				redirect: '/usermanage',
+				meta: {
+					title: 'message.router.UserManage',
+					isLink: '',
+					isHide: false,
+					isKeepAlive: true,
+					isAffix: false,
+					isIframe: false,
+					roles: ['admin'],
+					icon: 'iconfont icon-gerenzhongxin',
+				},
+				children: [
+					{
+						path: '/usermanage/role',
+						name: 'systemRole',
+						component: () => import('/@/views/usermanage/role/index.vue'),
+						meta: {
+							title: 'message.router.systemRole',
+							isLink: '',
+							isHide: false,
+							isKeepAlive: true,
+							isAffix: false,
+							isIframe: false,
+							roles: ['admin'],
+							icon: 'ele-ColdDrink',
+						},
+					},
+					{
+						path: '/usermanage/user',
+						name: 'systemUser',
+						component: () => import('/@/views/usermanage/user/index.vue'),
+						meta: {
+							title: 'message.router.systemUser',
+							isLink: '',
+							isHide: false,
+							isKeepAlive: true,
+							isAffix: false,
+							isIframe: false,
+							roles: ['admin'],
+							icon: 'iconfont icon-icon-',
+						},
+					},
+				],
+			},
 			{
 				path: '/system',
 				name: 'system',
@@ -108,36 +156,6 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							icon: 'iconfont icon-caidan',
 						},
 					},
-					{
-						path: '/system/role',
-						name: 'systemRole',
-						component: () => import('/@/views/system/role/index.vue'),
-						meta: {
-							title: 'message.router.systemRole',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin'],
-							icon: 'ele-ColdDrink',
-						},
-					},
-					{
-						path: '/system/user',
-						name: 'systemUser',
-						component: () => import('/@/views/system/user/index.vue'),
-						meta: {
-							title: 'message.router.systemUser',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin'],
-							icon: 'iconfont icon-icon-',
-						},
-					},
 					{
 						path: '/system/dept',
 						name: 'systemDept',
diff --git a/src/views/system/role/dialog.vue b/src/views/usermanage/role/dialog.vue
similarity index 100%
rename from src/views/system/role/dialog.vue
rename to src/views/usermanage/role/dialog.vue
diff --git a/src/views/system/role/index.vue b/src/views/usermanage/role/index.vue
similarity index 97%
rename from src/views/system/role/index.vue
rename to src/views/usermanage/role/index.vue
index 730d282..7f303fe 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/usermanage/role/index.vue
@@ -61,7 +61,7 @@ import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 
 // 引入组件
-const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialog.vue'));
+const RoleDialog = defineAsyncComponent(() => import('/@/views/usermanage/role/dialog.vue'));
 
 // 定义变量内容
 const roleDialogRef = ref();
diff --git a/src/views/system/user/dialog.vue b/src/views/usermanage/user/dialog.vue
similarity index 100%
rename from src/views/system/user/dialog.vue
rename to src/views/usermanage/user/dialog.vue
diff --git a/src/views/system/user/index.vue b/src/views/usermanage/user/index.vue
similarity index 98%
rename from src/views/system/user/index.vue
rename to src/views/usermanage/user/index.vue
index c7b1f85..91dbded 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/usermanage/user/index.vue
@@ -64,7 +64,7 @@ import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 
 // 引入组件
-const UserDialog = defineAsyncComponent(() => import('/@/views/system/user/dialog.vue'));
+const UserDialog = defineAsyncComponent(() => import('/@/views/usermanage/user/dialog.vue'));
 
 // 定义变量内容
 const userDialogRef = ref();