From bc3ae214e22ae0fe332f04b4967f35ec694b28ce Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 28 Jun 2022 15:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/login/login.component.ts | 2 +- .../navigation/navigation.component.ts | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 3781b06..74e9357 100644 --- a/src/app/pages/login/login.component.ts +++ b/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 diff --git a/src/app/system-management/navigation/navigation.component.ts b/src/app/system-management/navigation/navigation.component.ts index 8696ee7..4804bc1 100644 --- a/src/app/system-management/navigation/navigation.component.ts +++ b/src/app/system-management/navigation/navigation.component.ts @@ -45,16 +45,20 @@ 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]) + + } + } - } }