Commit d2495bca authored by zhengke's avatar zhengke

修改

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