|
@@ -81,7 +81,7 @@ export default {
|
|
|
return uniqBy([...this.studentList, ...this.activeListStudent], 'userId')
|
|
|
.filter(item => {
|
|
|
if (this.sound.length) {
|
|
|
- return this.sound.includes(item.subjectId) || this.seleched.includes(item.userId)
|
|
|
+ return this.sound.includes(item.actualSubjectId) || this.seleched.includes(item.userId)
|
|
|
}
|
|
|
return true
|
|
|
})
|
|
@@ -132,12 +132,12 @@ export default {
|
|
|
renderFunc(h, option) {
|
|
|
return (
|
|
|
<div class="line">
|
|
|
- <el-tooltip class="item" effect="dark" placement="top">
|
|
|
+ <el-tooltip class="item" effect="dark" placement="top" open-delay="300">
|
|
|
<span slot="content">{option.name}</span>
|
|
|
<span class="select-item">{option.name}</span>
|
|
|
</el-tooltip>
|
|
|
<span>{option.gender}</span>
|
|
|
- <el-tooltip class="item" effect="dark" placement="top">
|
|
|
+ <el-tooltip class="item" effect="dark" placement="top" open-delay="300">
|
|
|
<span slot="content">{option.subjectName}</span>
|
|
|
<span class="select-item">{option.subjectName}</span>
|
|
|
</el-tooltip>
|