diff --git a/schoolNewsServ/.bin/mysql/sql/createTablePermission.sql b/schoolNewsServ/.bin/mysql/sql/createTablePermission.sql index ce584c3..f6397ef 100644 --- a/schoolNewsServ/.bin/mysql/sql/createTablePermission.sql +++ b/schoolNewsServ/.bin/mysql/sql/createTablePermission.sql @@ -99,10 +99,10 @@ CREATE TABLE `tb_sys_permission` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; INSERT INTO `tb_sys_permission` (id,permission_id, name, code, description) VALUES -('1','perm_user_manage', '用户管理', 'user:manage', '用户管理权限'), -('2','perm_role_manage', '角色管理', 'role:manage', '角色管理权限'), -('3','perm_dept_manage', '部门管理', 'dept:manage', '部门管理权限'), -('4','perm_permission_manage', '权限管理', 'permission:manage', '权限管理权限'); +('1','perm_system_dept_manage', '系统部门查看', 'system:dept:manage', '系统部门查看权限'), +('2','perm_system_menu_manage', '系统菜单查看', 'system:menu:manage', '系统菜单查看权限'), +('3','perm_system_permission_manage', '系统权限查看', 'system:permission:manage', '系统权限查看权限'), +('4','perm_system_role_manage', '系统角色查看', 'system:role:manage', '系统角色查看权限'); -- 角色-权限关联 DROP TABLE IF EXISTS `tb_sys_role_permission`; @@ -121,15 +121,10 @@ CREATE TABLE `tb_sys_role_permission` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; INSERT INTO `tb_sys_role_permission` (id, role_id, permission_id) VALUES -('1', 'admin', 'perm_user_manage'), -('2', 'admin', 'perm_role_manage'), -('3', 'admin', 'perm_dept_manage'), -('4', 'admin', 'perm_permission_manage'), -('5', 'admin', 'perm_dashboard'), -('6', 'admin', 'perm_user_manage'), -('7', 'admin', 'perm_role_manage'), -('8', 'admin', 'perm_dept_manage'), -('9', 'admin', 'perm_permission_manage'); +('1', 'admin', 'perm_system_dept_manage'), +('2', 'admin', 'perm_system_menu_manage'), +('3', 'admin', 'perm_system_permission_manage'), +('4', 'admin', 'perm_system_role_manage'); -- 菜单表 DROP TABLE IF EXISTS `tb_sys_menu`; @@ -155,17 +150,11 @@ CREATE TABLE `tb_sys_menu` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; -- Insert default menus -INSERT INTO `tb_sys_menu` (id,menu_id, name, parent_id, url, icon, order_num, type) VALUES -('1','menu_dashboard', '仪表盘', NULL, '/dashboard', 'dashboard', 1, 1), -('2','menu_user_mgmt', '用户管理', NULL, '/user-management', 'user', 2, 1), -('3','menu_role_mgmt', '角色管理', NULL, '/role-management', 'team', 3, 1), -('4','menu_dept_mgmt', '部门管理', NULL, '/dept-management', 'apartment', 4, 1), -('5','menu_permission_mgmt', '权限管理', NULL, '/permission-management', 'safety-certificate', 5, 1), -('6','menu_dashboard', '仪表盘', NULL, '/dashboard', 'dashboard', 6, 1), -('7','menu_user_mgmt', '用户管理', NULL, '/user-management', 'user', 7, 1), -('8','menu_role_mgmt', '角色管理', NULL, '/role-management', 'team', 8, 1), -('9','menu_dept_mgmt', '部门管理', NULL, '/dept-management', 'apartment', 9, 1), -('10','menu_permission_mgmt', '权限管理', NULL, '/permission-management', 'safety-certificate', 10, 1); +INSERT INTO `tb_sys_menu` (id,menu_id, name, parent_id, url, component, icon, order_num, type) VALUES +('1','menu_system_dept', '部门管理', NULL, '/manage/system/dept', 'manage/system/DeptManageView', 'el-icon-office-building', 1, 1), +('2','menu_system_menu', '菜单管理', NULL, '/manage/system/menu', 'manage/system/MenuManageView', 'el-icon-menu', 2, 1), +('3','menu_system_permission', '权限管理', NULL, '/manage/system/permission', 'manage/system/PermissionManageView', 'el-icon-key', 3, 1), +('4','menu_system_role', '角色管理', NULL, '/manage/system/role', 'manage/system/RoleManageView', 'el-icon-user', 4, 1); DROP TABLE IF EXISTS `tb_sys_menu_permission`; CREATE TABLE `tb_sys_menu_permission` ( @@ -181,10 +170,9 @@ CREATE TABLE `tb_sys_menu_permission` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_menu_permission` (`menu_id`, `permission_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; --- Insert default role-menu associations for admin role +-- Insert menu-permission associations INSERT INTO `tb_sys_menu_permission` (id, permission_id, menu_id) VALUES -('1', 'perm_dashboard', 'menu_dashboard'), -('2', 'perm_user_manage', 'menu_user_mgmt'), -('3', 'perm_role_manage', 'menu_role_mgmt'), -('4', 'perm_dept_manage', 'menu_dept_mgmt'), -('5', 'perm_permission_manage', 'menu_permission_mgmt'); \ No newline at end of file +('1', 'perm_system_dept_manage', 'menu_system_dept'), +('2', 'perm_system_menu_manage', 'menu_system_menu'), +('3', 'perm_system_permission_manage', 'menu_system_permission'), +('4', 'perm_system_role_manage', 'menu_system_role'); \ No newline at end of file diff --git a/schoolNewsServ/system/src/main/resources/mapper/MenuMapper.xml b/schoolNewsServ/system/src/main/resources/mapper/MenuMapper.xml index aada0e2..dccf34a 100644 --- a/schoolNewsServ/system/src/main/resources/mapper/MenuMapper.xml +++ b/schoolNewsServ/system/src/main/resources/mapper/MenuMapper.xml @@ -9,6 +9,7 @@ + @@ -22,7 +23,7 @@ - m.id, m.menu_id, m.name, m.parent_id, m.url, m.icon, m.order_num, m.type, + m.id, m.menu_id, m.name, m.parent_id, m.url, m.component, m.icon, m.order_num, m.type, m.creator, m.updater, m.create_time, m.update_time, m.delete_time, m.deleted @@ -125,6 +126,7 @@ name, type, url, + component, icon, creator, create_time, @@ -137,6 +139,7 @@ #{name}, #{type}, #{url}, + #{component}, #{icon}, #{creator}, #{createTime}, @@ -153,6 +156,7 @@ name = #{name}, type = #{type}, url = #{url}, + component = #{component}, icon = #{icon}, updater = #{updater}, update_time = NOW() diff --git a/schoolNewsWeb/src/App.vue b/schoolNewsWeb/src/App.vue index d82669d..e4c00c5 100644 --- a/schoolNewsWeb/src/App.vue +++ b/schoolNewsWeb/src/App.vue @@ -1,8 +1,5 @@ diff --git a/schoolNewsWeb/src/router/index.ts b/schoolNewsWeb/src/router/index.ts index 0479a27..ae7206f 100644 --- a/schoolNewsWeb/src/router/index.ts +++ b/schoolNewsWeb/src/router/index.ts @@ -11,7 +11,7 @@ const routes: Array = [ { path: "/login", name: "Login", - component: () => import("@/views/Login.vue"), + component: () => import("@/views/login/Login.vue"), meta: { title: "登录", requiresAuth: false, @@ -20,7 +20,7 @@ const routes: Array = [ { path: "/register", name: "Register", - component: () => import("@/views/Register.vue"), + component: () => import("@/views/login/Register.vue"), meta: { title: "注册", requiresAuth: false, @@ -29,7 +29,7 @@ const routes: Array = [ { path: "/forgot-password", name: "ForgotPassword", - component: () => import("@/views/ForgotPassword.vue"), + component: () => import("@/views/login/ForgotPassword.vue"), meta: { title: "忘记密码", requiresAuth: false, @@ -85,16 +85,6 @@ const routes: Array = [ requiresAuth: false, }, }, - // 旧的about路由,保持兼容 - { - path: "/about", - name: "About", - component: () => import("@/views/AboutView.vue"), - meta: { - title: "关于", - requiresAuth: false, - }, - }, // 捕获所有未匹配的路由 { path: "/:pathMatch(.*)*", diff --git a/schoolNewsWeb/src/views/AboutView.vue b/schoolNewsWeb/src/views/AboutView.vue deleted file mode 100644 index 3fa2807..0000000 --- a/schoolNewsWeb/src/views/AboutView.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/schoolNewsWeb/src/views/Home.vue b/schoolNewsWeb/src/views/Home.vue new file mode 100644 index 0000000..e69de29 diff --git a/schoolNewsWeb/src/views/ForgotPassword.vue b/schoolNewsWeb/src/views/login/ForgotPassword.vue similarity index 100% rename from schoolNewsWeb/src/views/ForgotPassword.vue rename to schoolNewsWeb/src/views/login/ForgotPassword.vue diff --git a/schoolNewsWeb/src/views/Login.vue b/schoolNewsWeb/src/views/login/Login.vue similarity index 98% rename from schoolNewsWeb/src/views/Login.vue rename to schoolNewsWeb/src/views/login/Login.vue index 938899c..5702385 100644 --- a/schoolNewsWeb/src/views/Login.vue +++ b/schoolNewsWeb/src/views/login/Login.vue @@ -37,7 +37,7 @@ /> - +