|
@@ -269,18 +269,11 @@ export default {
|
|
|
const row = generationModels.find(item => item.groupId == rg.groupId) || {}
|
|
|
row.allowSelectTips = row.allowSelect ? '报名中' : row.disabledReason || '无法报名'
|
|
|
const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId))
|
|
|
- return {
|
|
|
- groupId: row.groupId,
|
|
|
- groupName: row.groupName,
|
|
|
- selected: row.selected,
|
|
|
- scoreSumGroup: row.scoreSumGroup,
|
|
|
- classCount: row.classCount,
|
|
|
- personCount: row.personCount,
|
|
|
- allowSelectTips: row.allowSelectTips,
|
|
|
- colleges: matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName })),
|
|
|
- subjects: matchedMajors.map(m => m['majorCategoryName']),
|
|
|
- allowSelect: row.allowSelect
|
|
|
- }
|
|
|
+ row.colleges = matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName }))
|
|
|
+ row.subjects = matchedMajors.map(m => m['majorCategoryName'])
|
|
|
+ // this.$set(row,'colleges',matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName })))
|
|
|
+ // this.$set(row,'subjects',matchedMajors.map(m => m['majorCategoryName']))
|
|
|
+ return row
|
|
|
})
|
|
|
},
|
|
|
formatCols() {
|