|
@@ -397,7 +397,6 @@ import QuesNaire from "./EventContentTypeTemplate/QuesNaire";
|
|
|
this.showTypeNametoIcon = this.typeNametoIcon.filter(item => {
|
|
this.showTypeNametoIcon = this.typeNametoIcon.filter(item => {
|
|
|
return this.showType.includes(item.eventType)
|
|
return this.showType.includes(item.eventType)
|
|
|
})
|
|
})
|
|
|
- this.eventTypeCheckers = this.showType.length === 1 ? '' : 'Vote'
|
|
|
|
|
if(this.getChoseDate) {
|
|
if(this.getChoseDate) {
|
|
|
this.dateChange(this.getChoseDate)
|
|
this.dateChange(this.getChoseDate)
|
|
|
} else {
|
|
} else {
|
|
@@ -620,6 +619,11 @@ import QuesNaire from "./EventContentTypeTemplate/QuesNaire";
|
|
|
return b.startTime - a.startTime //时间正序
|
|
return b.startTime - a.startTime //时间正序
|
|
|
});
|
|
});
|
|
|
if(this.showType.length === 2) {
|
|
if(this.showType.length === 2) {
|
|
|
|
|
+ let nowIn = this.eventList.findIndex(item => {
|
|
|
|
|
+ return item.id === this.$route.query.aId
|
|
|
|
|
+ })
|
|
|
|
|
+ this.eventTypeCheckers = nowIn != -1 ? this.eventList[nowIn].type : "Vote"
|
|
|
|
|
+ if(nowIn != -1) {}
|
|
|
this.eventList.forEach(item => {
|
|
this.eventList.forEach(item => {
|
|
|
if(!this.teachers.find(tea => {
|
|
if(!this.teachers.find(tea => {
|
|
|
return tea.id === item.creatorId
|
|
return tea.id === item.creatorId
|
|
@@ -629,7 +633,7 @@ import QuesNaire from "./EventContentTypeTemplate/QuesNaire";
|
|
|
name: item.teacherName
|
|
name: item.teacherName
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
- if(item.type === 'Vote') {
|
|
|
|
|
|
|
+ if(item.type === this.eventTypeCheckers) {
|
|
|
this.eventShow.push(item)
|
|
this.eventShow.push(item)
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
