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

doc/Mind/ElectiveGeneration.cs

@@ -407,7 +407,7 @@ namespace mxdemo.Mind
             //          :''
             public string color;
 
-            // 5.27 hht +迭代至当前查询阶段的录取状态（非最终态，用来展示某阶段未录取学生AI分析表）
+            // 5.27 hht +迭代至参数中acitve阶段的录取状态（非最终态，用来展示某阶段未录取学生AI分析表）
             public bool approved;
             public bool forceAdjusted;
 
@@ -460,8 +460,9 @@ namespace mxdemo.Mind
         /// <param name="generation">当前进程代</param>
         /// <param name="groupId">针对组合的查询会传，否则传0或者''(具体看返回的时候给的什么值，比如未报名的)</param> 按行
         /// <param name="queryCode"></param> 按列
+        /// <param name="active">前端激活的步骤</param>
         /// <returns></returns>
-        ElectiveGenerationDetailWrapper getElectiveGenerationDetails(int pageNo, int pageSize, int roundId, int generation, int groupId, string queryCode);
+        ElectiveGenerationDetailWrapper getElectiveGenerationDetails(int pageNo, int pageSize, int roundId, int generation, int groupId, string queryCode, int active);
 
         #endregion
 

src/views/elective/generation/components/elective-generation-charts.vue

@@ -96,11 +96,11 @@ export default {
           roundGroups,
           rg => rg.expectedCount * 1,
           rg => {
-            const approvedCount = data.find(item => item.category == 'approvedCount')?.values
+            const acceptCount = data.find(item => item.category == 'acceptCount')?.values
               .find(item => item.groupId == rg.groupId)?.value || 0
             const forcedCount = data.find(item => item.category == 'forcedCount')?.values
               .find(item => item.groupId == rg.groupId)?.value || 0
-            const enrollCount = approvedCount * 1 + forcedCount * 1
+            const enrollCount = acceptCount * 1 + forcedCount * 1
             valueNameGroup.values.push({ value: enrollCount, name: rg.groupName })
             return enrollCount
           },

src/views/elective/generation/detail.vue

@@ -203,7 +203,8 @@ export default {
         roundId: this.prevData.roundId,
         generation: this.queryParams.generation,
         groupId: this.queryParams.generationGroupId,
-        queryCode: this.queryParams.generationQueryCode
+        queryCode: this.queryParams.generationQueryCode,
+        active: this.prevData.activeGeneration
       }
       this.loading = true
       this.majorsMap = null