Commit d2495bca authored by zhengke's avatar zhengke

修改

parent 4a82f45d
......@@ -85,8 +85,8 @@
text-color="orange"
class="text-weight-bold"
>
<img :src="userInfo.UserIcon" v-if="userInfo.UserIcon" />
<span v-else-if="userInfo.AccountName">{{
<img :src="userInfo.UserIcon" v-if="userInfo&&userInfo.UserIcon" />
<span v-else-if="userInfo&&userInfo.AccountName">{{
userInfo.AccountName.substring(0, 1)
}}</span>
</q-avatar>
......@@ -164,9 +164,9 @@ export default {
},
mounted() {
this.queryParmam.PeriodId = this.periodId;
this.queryParmam.AccountId = this.currentId?this.currentId:this.userInfo.Id;
// this.queryParmam.AccountId = this.currentId?this.currentId:this.userInfo.Id;
this.queryParmam.AccountId = this.currentId?this.currentId:this.getLocalStorage().Id;
this.queryCommit();
},
methods: {
deleteCommmit(Id, State, i) {
......
......@@ -185,7 +185,6 @@
getDataFunc(e) {
if (e.data) {
var newData = JSON.parse(e.data)
console.log("getDataFunc", newData);
this.socketMsg = newData;
this.showNotification(newData[0].Title, newData[0].Content, newData.CoverImg)
}
......
......@@ -505,11 +505,16 @@ export default {
this.showOkrRemark=false;
},
getMe() {
// this.userParam = {
// UserIcon: this.userInfo.UserIcon,
// Id: this.userInfo.Id,
// EmployeeName: this.userInfo.AccountName
// };
this.userParam = {
UserIcon: this.userInfo.UserIcon,
Id: this.userInfo.Id,
EmployeeName: this.userInfo.AccountName
};
UserIcon:this.getLocalStorage().UserIcon,
Id: this.getLocalStorage().Id,
EmployeeName: this.getLocalStorage().AccountName
}
},
queryMyList(PeriodId) {
queryAlignList({
......
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