Browse Source

[完善]bug

beijing
邵佳豪 3 years ago
parent
commit
c6c3b47a40
  1. 12
      src/app/pages/login/login.component.ts

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

@ -96,14 +96,12 @@ export class LoginComponent implements OnInit {
{ name: '证照管理', url: '/license/petrolStation' },
]
init3D
getGasStationBaseInfo() {
return new Promise((resolve, reject) => {
async getGasStationBaseInfo() {
new Promise((resolve, reject) => {
let params = { organizationUnitId: (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization.id }
this.http.get('/api/services/app/GasStation/Get', { params: params }).subscribe((data: any) => {
resolve(data.result)
this.init3D = data.result.hasBuildingInfo
console.log(this.init3D);
})
})
}
@ -134,7 +132,7 @@ export class LoginComponent implements OnInit {
(data: any) => {
sessionStorage.setItem("token", data.result.accessToken);
sessionStorage.setItem("encryptedAccessToken", data.result.encryptedAccessToken);
this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => {
this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe(async (data: any) => {
console.log('GetCurrentLoginInformations', data.result)
if (data.result.user.menus.length == 0 && data.result.user.userName != "admin") {
this.message.create('error', `当前用户未分配菜单`);
@ -148,7 +146,9 @@ export class LoginComponent implements OnInit {
sessionStorage.setItem('isPasswordExpired', JSON.stringify(data.result.user.isPasswordExpired))
this.isLoading = false;
if (data.result.user.organization.isGasStation) {
this.getGasStationBaseInfo()
await this.getGasStationBaseInfo()
if (data.result.user.menus[0].name == "数字油站" && data.result.user.menus.length == 1 && !this.init3D) {
this.message.create('error', `当前用户油站未开通3D且仅分配油站菜单`);
return

Loading…
Cancel
Save