diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 1dd8a7cdd..46718e1b0 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 e26376026..7e1043f21 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 1957462e1..1fca6413f 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 bea708f3b..eadb4cc31 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -182,7 +182,7 @@ - 父子联动(选中父节点,自动选择子节点) + 父子联动(选中父节点,自动选择子节点) 展开/折叠 全选/全不选 { - // 处理 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;