diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 8551dccb02b8a85e8d10cd489d0c879b3550d015..9d00e8ba0606238041d14e09c2a201e71ad78473 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -181,7 +181,7 @@ let sidebarRoutes = [ component: () => import("../views/User/User.vue"), meta: { title: "用户管理", - panel: "user", + panel: "usermanager", icon: "UserFilled", breadcrumb: [{ name: "用户管理" }], }, @@ -192,7 +192,7 @@ let sidebarRoutes = [ component: () => import("../views/Role/Role.vue"), meta: { title: "角色管理", - panel: "role", + panel: "usermanager", icon: "Lock", breadcrumb: [{ name: "角色管理" }], }, diff --git a/frontend/src/views/Role/components/RoleForm.vue b/frontend/src/views/Role/components/RoleForm.vue index f59e10e97c14c2660fdd64c062759ebdf7548af8..cef085cb81438dc53bcc6b9ab8917d0cb04441dc 100644 --- a/frontend/src/views/Role/components/RoleForm.vue +++ b/frontend/src/views/Role/components/RoleForm.vue @@ -65,7 +65,7 @@ const props = defineProps({ }); interface RolePermission { button: Array; - menu: string; + menu: Array; } const emits = defineEmits(["close", "rolesUpdated"]); const tableData = ref([] as any[]); @@ -78,8 +78,8 @@ onMounted(() => { let all_operations = [] as any[]; tableData.value.forEach((item) => (all_operations = all_operations.concat(item.operations))); checkedOperation.value = handleCheckedData(btns, all_operations); - if (rolePermission.menu !== "") { - checkedMenu.value = handleCheckedData(rolePermission.menu.split(","), tableData.value); + if (rolePermission.menu.length > 0) { + checkedMenu.value = handleCheckedData(rolePermission.menu, tableData.value); } });