hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-07 15:45:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

完成部分权限的认证操作的迁移

Browse Source
This commit is contained in:
YunaiV
2021-01-23 22:03:06 +08:00
parent aa38c0f9d1
commit bbe71ec2c8
39 changed files with 370 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/utils/request.js
View File

@ -61,7 +61,9 @@ service.interceptors.response.use(res => {
}
).then(() => {
store.dispatch('LogOut').then(() => {
location.href = '/index';
if (location.pathname !== '/login') { // 避免重复跳转
location.href = '/index';
}
})
})
} else if (code === 500) {

11
ruoyi-ui/src/views/system/role/index.vue
View File

@ -392,6 +392,7 @@ export default {
menuIds: [],
dataScope: undefined,
deptCheckStrictly: false,
menuCheckStrictly: true,
remark: undefined
};
this.resetForm("form");
@ -471,8 +472,12 @@ export default {
});
// 获得角色拥有的菜单集合
listRoleMenus(id).then(response => {
// 设置为严格，避免设置父节点自动选中子节点，解决半选中问题
this.form.menuCheckStrictly = true
// 设置选中
this.$refs.menu.setCheckedKeys(response.data, true, false);
this.$refs.menu.setCheckedKeys(response.data);
// 设置为非严格，继续使用半选中
this.form.menuCheckStrictly = false
})
},
/** 分配数据权限操作 */
@ -523,7 +528,7 @@ export default {
roleId: this.form.id,
dataScope: this.form.dataScope,
dataScopeDeptIds: this.form.dataScope !== SysDataScopeEnum.DEPT_CUSTOM ? [] :
this.$refs.dept.getCheckedKeys(false)
this.$refs.dept.getCheckedKeys()
}).then(response => {
this.msgSuccess("修改成功");
this.openDataScope = false;
@ -536,7 +541,7 @@ export default {
if (this.form.id !== undefined) {
assignRoleMenu({
roleId: this.form.id,
menuIds: this.$refs.menu.getCheckedKeys(true)
menuIds: [...this.$refs.menu.getCheckedKeys(), ...this.$refs.menu.getHalfCheckedKeys()]
}).then(response => {
this.msgSuccess("修改成功");
this.openMenu = false;