学生报名

src/views/system/user/profile/components/round-select-resolvers/backTracking-resolver-mixins.js

@@ -1,36 +1,22 @@
 export default {
   methods: {
-    backTrackingResolver(gen,active) {
+    backTrackingResolver(gen, active) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
-        item.rankInIndicator = currentGroup.rankInIndicator
-        item.rankInDisenroll = currentGroup.rankInDisenroll
+        item.backTrackingApply = `${currentGroup.actualCount + currentGroup.groupApprovedCount} /${currentGroup.personCount}`
       })
 
-
-      if(active < 4){
+      if (active < 4) {
         return {
-          applyCount:{
-            label:'选科人数比'
-          },
-          prmarySituation:{
-            label:'超/缺',
-            slot: 'underOver'
-          },
-          rankInGroup:{
-            label:'当前组合实时排名'
-          },
-          rankInGrade:{
-            label:'选科全校排名'
+          backTrackingApply: {
+            label: '补录情况'
           }
         }
-      }else {
-        return {
-
-        }
+      } else {
+        return {}
       }
     }
   }

src/views/system/user/profile/components/round-select-resolvers/backTrackingDM-resolver-mixins.js

@@ -4,36 +4,29 @@ export default {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
-
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         console.log(currentGroup.groupApprovedCount)
         console.log(currentGroup.groupIndicator)
-        item.supplyIndicator =  currentGroup.groupIndicator
+        item.supplyIndicator = currentGroup.nextGroupIndicator
         // 录取人数加指标/ 设置人数
-        if(currentGroup.groupIndicator >= 0) {
-          item.supplyRecord = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
-        }else {
-          item.supplyRecord = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
-        }
-
+        item.supplyRecord = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
       })
 
-
       return {
-        applyCount:{
-          label:'初录情况'
+        applyCount: {
+          label: '初录情况'
         },
-        prmarySituation:{
-          label:'初录超缺',
+        primarySituation: {
+          label: '初录超缺',
           slot: 'underOver'
         },
-        supplyRecord:{
-          label:'补录情况' // 补录情况 =
+        backTrackingApply: {
+          label: '补录情况' // 补录情况 =
           // groupApprovedCount(补录阶段实际报名人数) + actualCount(补录本组合已被录取人数) / personCount（设置的人数）
         },
-        supplyIndicator:{
-          label:'补录结果', // 补录的超缺
+        supplyIndicator: {
+          label: '补录结果', // 补录的超缺
           slot: 'underOver'
         }
       }

src/views/system/user/profile/components/round-select-resolvers/finalAdjust-resolver-mixins.js

@@ -4,20 +4,15 @@ export default {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
-      // this.formatRows.forEach(item => {
-      //   const currentGroup = models.find(group => group.groupId == item.groupId)
-      //   console.log(currentGroup.groupApprovedCount)
-      //   console.log(currentGroup.groupIndicator)
-      //   item.supplyIndicator =  currentGroup.groupIndicator >= 0 ? `超${currentGroup.groupIndicator}` : `缺${-currentGroup.groupIndicator}`
-      //   // 录取人数加指标/ 设置人数
-      //   if(currentGroup.groupIndicator >= 0) {
-      //     item.supplyRecord = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
-      //   }else {
-      //     item.supplyRecord = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
-      //   }
-      //
-      // })
+      this.formatRows.forEach(item => {
+        const currentGroup = models.find(group => group.groupId == item.groupId)
+
+        item.finalAdjustApply = `${currentGroup.actualCount + currentGroup.groupApprovedCount} /${currentGroup.personCount}`
+      })
       return {
+        finalAdjustApply: {
+          label: '二次补录情况'
+        }
       }
     }
   }

src/views/system/user/profile/components/round-select-resolvers/finalAdjustDM-resolver-mixins.js

@@ -7,15 +7,10 @@ export default {
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
 
-        item.towSupplyIndicator = currentGroup.groupIndicator
-        if(currentGroup.groupIndicator >= 0) {
-          item.towSupplyRecord = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
-        }else {
-          item.towSupplyRecord = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
-        }
+        item.towSupplyIndicator = currentGroup.nextGroupIndicator
       })
       return {
-        towSupplyRecord:{
+        finalAdjustApply:{
           label:'二次补录情况'
         },
         towSupplyIndicator:{

src/views/system/user/profile/components/round-select-resolvers/forceAdjust-resolver-mixins.js

@@ -4,23 +4,18 @@ export default {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
-
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
 
-        item.adjustIndicator = currentGroup.groupIndicator
-        if(currentGroup.groupIndicator >= 0) {
-          item.adjustRecord = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
-        }else {
-          item.adjustRecord = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
-        }
+        item.adjustIndicator = currentGroup.nextGroupIndicator
+        item.adjustRecord = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
       })
       return {
-        adjustRecord:{
-          label:'调剂补录情况'
+        adjustRecord: {
+          label: '调剂补录情况'
         },
-        adjustIndicator:{
-          label:'调剂补录结果',
+        adjustIndicator: {
+          label: '调剂补录结果',
           slot: 'underOver'
         }
       }

src/views/system/user/profile/components/round-select-resolvers/primaryDM-resolver-mixins.js

@@ -1,43 +1,25 @@
 export default {
   methods: {
-    primaryDMResolver(gen,active) {
+    primaryDMResolver(gen, active) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
       const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
-
       this.formatRows.forEach(item => {
         // item.applyCount = `${item.actualCount}/${item.personCount}`
         // item.rankInGroup = item.rankInGroup
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
-        item.prmarySituation = currentGroup.groupIndicator
-        // 录取人数加指标/ 设置人数
-        if(currentGroup.groupIndicator >= 0) {
-          item.applyCount = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
-        }else {
-          item.applyCount = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
-        }
-  })
+        item.primarySituation = currentGroup.nextGroupIndicator
+      })
       console.log(active)
-      if(active < 4){
+      if (active < 4) {
         return {
-          applyCount:{
-            label:'选科人数比'
-          },
-          prmarySituation:{
-            label:'超/缺',
+          primarySituation: {
+            label: '超/缺',
             slot: 'underOver'
-          },
-          rankInGroup:{
-            label:'当前组合实时排名'
-          },
-          rankInGrade:{
-            label:'选科全校排名'
           }
         }
-      }else {
-        return {
-
-        }
+      } else {
+        return {}
       }
 
     }

src/views/system/user/profile/round-select.vue

@@ -100,11 +100,12 @@ export default {
       if (!this.selectObj?.groupIds) return []
       if (!this.generationModels.length) return []
       const currentModels = this.generationModels.last().models
-      return this.selectObj.groupIds?.split(',').map(groupId => {
-        const matched = currentModels.find(m => m.groupId == groupId) || {}
+      return this.selectObj.groupList?.map(g => {
+        const matched = currentModels.find(m => m.groupId == g.groupId) || {}
         return ({
           ...matched,
-          groupId: groupId
+          ...g,
+          groupName: g.name
         })
       }) || []
     },