huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-29 18:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1. 解决角色分配部门时，全选存在 bug

Browse Source 
2. 修改背景和 logo
This commit is contained in:
YunaiV 2021-02-23 01:39:31 +08:00
parent 1c1f1c49fa
commit 94dfe41153
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/package.json
View File

@ -41,7 +41,7 @@
"clipboard": "2.0.6", "clipboard": "2.0.6",
"core-js": "3.8.1", "core-js": "3.8.1",
"echarts": "4.9.0", "echarts": "4.9.0",
"element-ui": "2.14.1", "element-ui": "2.15.0",
"file-saver": "2.0.4", "file-saver": "2.0.4",
"fuse.js": "6.4.3", "fuse.js": "6.4.3",
"highlight.js": "9.18.5", "highlight.js": "9.18.5",

BIN
ruoyi-ui/src/assets/logo/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

2
ruoyi-ui/src/views/login.vue
View File

@ -146,7 +146,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
background-image: url("../assets/images/login-background.jpg"); background-image: url("http://static.yudao.iocoder.cn/login-background.jpg");
background-size: cover; background-size: cover;
} }
.title { .title {

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

@ -182,7 +182,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数据权限" v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM"> <el-form-item label="数据权限" v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM">
<el-checkbox v-model="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动(选中父节点，自动选择子节点)</el-checkbox> <el-checkbox :checked="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动(选中父节点，自动选择子节点)</el-checkbox>
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox> <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox> <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
<el-tree <el-tree
@ -282,7 +282,8 @@ export default {
// 菜单列表 // 菜单列表
menuOptions: [], menuOptions: [],
// 部门列表 // 部门列表
deptOptions: [], deptOptions: [], // 部门属性结构
depts: [], // 部门列表
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
@ -427,7 +428,8 @@ export default {
if (type === 'menu') { if (type === 'menu') {
this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []); this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
} else if (type === 'dept') { } else if (type === 'dept') {
this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []); // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
this.$refs.dept.setCheckedNodes(value ? this.depts: []);
} }
}, },
// 树权限（父子联动） // 树权限（父子联动）
@ -435,7 +437,7 @@ export default {
if (type === 'menu') { if (type === 'menu') {
this.form.menuCheckStrictly = value; this.form.menuCheckStrictly = value;
} else if (type === 'dept') { } else if (type === 'dept') {
this.form.deptCheckStrictly = value; this.form.deptCheckStrictly = !value;
} }
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -491,9 +493,11 @@ export default {
this.openDataScope = true; this.openDataScope = true;
// 获得部门列表 // 获得部门列表
listSimpleDepts().then(response => { listSimpleDepts().then(response => {
// 处理 menuOptions 参数 // 处理 deptOptions 参数
this.deptOptions = []; this.deptOptions = [];
this.deptOptions.push(...this.handleTree(response.data, "id")); this.deptOptions.push(...this.handleTree(response.data, "id"));
this.depts = response.data;
// this.deptIds = response.data.map(x => x.id);
// 获得角色拥有的数据权限 // 获得角色拥有的数据权限
getRole(row.id).then(response => { getRole(row.id).then(response => {
this.form.dataScope = response.data.dataScope; this.form.dataScope = response.data.dataScope;