选科报名-mock

mock/modules/elective-subject.js

@@ -243,10 +243,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 320,
+                actualCount: 20,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 300,
                 groupForceAdjustedCount: 0
               },
 
@@ -269,10 +269,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 2,
-                actualCount: 261,
+                actualCount: 61,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 200,
                 groupForceAdjustedCount: 0
               },
 
@@ -295,10 +295,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 0,
-                actualCount: 227,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 227,
                 groupForceAdjustedCount: 0
               },
               {
@@ -320,10 +320,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 230,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 230,
                 groupForceAdjustedCount: 0
               },
               {
@@ -345,10 +345,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 373,
+                actualCount: 73,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 300,
                 groupForceAdjustedCount: 0
               },
               {
@@ -370,10 +370,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 89,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 89,
                 groupForceAdjustedCount: 0
               }
             ],
@@ -401,10 +401,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 320,
+                actualCount: 20,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 300,
                 groupForceAdjustedCount: 0
               },
 
@@ -427,10 +427,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 2,
-                actualCount: 261,
+                actualCount: 61,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 200,
                 groupForceAdjustedCount: 0
               },
 
@@ -453,10 +453,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 0,
-                actualCount: 227,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 227,
                 groupForceAdjustedCount: 0
               },
               {
@@ -478,10 +478,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 230,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 230,
                 groupForceAdjustedCount: 0
               },
               {
@@ -503,10 +503,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 373,
+                actualCount: 23,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 350,
                 groupForceAdjustedCount: 0
               },
               {
@@ -528,10 +528,10 @@ module.exports = [
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 89,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 0,
+                groupApprovedCount: 89,
                 groupForceAdjustedCount: 0
               }
             ],
@@ -541,105 +541,169 @@ module.exports = [
           {
             models: [
               {
-                scoreSumGroup: 514,
+                scoreSumGroup: 521,
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: '',
+                rankInIndicator: 10,
                 rankInDisenroll: 14,
                 isRecommend: true,
 
-                scoreSumAll: 0,
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
                 personCount: 300,
-                rankInGroup: 10,
+                rankInGroup: 315,
                 rankInGrade: 357,
-                allowSelect: true,
-                disabledReason: '',
+                allowSelect: false,
+                disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 302,
+                actualCount: 2,
                 approved: false,
                 forceAdjusted: false,
                 groupApprovedCount: 300,
                 groupForceAdjustedCount: 0
-              }
-            ],
-            generation: 4,
-            studentId: 1001
-          },
-          {
-            models: [
+              },
+
               {
-                scoreSumGroup: 514,
+                scoreSumGroup: 548,
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: '',
+                rankInIndicator: 10,
                 rankInDisenroll: 14,
                 isRecommend: true,
 
-                groupId: 1,
-                groupName: '物化生',
-                classCount: 6,
-                personCount: 300,
-                rankInGroup: 10,
-                rankInGrade: 357,
+                groupId: 2,
+                groupName: '物化政',
+                classCount: 4,
+                personCount: 200,
+                rankInGroup: 14,
+                rankInGrade: 62,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 2,
+                actualCount: 4,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 200,
+                groupForceAdjustedCount: 0
+              },
+
+              {
+                scoreSumGroup: 511,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 3,
+                groupName: '物化地',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 47,
+                rankInGrade: 69,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 0,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 248,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 578,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 4,
+                groupName: '历化生',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 51,
+                rankInGrade: 85,
                 allowSelect: true,
-                disabledReason: '',
+                disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 302,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 300,
+                groupApprovedCount: 246,
                 groupForceAdjustedCount: 0
-              }
-            ],
-            generation: 5,
-            studentId: 1001
-          },
-          {
-            models: [
+              },
               {
-                scoreSumGroup: 514,
+                scoreSumGroup: 513,
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: '',
+                rankInIndicator: 10,
                 rankInDisenroll: 14,
                 isRecommend: true,
 
-                groupId: 1,
-                groupName: '物化生',
-                classCount: 6,
-                personCount: 300,
-                rankInGroup: 10,
-                rankInGrade: 357,
+                groupId: 5,
+                groupName: '历化政',
+                classCount: 7,
+                personCount: 350,
+                rankInGroup: 23,
+                rankInGrade: 73,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 4,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 350,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 535,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 5,
+                groupName: '历生地',
+                classCount: 3,
+                personCount: 150,
+                rankInGroup: 43,
+                rankInGrade: 77,
                 allowSelect: true,
-                disabledReason: '',
+                disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 300,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 300,
+                groupApprovedCount: 146,
                 groupForceAdjustedCount: 0
               }
             ],
-            generation: 6,
+            generation: 4,
             studentId: 1001
           },
           {
             models: [
               {
-                scoreSumGroup: 514,
+                scoreSumGroup: 521,
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: '',
+                rankInIndicator: 10,
                 rankInDisenroll: 14,
                 isRecommend: true,
 
@@ -647,17 +711,460 @@ module.exports = [
                 groupName: '物化生',
                 classCount: 6,
                 personCount: 300,
-                rankInGroup: 10,
+                rankInGroup: 315,
                 rankInGrade: 357,
-                allowSelect: true,
-                disabledReason: '',
+                allowSelect: false,
+                disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 300,
+                actualCount: 2,
                 approved: false,
                 forceAdjusted: false,
                 groupApprovedCount: 300,
                 groupForceAdjustedCount: 0
+              },
+
+              {
+                scoreSumGroup: 548,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 2,
+                groupName: '物化政',
+                classCount: 4,
+                personCount: 200,
+                rankInGroup: 14,
+                rankInGrade: 62,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 2,
+                actualCount: 4,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 200,
+                groupForceAdjustedCount: 0
+              },
+
+              {
+                scoreSumGroup: 511,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 3,
+                groupName: '物化地',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 47,
+                rankInGrade: 69,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 0,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 248,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 578,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 4,
+                groupName: '历化生',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 51,
+                rankInGrade: 85,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 246,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 513,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 5,
+                groupName: '历化政',
+                classCount: 7,
+                personCount: 350,
+                rankInGroup: 23,
+                rankInGrade: 73,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 4,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 350,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 535,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 5,
+                groupName: '历生地',
+                classCount: 3,
+                personCount: 150,
+                rankInGroup: 43,
+                rankInGrade: 77,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 146,
+                groupForceAdjustedCount: 0
+              }
+            ],
+            generation: 5,
+            studentId: 1001
+          },
+          {
+            models: [
+              {
+                scoreSumGroup: 521,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 1,
+                groupName: '物化生',
+                classCount: 6,
+                personCount: 300,
+                rankInGroup: 315,
+                rankInGrade: 357,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 300,
+                groupForceAdjustedCount: 0
+              },
+
+              {
+                scoreSumGroup: 548,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 2,
+                groupName: '物化政',
+                classCount: 4,
+                personCount: 200,
+                rankInGroup: 14,
+                rankInGrade: 62,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 2,
+                actualCount: 1,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 200,
+                groupForceAdjustedCount: 0
+              },
+
+              {
+                scoreSumGroup: 511,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 3,
+                groupName: '物化地',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 47,
+                rankInGrade: 69,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 0,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 249,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 578,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 4,
+                groupName: '历化生',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 51,
+                rankInGrade: 85,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 249,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 513,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 5,
+                groupName: '历化政',
+                classCount: 7,
+                personCount: 350,
+                rankInGroup: 23,
+                rankInGrade: 73,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 1,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 350,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 535,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 5,
+                groupName: '历生地',
+                classCount: 3,
+                personCount: 150,
+                rankInGroup: 43,
+                rankInGrade: 77,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 150,
+                groupForceAdjustedCount: 0
+              }
+            ],
+            generation: 6,
+            studentId: 1001
+          },
+          {
+            models: [
+              {
+                scoreSumGroup: 521,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 1,
+                groupName: '物化生',
+                classCount: 6,
+                personCount: 300,
+                rankInGroup: 315,
+                rankInGrade: 357,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 300,
+                groupForceAdjustedCount: 0
+              },
+
+              {
+                scoreSumGroup: 548,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 2,
+                groupName: '物化政',
+                classCount: 4,
+                personCount: 200,
+                rankInGroup: 14,
+                rankInGrade: 62,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 2,
+                actualCount: 1,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 200,
+                groupForceAdjustedCount: 0
+              },
+
+              {
+                scoreSumGroup: 511,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 3,
+                groupName: '物化地',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 47,
+                rankInGrade: 69,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 0,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 250,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 578,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 4,
+                groupName: '历化生',
+                classCount: 5,
+                personCount: 250,
+                rankInGroup: 51,
+                rankInGrade: 85,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 250,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 513,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
+                groupId: 5,
+                groupName: '历化政',
+                classCount: 7,
+                personCount: 350,
+                rankInGroup: 23,
+                rankInGrade: 73,
+                allowSelect: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 1,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 350,
+                groupForceAdjustedCount: 0
+              },
+              {
+                scoreSumGroup: 535,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: false,
+
+                groupId: 5,
+                groupName: '历生地',
+                classCount: 3,
+                personCount: 150,
+                rankInGroup: 43,
+                rankInGrade: 77,
+                allowSelect: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 0,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 149,
+                groupForceAdjustedCount: 0
               }
             ],
             generation: 7,

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

@@ -116,8 +116,8 @@ import FinalAdjustResolverMixins
   from '@/views/system/user/profile/components/round-select-resolvers/finalAdjust-resolver-mixins'
 import FinalAdjustDMResolverMixins
   from '@/views/system/user/profile/components/round-select-resolvers/finalAdjustDM-resolver-mixins'
-import RankBalanceResolverMixins
-  from '@/views/system/user/profile/components/round-select-resolvers/rankBalance-resolver-mixins'
+import ForceAdjustResolverMixins
+  from '@/views/system/user/profile/components/round-select-resolvers/forceAdjust-resolver-mixins'
 
 export default {
 
@@ -140,7 +140,7 @@ export default {
     BackTrackingDMResolverMixins,
     FinalAdjustDMResolverMixins,
     FinalAdjustResolverMixins,
-    RankBalanceResolverMixins
+    ForceAdjustResolverMixins
   ],
   data() {
     return {
@@ -191,7 +191,7 @@ export default {
           slot: 'temp'
         },
         subjects: {
-          label: '已选专业',
+          label: '自选专业',
           slot: 'subjects',
           width: '150'
         },

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

@@ -4,7 +4,6 @@ export default {
       const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 3)
       // 激活状态的row初始化
       this.formatRows = this.generation.activeModels[activeIndex].models.map(item => {
-        item.allowSelectTips = item.allowSelect ? '报名中' : '无法报名'
         item.subjects = this.optionalMajors.filter(college => {
           if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
         }).map(item => item.majorCategoryName)
@@ -16,7 +15,10 @@ export default {
             major: item.majorCategoryName
           }
         })
-        item.applyCount = `${item.actualCount}/${item.personCount}`
+        item.applyCount = `${item.actualCount + item.groupApprovedCount}/${item.personCount}`
+        item.prmarySituation = item.actualCount + item.groupApprovedCount - item.personCount
+        item.allowSelectTips = item.prmarySituation >= 0 ? '已满' : '可报名'
+
         return item
       })
 
@@ -24,8 +26,8 @@ export default {
         applyCount:{
           label:'选科人数比'  // 初录结束的人数比
         },
-        groupIndicator:{
-          label:'超/缺'  // 初录的超缺
+        prmarySituation:{
+          label:'超/缺'  // 现阶段的超缺
         },
         rankInIndicator:{
           label:'当前组合实时排名' // 在指标内的排名

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

@@ -1,8 +1,10 @@
 export default {
   methods: {
     backTrackingDMResolver() {
-      this.formatRows = this.generation.activeModels[3].models.map(item => {
-        item.allowSelectTips = item.allowSelect ? '报名中' : '无法报名'
+      const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 4)
+      const primaryDMIndex = this.generation.activeModels.findIndex(item => item.generation == 2)
+      const primaryDMModels = this.generation.activeModels[primaryDMIndex].models
+      this.formatRows = this.generation.activeModels[activeIndex].models.map(item => {
         item.subjects = this.optionalMajors.filter(college => {
           if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
         }).map(item => item.majorCategoryName)
@@ -14,13 +16,26 @@ export default {
             major: item.majorCategoryName
           }
         })
+        // 补录结果字段
+        item.supplyRecord = `${item.groupApprovedCount + item.actualCount} / ${item.personCount}`
+        item.supplyIndicator = item.groupApprovedCount + item.actualCount-item.personCount
+        item.allowSelectTips = item.supplyIndicator >= 0 ? '已满' : '可报名'
+        // 初录的字段
+        const index = primaryDMModels.findIndex(primary => primary.groupId == item.groupId )
+        console.log(primaryDMModels)
+        console.log(index)
+
+        item.applyCount = `${primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount}/${primaryDMModels[index].personCount}`
+        item.prmarySituation = primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount - primaryDMModels[index].personCount
+
         return item
       })
+      console.log(primaryDMIndex)
       return {
         applyCount:{
           label:'初录情况'
         },
-        groupIndicator:{
+        prmarySituation:{
           label:'初录超/缺'
         },
         supplyRecord:{

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

@@ -1,6 +1,35 @@
 export default {
   methods: {
     finalAdjustResolver() {
+      const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 5)
+      const primaryDMIndex = this.generation.activeModels.findIndex(item => item.generation == 2)
+      const primaryDMModels = this.generation.activeModels[primaryDMIndex].models
+      this.formatRows = this.generation.activeModels[activeIndex].models.map(item => {
+        item.subjects = this.optionalMajors.filter(college => {
+          if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+        }).map(item => item.majorCategoryName)
+        item.colleges = this.optionalMajors.filter(college => {
+          if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+        }).map(item => {
+          return {
+            college: item.collegeName,
+            major: item.majorCategoryName
+          }
+        })
+        // 补录结果字段
+        item.supplyRecord = `${item.groupApprovedCount + item.actualCount} / ${item.personCount}`
+        item.supplyIndicator = item.groupApprovedCount + item.actualCount-item.personCount
+        item.allowSelectTips = item.supplyIndicator >=0 ? '已满' : '可报名'
+        // 初录的字段
+        const index = primaryDMModels.findIndex(primary => primary.groupId == item.groupId )
+        console.log(primaryDMModels)
+        console.log(index)
+
+        item.applyCount = `${primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount}/${primaryDMModels[index].personCount}`
+        item.prmarySituation = primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount - primaryDMModels[index].personCount
+
+        return item
+      })
       return {
         applyCount:{
           label:'初录情况'

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

@@ -1,6 +1,42 @@
 export default {
   methods: {
     finalAdjustDMResolver() {
+      const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 6)
+      const primaryDMIndex = this.generation.activeModels.findIndex(item => item.generation == 2)
+      const backDMIndex = this.generation.activeModels.findIndex(item => item.generation == 4)
+
+      const primaryDMModels = this.generation.activeModels[primaryDMIndex].models
+      const backDMModels = this.generation.activeModels[backDMIndex].models
+
+      this.formatRows = this.generation.activeModels[activeIndex].models.map(item => {
+        item.subjects = this.optionalMajors.filter(college => {
+          if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+        }).map(item => item.majorCategoryName)
+        item.colleges = this.optionalMajors.filter(college => {
+          if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+        }).map(item => {
+          return {
+            college: item.collegeName,
+            major: item.majorCategoryName
+          }
+        })
+        // 二次补录结果字段
+        item.towSupplyRecord = `${item.groupApprovedCount + item.actualCount} / ${item.personCount}`
+        item.towSupplyIndicator = item.groupApprovedCount + item.actualCount-item.personCount
+        item.allowSelectTips = item.towSupplyIndicator >=0 ? '已满' : '可报名'
+
+        // 补录结果字段
+        const supplyIndex = backDMModels.findIndex(primary => primary.groupId == item.groupId )
+        item.supplyRecord = `${backDMModels[supplyIndex].groupApprovedCount + backDMModels[supplyIndex].actualCount} / ${backDMModels[supplyIndex].personCount}`
+        item.supplyIndicator = backDMModels[supplyIndex].groupApprovedCount + backDMModels[supplyIndex].actualCount-backDMModels[supplyIndex].personCount
+
+        // 初录的字段
+        const index = primaryDMModels.findIndex(primary => primary.groupId == item.groupId )
+        item.applyCount = `${primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount}/${primaryDMModels[index].personCount}`
+        item.prmarySituation = primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount - primaryDMModels[index].personCount
+
+        return item
+      })
       return {
         applyCount:{
           label:'初录情况'

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

@@ -0,0 +1,78 @@
+export default {
+  methods: {
+    forceAdjustResolver() {
+      console.log(1111111111111111)
+      const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 7)
+      const primaryDMIndex = this.generation.activeModels.findIndex(item => item.generation == 2)
+      const backDMIndex = this.generation.activeModels.findIndex(item => item.generation == 4)
+      const towBackDMIndex = this.generation.activeModels.findIndex(item => item.generation == 6)
+
+      const primaryDMModels = this.generation.activeModels[primaryDMIndex].models
+      const backDMModels = this.generation.activeModels[backDMIndex].models
+      const towBackDMModels = this.generation.activeModels[towBackDMIndex].models
+
+      this.formatRows = this.generation.activeModels[activeIndex].models.map(item => {
+        item.subjects = this.optionalMajors.filter(college => {
+          if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+        }).map(item => item.majorCategoryName)
+        item.colleges = this.optionalMajors.filter(college => {
+          if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+        }).map(item => {
+          return {
+            college: item.collegeName,
+            major: item.majorCategoryName
+          }
+        })
+        //  调剂结果字段
+        item.adjustRecord = `${item.groupApprovedCount + item.actualCount} / ${item.personCount}`
+        item.adjustIndicator = item.groupApprovedCount + item.actualCount-item.personCount
+        item.allowSelectTips = item.adjustIndicator >=0 ? '已满' : '可报名'
+        // 二次补录结果字段
+        const towSupplyIndex = towBackDMModels.findIndex(primary => primary.groupId == item.groupId )
+
+        item.towSupplyRecord = `${towBackDMModels[towSupplyIndex].groupApprovedCount + towBackDMModels[towSupplyIndex].actualCount} / ${towBackDMModels[towSupplyIndex].personCount}`
+        item.towSupplyIndicator = towBackDMModels[towSupplyIndex].groupApprovedCount + towBackDMModels[towSupplyIndex].actualCount-towBackDMModels[towSupplyIndex].personCount
+
+
+        // 补录结果字段
+        const supplyIndex = backDMModels.findIndex(primary => primary.groupId == item.groupId )
+        item.supplyRecord = `${backDMModels[supplyIndex].groupApprovedCount + backDMModels[supplyIndex].actualCount} / ${backDMModels[supplyIndex].personCount}`
+        item.supplyIndicator = backDMModels[supplyIndex].groupApprovedCount + backDMModels[supplyIndex].actualCount-backDMModels[supplyIndex].personCount
+
+        // 初录的字段
+        const index = primaryDMModels.findIndex(primary => primary.groupId == item.groupId )
+        item.applyCount = `${primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount}/${primaryDMModels[index].personCount}`
+        item.prmarySituation = primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount - primaryDMModels[index].personCount
+
+        return item
+      })
+      return {
+        applyCount:{
+          label:'初录情况'
+        },
+        groupIndicator:{
+          label:'初录超/缺'
+        },
+        supplyRecord:{
+          label:'补录情况' // 补录情况 =
+          // groupApprovedCount(补录阶段实际报名人数) + actualCount(补录本组合已被录取人数) / personCount（设置的人数）
+        },
+        supplyIndicator:{
+          label:'补录结果' // 补录的超缺
+        },
+        towSupplyRecord:{
+          label:'二次补录情况'
+        },
+        towSupplyIndicator:{
+          label:'二次补录结果'
+        },
+        adjustRecord:{
+          label:'调剂补录情况'
+        },
+        adjustIndicator:{
+          label:'调剂补录结果'
+        }
+      }
+    }
+  }
+}

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

@@ -3,7 +3,6 @@ export default {
     primaryDMResolver() {
       const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 2)
       this.formatRows = this.generation.activeModels[activeIndex].models.map(item => {
-        item.allowSelectTips = item.allowSelect ? '报名中' : '无法报名'
         item.subjects = this.optionalMajors.filter(college => {
           if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
         }).map(item => item.majorCategoryName)
@@ -18,14 +17,16 @@ export default {
         return item
       })
       this.formatRows = this.formatRows.map(item => {
-        item.applyCount = `${item.actualCount}/${item.personCount}`
+        item.applyCount = `${item.actualCount + item.groupApprovedCount}/${item.personCount}`
+        item.prmarySituation = item.actualCount + item.groupApprovedCount - item.personCount
+        item.allowSelectTips = item.prmarySituation >= 0 ? '已满' : '可报名'
         return item
       })
       return {
         applyCount:{
           label:'选科人数比'
         },
-        groupIndicator:{
+        prmarySituation:{
           label:'超/缺'
         },
         rankInGroup:{

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

@@ -1,33 +0,0 @@
-export default {
-  methods: {
-    rankBalanceResolver() {
-      return {
-        applyCount:{
-          label:'初录情况'
-        },
-        groupIndicator:{
-          label:'初录超/缺'
-        },
-        supplyRecord:{
-          label:'补录情况' // 补录情况 =
-          // groupApprovedCount(补录阶段实际报名人数) + actualCount(补录本组合已被录取人数) / personCount（设置的人数）
-        },
-        supplyIndicator:{
-          label:'补录结果' // 补录的超缺
-        },
-        towSupplyRecord:{
-          label:'二次补录情况'
-        },
-        towSupplyIndicator:{
-          label:'二次补录结果'
-        },
-        adjustRecord:{
-          label:'调剂补录情况'
-        },
-        adjustIndicator:{
-          label:'调剂补录结果'
-        }
-      }
-    }
-  }
-}