Commit 47245765 authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents 67e3fb88 e2def313
......@@ -178,14 +178,15 @@
if (this.userInfo && this.userInfo.MenuList) {
this.secondNavs = this.userInfo.MenuList.length > 0 ? this.userInfo.MenuList[i].SubList : []
}
this.MsgBus.$on('add',(payload) => {
let that= this
that.userInfo.AccountName = payload.EmployeeName
that.userInfo.UserIcon = payload.UserIcon
that.userInfo.Email = payload.Email
that.userInfo.SchoolName = payload.SchoolName
// this.MsgBus.$on('add',(payload) => {
// let that= this
// that.userInfo.AccountName = payload.EmployeeName
// that.userInfo.UserIcon = payload.UserIcon
// that.userInfo.Email = payload.Email
// that.userInfo.SchoolName = payload.SchoolName
// // location.reload();
});
// });
this.getLogList();
this.getMsg();
},
......
......@@ -330,12 +330,16 @@
data:this.showObj
}
localStorage.setItem("loginUserInfo", JSON.stringify(localStorageobj) );
let obj = JSON.parse(JSON.stringify(this.datamodify))
obj.SchoolName = this.showObj.SchoolName
setTimeout(() => {
this.MsgBus.$emit('add',obj);
}, 10);
location.reload()
// this.$router.push({
// path: this.redirect || '/home'
// })
// let obj = JSON.parse(JSON.stringify(this.datamodify))
// obj.SchoolName = this.showObj.SchoolName
// setTimeout(() => {
// this.MsgBus.$emit('add',obj);
// }, 10);
}
}).catch(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment