FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-11-22 10:48:35 +08:00
parent 73c4bdf9f4 9f86ad6f5b
commit 79e1ac36d8
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+1 -1
View File
@@ -527,7 +527,7 @@ export default {
} }
.nav-menu { .nav-menu {
width: 58px; width: 58px;
height: 90%; height: 100%;
overflow-y: auto; overflow-y: auto;
user-select: none; user-select: none;
box-sizing: border-box; box-sizing: border-box;
src/components/roleTree/index.vue
+1 -4
View File
@@ -135,10 +135,7 @@
this.isVisible2 = false this.isVisible2 = false
}, },
saveUserInfo () { saveUserInfo () {
if (this.nodeList[0].length === 0) { if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
this.isVisible2 = false
this.$emit('checkedRole', this.roleList)
} else if (this.nodeList.length > 0) {
let ids = '' let ids = ''
this.nodeList.forEach(item => { this.nodeList.forEach(item => {
if (ids.length > 0) { if (ids.length > 0) {