Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/system-management/menu/menu.component.ts

@@ -59,8 +59,8 @@ export class MenuComponent implements OnInit {
       });
       this.allOrList = data.result.items
       this.nodes = [...this.toTree.toTree(data.result.items)]
-      this.defaultExpandedKeys = [this.nodes[0].id]
-      this.defaultExpandedKeys = [...this.defaultExpandedKeys]
+      // this.defaultExpandedKeys = [this.nodes[0].id]
+      // this.defaultExpandedKeys = [...this.defaultExpandedKeys]
 
     })
   }

src/app/system-management/user/user.component.scss

@@ -10,6 +10,8 @@
 
   .treebox {
   display: flex;
+  flex: 1;
+  overflow: auto;
   flex-direction: column;
   }
   .topbox2 {
@@ -33,7 +35,8 @@
     .righttop {
       height: 36px;
       display: flex;
-  
+      margin-right: 10px;
+      width: 200px;
       button {
         margin-left: 16px;
       }
@@ -44,7 +47,7 @@
     }
   }
   .orbox {
-    width: 375px;
+    width: 300px;
     // height: 100%;
     overflow-y: auto;
     margin-right: 10px;