jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/views/system/role/index.vue
This commit is contained in:
疯狂的狮子li
2020-07-13 09:27:49 +08:00
parent 59b42fddea dd7a9850e3
commit a3a3d62034
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -94,7 +94,7 @@ export default {
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
location.reload()
location.href = '/index';
})
})
}

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

@ -368,16 +368,16 @@ export default {
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
roleMenuTreeselect(roleId).then(response => {
return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.menus;
this.$refs.menu.setCheckedKeys(response.checkedKeys);
return response;
});
},
/** 根据角色ID查询部门树结构 */
getRoleDeptTreeselect(roleId) {
roleDeptTreeselect(roleId).then(response => {
return roleDeptTreeselect(roleId).then(response => {
this.deptOptions = response.depts;
this.$refs.dept.setCheckedKeys(response.checkedKeys);
return response;
});
},
// 角色状态修改
@ -450,24 +450,30 @@ export default {
handleUpdate(row) {
this.reset();
const roleId = row.roleId || this.ids
this.$nextTick(() => {
this.getRoleMenuTreeselect(roleId);
});
const roleMenu = this.getRoleMenuTreeselect(roleId);
getRole(roleId).then(response => {
this.form = response.data;
this.open = true;
this.$nextTick(() => {
roleMenu.then(res => {
this.$refs.menu.setCheckedKeys(res.checkedKeys);
});
});
this.title = "修改角色";
});
},
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
this.$nextTick(() => {
this.getRoleDeptTreeselect(row.roleId);
});
const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
getRole(row.roleId).then(response => {
this.form = response.data;
this.openDataScope = true;
this.$nextTick(() => {
roleDeptTreeselect.then(res => {
this.$refs.dept.setCheckedKeys(res.checkedKeys);
});
});
this.title = "分配数据权限";
});
},
@ -539,4 +545,4 @@ export default {
}
}
};
</script>
</script>