Commit 94dfe41153fa3978be7b466b6e3112e68712d941
1 parent
1c1f1c49
1. 解决角色分配部门时，全选存在 bug
2. 修改背景和 logo
Showing
4 changed files
with
11 additions
and
7 deletions
ruoyi-ui/package.json
ruoyi-ui/src/assets/logo/logo.png
ruoyi-ui/src/views/login.vue
| ... | ... | @@ -146,7 +146,7 @@ export default { |
| 146 | 146 | justify-content: center; |
| 147 | 147 | align-items: center; |
| 148 | 148 | height: 100%; |
| 149 | - background-image: url("../assets/images/login-background.jpg"); | |
| 149 | + background-image: url("http://static.yudao.iocoder.cn/login-background.jpg"); | |
| 150 | 150 | background-size: cover; |
| 151 | 151 | } |
| 152 | 152 | .title { | ... | ... |
ruoyi-ui/src/views/system/role/index.vue
| ... | ... | @@ -182,7 +182,7 @@ |
| 182 | 182 | </el-select> |
| 183 | 183 | </el-form-item> |
| 184 | 184 | <el-form-item label="数据权限" v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM"> |
| 185 | - <el-checkbox v-model="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动(选中父节点，自动选择子节点)</el-checkbox> | |
| 185 | + <el-checkbox :checked="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动(选中父节点，自动选择子节点)</el-checkbox> | |
| 186 | 186 | <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox> |
| 187 | 187 | <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox> |
| 188 | 188 | <el-tree |
| ... | ... | @@ -282,7 +282,8 @@ export default { |
| 282 | 282 | // 菜单列表 |
| 283 | 283 | menuOptions: [], |
| 284 | 284 | // 部门列表 |
| 285 | - deptOptions: [], | |
| 285 | + deptOptions: [], // 部门属性结构 | |
| 286 | + depts: [], // 部门列表 | |
| 286 | 287 | // 查询参数 |
| 287 | 288 | queryParams: { |
| 288 | 289 | pageNo: 1, |
| ... | ... | @@ -427,7 +428,8 @@ export default { |
| 427 | 428 | if (type === 'menu') { |
| 428 | 429 | this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []); |
| 429 | 430 | } else if (type === 'dept') { |
| 430 | - this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []); | |
| 431 | + // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []); | |
| 432 | + this.$refs.dept.setCheckedNodes(value ? this.depts: []); | |
| 431 | 433 | } |
| 432 | 434 | }, |
| 433 | 435 | // 树权限（父子联动） |
| ... | ... | @@ -435,7 +437,7 @@ export default { |
| 435 | 437 | if (type === 'menu') { |
| 436 | 438 | this.form.menuCheckStrictly = value; |
| 437 | 439 | } else if (type === 'dept') { |
| 438 | - this.form.deptCheckStrictly = value; | |
| 440 | + this.form.deptCheckStrictly = !value; | |
| 439 | 441 | } |
| 440 | 442 | }, |
| 441 | 443 | /** 新增按钮操作 */ |
| ... | ... | @@ -491,9 +493,11 @@ export default { |
| 491 | 493 | this.openDataScope = true; |
| 492 | 494 | // 获得部门列表 |
| 493 | 495 | listSimpleDepts().then(response => { |
| 494 | - // 处理 menuOptions 参数 | |
| 496 | + // 处理 deptOptions 参数 | |
| 495 | 497 | this.deptOptions = []; |
| 496 | 498 | this.deptOptions.push(...this.handleTree(response.data, "id")); |
| 499 | + this.depts = response.data; | |
| 500 | + // this.deptIds = response.data.map(x => x.id); | |
| 497 | 501 | // 获得角色拥有的数据权限 |
| 498 | 502 | getRole(row.id).then(response => { |
| 499 | 503 | this.form.dataScope = response.data.dataScope; | ... | ... |