joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

跳转登录时先登入组织再获取用户信息

Browse Source
This commit is contained in:
dong 2023-03-23 10:09:03 +08:00
parent 2aadaaf100
commit e3d8637ffe
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/login/normalLogin.vue
View File

@ -203,9 +203,18 @@ export default {
if (orgList.length < 2) {
if (orgList.length === 1) {
orgId = orgList[0].orgId;
selectOrgnization(orgId);
}
selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
this.handleLoginSucessRoute();
}).catch(err => {
this.loading = false;
this.tipsMsg = `登入组织失败！，${err.message}`;
setTimeout(() => {
this.tipsMsg = '';
}, 5000);
});
} else {
this.handleLoginSucessRoute();
}
} else {
this.$emit('showOrgList', orgList);
}
@ -216,8 +225,17 @@ export default {
},
// 选择组织
selectOrg(orgId) {
// this.handleLoginSucessRoute();
// selectOrgnization(orgId);
selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
this.handleLoginSucessRoute();
selectOrgnization(orgId);
}).catch(err => {
this.loading = false;
this.tipsMsg = `登入组织失败！，${err.message}`;
setTimeout(() => {
this.tipsMsg = '';
}, 5000);
});
},
// 跳转路由
handleLoginSucessRoute() {