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

src/app/pages/login/login.component.ts

@@ -124,7 +124,7 @@ export class LoginComponent implements OnInit {
         sessionStorage.setItem("encryptedAccessToken", data.result.encryptedAccessToken);
         this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => {
           console.log('GetCurrentLoginInformations', data.result)
-          if (data.result.user.menus.length == 0) {
+          if (data.result.user.menus.length == 0 && data.result.name!="admin") {
             this.message.create('error', `当前用户未分配菜单`);
             this.isLoading = false
             return

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

@@ -45,16 +45,19 @@ export class NavigationComponent implements OnInit {
           this.menuList1.push(this.menu1[index])
         }
       }
-      console.log(this.menuList1);
+      // console.log(this.menuList1);
     }
     for (let index = 0; index < this.menu3.length; index++) {
-      let url=""
-      for (let k = 0; k < this.tap.length; k++) {
-        if (this.tap[k]==this.menu3[index].name) {
-          this.menuList2.push(this.menu3[index]) 
-
+      if(JSON.parse(a).userName=="admin"){
+        this.menuList2=this.menu3
+      }else{
+        for (let k = 0; k < this.tap.length; k++) {
+          if (this.tap[k]==this.menu3[index].name) {
+            this.menuList2.push(this.menu3[index]) 
+  
+          }
+          
         }
-        
       }
       
     }

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

@@ -75,6 +75,7 @@ export class RoleComponent implements OnInit {
       nzMaskClosable: false,
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
+          
           await new Promise(resolve => {
             console.log('表单信息', instance.validateForm)
             let arr = []