Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

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,

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)

src/views/permission/components/steps/fauclty/faculty-result.vue

@@ -32,19 +32,19 @@ export default {
           label: '科目'
         },
         levelClassCount: {
-          label: '等级考班级数',
+          label: '等级考课时总数',
           minWidth: '130px'
         },
         qualifiedClassCount: {
-          label: '合格考班级数',
+          label: '合格考课时总数',
           minWidth: '130px'
         },
         requiredClassesCount: {
-          label: '所需课时数',
+          label: '所需周课时总数',
           minWidth: '130px'
         },
         actualClassesCount: {
-          label: '实际课时数',
+          label: '实际周课时总数',
           minWidth: '130px',
           disabled: true
         },

src/views/system/user/profile/components/report-table.vue

@@ -221,7 +221,7 @@ export default {
         row.selected = false
         this.selectedList.splice(
           this.selectedList.indexOf(this.selectedList.find((selected)=> {
-            return selected.groupId === row.groupId
+            return selected.groupId == row.groupId
           }),1)
         )
       }).catch(() => {