From 94dfe41153fa3978be7b466b6e3112e68712d941 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 23 Feb 2021 01:39:31 +0800
Subject: [PATCH] 1. 解决角色分配部门时，全选存在 bug 2. 修改背景和 logo

---
 ruoyi-ui/package.json                    |  2 +-
 ruoyi-ui/src/assets/logo/logo.png        | Bin 5663 -> 0 bytes
 ruoyi-ui/src/views/login.vue             |  2 +-
 ruoyi-ui/src/views/system/role/index.vue | 14 +++++++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 1dd8a7c..46718e1 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -41,7 +41,7 @@
     "clipboard": "2.0.6",
     "core-js": "3.8.1",
     "echarts": "4.9.0",
-    "element-ui": "2.14.1",
+    "element-ui": "2.15.0",
     "file-saver": "2.0.4",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png
index e263760..7e1043f 100644
Binary files a/ruoyi-ui/src/assets/logo/logo.png and b/ruoyi-ui/src/assets/logo/logo.png differ
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 1957462..1fca641 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -146,7 +146,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("http://static.yudao.iocoder.cn/login-background.jpg");
   background-size: cover;
 }
 .title {
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index bea708f..eadb4cc 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -182,7 +182,7 @@
           </el-select>
         </el-form-item>
         <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="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
           <el-tree
@@ -282,7 +282,8 @@ export default {
       // 菜单列表
       menuOptions: [],
       // 部门列表
-      deptOptions: [],
+      deptOptions: [], // 部门属性结构
+      depts: [], // 部门列表
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -427,7 +428,8 @@ export default {
       if (type === 'menu') {
         this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
       } 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') {
         this.form.menuCheckStrictly = value;
       } else if (type === 'dept') {
-        this.form.deptCheckStrictly = value;
+        this.form.deptCheckStrictly = !value;
       }
     },
     /** 新增按钮操作 */
@@ -491,9 +493,11 @@ export default {
       this.openDataScope = true;
       // 获得部门列表
       listSimpleDepts().then(response => {
-        // 处理 menuOptions 参数
+        // 处理 deptOptions 参数
         this.deptOptions = [];
         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 => {
           this.form.dataScope = response.data.dataScope;
--
libgit2 0.21.4