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/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
This commit is contained in:
疯狂的狮子li
2020-10-14 09:22:01 +08:00
parent 8ca53c7666 08df2c93a9
commit f4876422a9
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -352,9 +352,7 @@ export default {
/** 清理缓存按钮操作 */ /** 清理缓存按钮操作 */
handleClearCache() { handleClearCache() {
clearCache().then(response => { clearCache().then(response => {
if (response.code === 200) { this.msgSuccess("清理成功");
this.msgSuccess("清理成功");
}
}); });
} }
} }

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

@ -368,18 +368,18 @@ export default {
// 所有菜单节点数据 // 所有菜单节点数据
getMenuAllCheckedKeys() { getMenuAllCheckedKeys() {
// 目前被选中的菜单节点 // 目前被选中的菜单节点
let checkedKeys = this.$refs.menu.getHalfCheckedKeys(); let checkedKeys = this.$refs.menu.getCheckedKeys();
// 半选中的菜单节点 // 半选中的菜单节点
let halfCheckedKeys = this.$refs.menu.getCheckedKeys(); let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys); checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys; return checkedKeys;
}, },
// 所有部门节点数据 // 所有部门节点数据
getDeptAllCheckedKeys() { getDeptAllCheckedKeys() {
// 目前被选中的部门节点 // 目前被选中的部门节点
let checkedKeys = this.$refs.dept.getHalfCheckedKeys(); let checkedKeys = this.$refs.dept.getCheckedKeys();
// 半选中的部门节点 // 半选中的部门节点
let halfCheckedKeys = this.$refs.dept.getCheckedKeys(); let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys); checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys; return checkedKeys;
}, },
@ -440,7 +440,7 @@ export default {
menuIds: [], menuIds: [],
deptIds: [], deptIds: [],
menuCheckStrictly: true, menuCheckStrictly: true,
deptCheckStrictly: true, deptCheckStrictly: true,
remark: undefined remark: undefined
}; };
this.resetForm("form"); this.resetForm("form");