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

src/components/navMenu/index.vue

@@ -527,7 +527,7 @@ export default {
 }
 .nav-menu {
   width: 58px;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   user-select: none;
   box-sizing: border-box;

src/components/roleTree/index.vue

@@ -135,10 +135,7 @@
                 this.isVisible2 = false
             },
             saveUserInfo () {
-                if (this.nodeList[0].length === 0) {
-                    this.isVisible2 = false
-                    this.$emit('checkedRole', this.roleList)
-                } else if (this.nodeList.length > 0) {
+                if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
                     let ids = ''
                     this.nodeList.forEach(item => {
                         if (ids.length > 0) {