diff --git a/frontend/src/views/Role/Role.vue b/frontend/src/views/Role/Role.vue index 6783daa98a2b6289082a5cc63ee9f6610c000cf5..92c80cb8d2aac019bfa040f4607b17220e9577b8 100644 --- a/frontend/src/views/Role/Role.vue +++ b/frontend/src/views/Role/Role.vue @@ -16,13 +16,13 @@ 查看 变更 + @click="onEditRolePermission(scope.row)">变更 编辑 + @click="onEditRoleInfo(scope.row)">编辑 - + - - + + @@ -87,26 +87,29 @@ function updateRoles() { } const roleDetailTitle = ref("权限详情") -const showDetail = ref(false) -const showDetailEdit = ref(false) +const showPermission = ref(false) +const showPermissionEdit = ref(false) function showRoleDetail(role: any) { - showDetailEdit.value = false - showDetail.value = true + roleDetailTitle.value = "权限详情" + showPermissionEdit.value = false + showPermission.value = true } -const editedRole = ref("") -function onEditRoleDetail(role: any) { - editedRole.value = role.role - showDetailEdit.value = true - showDetail.value = true +const editedRole = ref({}) +function onEditRolePermission(role: any) { + editedRole.value = role + roleDetailTitle.value = "编辑权限" + showPermissionEdit.value = true + showPermission.value = true } const roleOperateTitle = ref("编辑角色") const showRoleOperate = ref(false) const operate = ref("") -function onEditRoleInfo() { +function onEditRoleInfo(role:any) { + editedRole.value = role roleOperateTitle.value = "编辑角色" showRoleOperate.value = true operate.value = "UpdateRole" diff --git a/frontend/src/views/Role/components/RoleDetail.vue b/frontend/src/views/Role/components/RoleDetail.vue index d7083c164b7d986e0dab3ee699ebf1086588ce80..a15e617f7c065b0d2e534b8cf25c608883dcf176 100644 --- a/frontend/src/views/Role/components/RoleDetail.vue +++ b/frontend/src/views/Role/components/RoleDetail.vue @@ -24,8 +24,8 @@ const treeRef = ref() const props = defineProps({ role: { - type: String, - default: "", + type: Object, + default: {}, }, showEdit: { type: Boolean, @@ -53,14 +53,14 @@ function onChangePermission() { }); changeRolePermission({ - role: props.role, + role: props.role.role, buttonId: buttons, menus: menus, }).then((resp: any) => { if (resp.code === RespCodeOK) { // TODO: - ElMessage.success("change role permission success", resp.msg) + ElMessage.success("change role permission success:"+ resp.msg) } else { ElMessage.error("failed to change role permission:" + resp.msg) } diff --git a/frontend/src/views/Role/components/UpdateRole.vue b/frontend/src/views/Role/components/UpdateRole.vue index 6907bf227038ef8f7cb9a3f7b59e1cf1f016b510..56f40fc70e547d912af87c353a61d3cc4f5a3f73 100644 --- a/frontend/src/views/Role/components/UpdateRole.vue +++ b/frontend/src/views/Role/components/UpdateRole.vue @@ -2,8 +2,7 @@ - + {{ role.role }} - - \ No newline at end of file + \ No newline at end of file
{{ role.role }}