Parcourir la source

generation - history display range changed: from init to active generation.

hare8999@163.com il y a 3 ans
Parent
commit
ee4a0f8a32

+ 1 - 0
src/views/elective/generation/components/elective-generation-table.vue

@@ -150,6 +150,7 @@ export default {
         year: this.chartBinding.generation.status.year,
         roundId: this.chartBinding.generation.status.roundId,
         roundName: this.chartBinding.generation.status.roundName,
+        activeGeneration: this.chartBinding.generation.active,
         queryGeneration: option.generation,
         queryGroupId: option.groupId,
         queryCode: option.queryCode,

+ 2 - 2
src/views/elective/generation/detail.vue

@@ -198,11 +198,11 @@ export default {
       const matchedMajors = (this.majorsMap[row['studentId']]
         ?.majors?.filter(m => m['matchedGroupIds'].some(id => id == groupId)) || [])
         .groupBy(m => m.collegeName)
-      const current = this.prevData.queryGeneration
+      const current = this.prevData.activeGeneration
       const options = Object.values(config.electiveGenerationOptions)
       const histories = row['histories'] || []
       const filterHistories = []
-      for (let g = config.electiveGenerationOptions.rankBalance.value; g > 0; g--) {
+      for (let g = current; g > 0; g--) {
         const opt = options.find(opt => opt.value == g)
         const groupHistories = histories.filter(h => h.generation == g && h.groupId == groupId)
         if (groupHistories.length) filterHistories.push(groupHistories)