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

Merge remote-tracking branch 'origin/test' into thailand

Browse Source
This commit is contained in:
fan 2023-06-02 16:54:47 +08:00
commit 04b49c870e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/store/modules/user.js
View File

@ -157,6 +157,8 @@ const user = {
} else {
reject('getInfo: roles must be a non-null array !');
}
const deviceVO = response.data.deviceVO;
commit('SET_NAME', user.name);
commit('SET_NICKNAME', user.nickname);
commit('SET_ID', user.id);
@ -168,7 +170,9 @@ const user = {
commit('SET_COMPANYNAME', user.companyName);
commit('SET_COMPANYPROJECTLIST', user.projectCodes);
commit('SET_THIRDLOGIN', response.data.thirdLogin);
commit('setDeviceConfig', JSON.parse(response.data.deviceVO.config || '{}'));
if (deviceVO) {
commit('setDeviceConfig', JSON.parse(deviceVO.config || '{}'));
}
resolve(user);
}).catch(error => {
reject(error);