选课报名-分步骤选科、回显

doc/Mind/analysis.json

@@ -1,222 +1,1052 @@
-{
-  "models": [
-    {
-      "groupId": 1,
-      "groupName": "物化生",
-      "classCount": 5,
-      "personCount": 200,
-      "rankInGroup": 53,
-      "rankInGrade": 64,
-      "allowSelect": true,
-      "disabledReason": "不知道",
-      "selected": false,
-      "selectedRank": 1,
-      "scoreSumGroup": 514,
-      "groupIndicator": 30,
-      "bestInIndicator": 20,
-      "rankInBest": 16,
-      "rankInIndicator": "",
-      "rankInDisenroll": 14,
-      "isRecommend": true
-    },
-    {
-      "groupId": 2,
-      "groupName": "物化政",
-      "classCount": 4,
-      "personCount": 180,
-      "rankInGroup": 32,
-      "rankInGrade": 67,
-      "allowSelect": true,
-      "disabledReason": "不知道",
-      "selected": false,
-      "selectedRank": 2,
-      "scoreSumGroup": 578,
-      "groupIndicator": 30,
-      "bestInIndicator": 20,
-      "rankInBest": 10,
-      "rankInIndicator": "",
-      "rankInDisenroll": 14,
-      "isRecommend": false
-    },
-    {
-      "groupId": 3,
-      "groupName": "历化政",
-      "classCount": 3,
-      "personCount": 180,
-      "rankInGroup": 32,
-      "rankInGrade": 67,
-      "allowSelect": true,
-      "disabledReason": "不知道",
-      "selected": false,
-      "selectedRank": 2,
-      "scoreSumGroup": 549,
-      "groupIndicator": 30,
-      "bestInIndicator": 20,
-      "rankInBest": 4,
-      "rankInIndicator": "",
-      "rankInDisenroll": 14,
-      "isRecommend": false
-    },
-    {
-      "groupId": 4,
-      "groupName": "历化地",
-      "classCount": 4,
-      "personCount": 180,
-      "rankInGroup": 32,
-      "rankInGrade": 67,
-      "allowSelect": false,
-      "disabledReason": "不知道",
-      "selected": false,
-      "selectedRank": 2,
-      "scoreSumGroup": 478,
-      "groupIndicator": 0,
-      "bestInIndicator": 0,
-      "rankInBest": 0,
-      "rankInIndicator": "",
-      "rankInDisenroll": 0,
-      "isRecommend": false
-    }
-  ],
-  "statColumns": [
-    {
-      "name": "初录选科人数比",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": "80",
-              "description": "初录报名人数"
-            },
-            {
-              "key": "",
-              "value": "200",
-              "description": "组合设置人数"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "初录超/缺",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": "超61",
-              "description": ""
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "补录选科人数比",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": 10,
-              "description": "补录选科人数"
-            },
-            {
-              "key": "",
-              "value": 15,
-              "description": "需要补录人数"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "补录超/缺",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": "超61",
-              "description": ""
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "二次补录选科人数比",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": 10,
-              "description": "二次补录选科人数"
-            },
-            {
-              "key": "",
-              "value": 15,
-              "description": "需要二次补录人数"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "二次补录超/缺",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": "缺31",
-              "description": ""
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "调剂选科人数比",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": 10,
-              "description": "调剂选科人数"
-            },
-            {
-              "key": "",
-              "value": 15,
-              "description": "需要调剂人数"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "调剂超/缺",
-      "groupDescriptors": [
-        {
-          "groupId": 1,
-          "descriptors": [
-            {
-              "key": "",
-              "value": "缺31",
-              "description": ""
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
+[
+  {
+    "models": [
+      {
+        "scoreSumGroup": 521,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 1,
+        "groupName": "物化生",
+        "classCount": 6,
+        "personCount": 300,
+        "rankInGroup": 315,
+        "rankInGrade": 357,
+        "allowSelect": true,
+        "disabledReason": "0",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 320,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 0,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 548,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 2,
+        "groupName": "物化政",
+        "classCount": 4,
+        "personCount": 200,
+        "rankInGroup": 14,
+        "rankInGrade": 62,
+        "allowSelect": true,
+        "disabledReason": "0",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 261,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 0,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 511,
+        "groupIndicator": 0,
+        "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": 1,
+        "actualCount": 227,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 0,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 578,
+        "groupIndicator": 0,
+        "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": 230,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 0,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 513,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 5,
+        "groupName": "历化政",
+        "classCount": 7,
+        "personCount": 350,
+        "rankInGroup": 23,
+        "rankInGrade": 73,
+        "allowSelect": true,
+        "disabledReason": "0",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 373,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 0,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 535,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 6,
+        "groupName": "历生地",
+        "classCount": 3,
+        "personCount": 150,
+        "rankInGroup": 43,
+        "rankInGrade": 77,
+        "allowSelect": true,
+        "disabledReason": "0",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 89,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 0,
+        "groupForceAdjustedCount": 0
+      }
+    ],
+    "generation": 1,
+    "studentId": 1001
+  },
+  {
+    "models": [
+      {
+        "scoreSumGroup": 521,
+        "groupIndicator": 20,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 1,
+        "groupName": "物化生",
+        "classCount": 6,
+        "personCount": 300,
+        "rankInGroup": 315,
+        "rankInGrade": 357,
+        "allowSelect": false,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 300,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 548,
+        "groupIndicator": 61,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 2,
+        "groupName": "物化政",
+        "classCount": 4,
+        "personCount": 200,
+        "rankInGroup": 14,
+        "rankInGrade": 62,
+        "allowSelect": false,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 2,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 200,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 511,
+        "groupIndicator": -23,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 3,
+        "groupName": "物化地",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 47,
+        "rankInGrade": 69,
+        "allowSelect": true,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 0,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 227,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 578,
+        "groupIndicator": -20,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 4,
+        "groupName": "历化生",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 51,
+        "rankInGrade": 85,
+        "allowSelect": true,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 230,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 513,
+        "groupIndicator": 23,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 5,
+        "groupName": "历化政",
+        "classCount": 7,
+        "personCount": 350,
+        "rankInGroup": 23,
+        "rankInGrade": 73,
+        "allowSelect": false,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 350,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 535,
+        "groupIndicator": -61,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 6,
+        "groupName": "历生地",
+        "classCount": 3,
+        "personCount": 150,
+        "rankInGroup": 43,
+        "rankInGrade": 77,
+        "allowSelect": true,
+        "disabledReason": "0",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 89,
+        "groupForceAdjustedCount": 0
+      }
+    ],
+    "generation": 2,
+    "studentId": 1001
+  },
+  {
+    "models": [
+      {
+        "scoreSumGroup": 521,
+        "groupIndicator": 30,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 4,
+        "rankInDisenroll": 5,
+        "isRecommend": true,
+        "groupId": 1,
+        "groupName": "物化生",
+        "classCount": 6,
+        "personCount": 300,
+        "rankInGroup": 315,
+        "rankInGrade": 357,
+        "allowSelect": false,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 20,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 300,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 548,
+        "groupIndicator": 30,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 2,
+        "rankInDisenroll": 8,
+        "isRecommend": true,
+        "groupId": 2,
+        "groupName": "物化政",
+        "classCount": 4,
+        "personCount": 200,
+        "rankInGroup": 14,
+        "rankInGrade": 62,
+        "allowSelect": false,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 2,
+        "actualCount": 61,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 200,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 511,
+        "groupIndicator": 30,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 1,
+        "rankInDisenroll": 6,
+        "isRecommend": true,
+        "groupId": 3,
+        "groupName": "物化地",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 47,
+        "rankInGrade": 69,
+        "allowSelect": true,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 0,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 227,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 578,
+        "groupIndicator": 30,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 4,
+        "rankInDisenroll": 7,
+        "isRecommend": true,
+        "groupId": 4,
+        "groupName": "历化生",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 51,
+        "rankInGrade": 85,
+        "allowSelect": true,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 230,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 513,
+        "groupIndicator": 30,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 2,
+        "rankInDisenroll": 18,
+        "isRecommend": true,
+        "groupId": 5,
+        "groupName": "历化政",
+        "classCount": 7,
+        "personCount": 350,
+        "rankInGroup": 23,
+        "rankInGrade": 73,
+        "allowSelect": false,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 23,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 350,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 535,
+        "groupIndicator": 30,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 3,
+        "rankInDisenroll": 12,
+        "isRecommend": true,
+        "groupId": 6,
+        "groupName": "历生地",
+        "classCount": 3,
+        "personCount": 150,
+        "rankInGroup": 43,
+        "rankInGrade": 77,
+        "allowSelect": true,
+        "disabledReason": "已满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 89,
+        "groupForceAdjustedCount": 0
+      }
+    ],
+    "generation": 3,
+    "studentId": 1001
+  },
+  {
+    "models": [
+      {
+        "scoreSumGroup": 521,
+        "groupIndicator": 2,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 1,
+        "groupName": "物化生",
+        "classCount": 6,
+        "personCount": 300,
+        "rankInGroup": 315,
+        "rankInGrade": 357,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 300,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 548,
+        "groupIndicator": 4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 2,
+        "groupName": "物化政",
+        "classCount": 4,
+        "personCount": 200,
+        "rankInGroup": 14,
+        "rankInGrade": 62,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 2,
+        "actualCount": 4,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 200,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 511,
+        "groupIndicator": -2,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 3,
+        "groupName": "物化地",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 47,
+        "rankInGrade": 69,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 0,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 248,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 578,
+        "groupIndicator": -4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 4,
+        "groupName": "历化生",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 51,
+        "rankInGrade": 85,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 246,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 513,
+        "groupIndicator": 4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 5,
+        "groupName": "历化政",
+        "classCount": 7,
+        "personCount": 350,
+        "rankInGroup": 23,
+        "rankInGrade": 73,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 4,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 350,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 535,
+        "groupIndicator": -4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 6,
+        "groupName": "历生地",
+        "classCount": 3,
+        "personCount": 150,
+        "rankInGroup": 43,
+        "rankInGrade": 77,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 146,
+        "groupForceAdjustedCount": 0
+      }
+    ],
+    "generation": 4,
+    "studentId": 1001
+  },
+  {
+    "models": [
+      {
+        "scoreSumGroup": 521,
+        "groupIndicator": 2,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 1,
+        "groupName": "物化生",
+        "classCount": 6,
+        "personCount": 300,
+        "rankInGroup": 315,
+        "rankInGrade": 357,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 300,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 548,
+        "groupIndicator": 4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 2,
+        "groupName": "物化政",
+        "classCount": 4,
+        "personCount": 200,
+        "rankInGroup": 14,
+        "rankInGrade": 62,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 2,
+        "actualCount": 4,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 200,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 511,
+        "groupIndicator": -2,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 3,
+        "groupName": "物化地",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 47,
+        "rankInGrade": 69,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 0,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 248,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 578,
+        "groupIndicator": -4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 4,
+        "groupName": "历化生",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 51,
+        "rankInGrade": 85,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 246,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 513,
+        "groupIndicator": 4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 5,
+        "groupName": "历化政",
+        "classCount": 7,
+        "personCount": 350,
+        "rankInGroup": 23,
+        "rankInGrade": 73,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 4,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 350,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 535,
+        "groupIndicator": -4,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 6,
+        "groupName": "历生地",
+        "classCount": 3,
+        "personCount": 150,
+        "rankInGroup": 43,
+        "rankInGrade": 77,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 146,
+        "groupForceAdjustedCount": 0
+      }
+    ],
+    "generation": 5,
+    "studentId": 1001
+  },
+  {
+    "models": [
+      {
+        "scoreSumGroup": 521,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 1,
+        "groupName": "物化生",
+        "classCount": 6,
+        "personCount": 300,
+        "rankInGroup": 315,
+        "rankInGrade": 357,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 300,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 548,
+        "groupIndicator": 1,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 2,
+        "groupName": "物化政",
+        "classCount": 4,
+        "personCount": 200,
+        "rankInGroup": 14,
+        "rankInGrade": 62,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 2,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 201,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 511,
+        "groupIndicator": -1,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 3,
+        "groupName": "物化地",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 47,
+        "rankInGrade": 69,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 0,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 249,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 578,
+        "groupIndicator": -1,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 4,
+        "groupName": "历化生",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 51,
+        "rankInGrade": 85,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 249,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 513,
+        "groupIndicator": 1,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 5,
+        "groupName": "历化政",
+        "classCount": 7,
+        "personCount": 350,
+        "rankInGroup": 23,
+        "rankInGrade": 73,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 351,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 535,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 6,
+        "groupName": "历生地",
+        "classCount": 3,
+        "personCount": 150,
+        "rankInGroup": 43,
+        "rankInGrade": 77,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 150,
+        "groupForceAdjustedCount": 0
+      }
+    ],
+    "generation": 6,
+    "studentId": 1001
+  },
+  {
+    "models": [
+      {
+        "scoreSumGroup": 521,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 1,
+        "groupName": "物化生",
+        "classCount": 6,
+        "personCount": 300,
+        "rankInGroup": 315,
+        "rankInGrade": 357,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 300,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 548,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 2,
+        "groupName": "物化政",
+        "classCount": 4,
+        "personCount": 200,
+        "rankInGroup": 14,
+        "rankInGrade": 62,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 2,
+        "actualCount": 1,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 200,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 511,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 3,
+        "groupName": "物化地",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 47,
+        "rankInGrade": 69,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 0,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 250,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 578,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 4,
+        "groupName": "历化生",
+        "classCount": 5,
+        "personCount": 250,
+        "rankInGroup": 51,
+        "rankInGrade": 85,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 250,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 513,
+        "groupIndicator": 0,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": true,
+        "groupId": 5,
+        "groupName": "历化政",
+        "classCount": 7,
+        "personCount": 350,
+        "rankInGroup": 23,
+        "rankInGrade": 73,
+        "allowSelect": false,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 1,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 350,
+        "groupForceAdjustedCount": 0
+      },
+      {
+        "scoreSumGroup": 535,
+        "groupIndicator": -1,
+        "bestInIndicator": 20,
+        "rankInBest": 16,
+        "rankInIndicator": 10,
+        "rankInDisenroll": 14,
+        "isRecommend": false,
+        "groupId": 6,
+        "groupName": "历生地",
+        "classCount": 3,
+        "personCount": 150,
+        "rankInGroup": 43,
+        "rankInGrade": 77,
+        "allowSelect": true,
+        "disabledReason": "已报满",
+        "selected": false,
+        "selectedRank": 1,
+        "actualCount": 0,
+        "approved": false,
+        "forceAdjusted": false,
+        "groupApprovedCount": 149,
+        "groupForceAdjustedCount": 0
+      }
+    ],
+    "generation": 7,
+    "studentId": 1001
+  }
+]

mock/modules/elective-subject.js

@@ -68,7 +68,7 @@ module.exports = [
             models: [
               {
                 scoreSumGroup: 521,
-                groupIndicator: 300,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -94,7 +94,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 548,
-                groupIndicator: 200,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -120,7 +120,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 511,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -145,7 +145,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 578,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -170,7 +170,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 513,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -195,7 +195,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 535,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -226,7 +226,7 @@ module.exports = [
             models: [
               {
                 scoreSumGroup: 521,
-                groupIndicator: 30,
+                groupIndicator: 20,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -240,10 +240,10 @@ module.exports = [
                 rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 20,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
                 groupApprovedCount: 300,
@@ -252,7 +252,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 548,
-                groupIndicator: 30,
+                groupIndicator: 61,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -266,10 +266,10 @@ module.exports = [
                 rankInGroup: 14,
                 rankInGrade: 62,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 2,
-                actualCount: 61,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
                 groupApprovedCount: 200,
@@ -278,7 +278,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 511,
-                groupIndicator: 30,
+                groupIndicator: -23,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -292,7 +292,7 @@ module.exports = [
                 rankInGroup: 47,
                 rankInGrade: 69,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 0,
                 actualCount: 0,
@@ -303,7 +303,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 578,
-                groupIndicator: 30,
+                groupIndicator: -20,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -317,7 +317,7 @@ module.exports = [
                 rankInGroup: 51,
                 rankInGrade: 85,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -328,7 +328,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 513,
-                groupIndicator: 30,
+                groupIndicator: 23,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -342,18 +342,18 @@ module.exports = [
                 rankInGroup: 23,
                 rankInGrade: 73,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 73,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 300,
+                groupApprovedCount: 350,
                 groupForceAdjustedCount: 0
               },
               {
                 scoreSumGroup: 535,
-                groupIndicator: 30,
+                groupIndicator: -61,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -387,8 +387,8 @@ module.exports = [
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: 10,
-                rankInDisenroll: 14,
+                rankInIndicator: 4,
+                rankInDisenroll: 5,
                 isRecommend: true,
 
                 groupId: 1,
@@ -398,7 +398,7 @@ module.exports = [
                 rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 20,
@@ -413,8 +413,8 @@ module.exports = [
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: 10,
-                rankInDisenroll: 14,
+                rankInIndicator: 2,
+                rankInDisenroll: 8,
                 isRecommend: true,
 
                 groupId: 2,
@@ -424,7 +424,7 @@ module.exports = [
                 rankInGroup: 14,
                 rankInGrade: 62,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 2,
                 actualCount: 61,
@@ -439,8 +439,8 @@ module.exports = [
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: 10,
-                rankInDisenroll: 14,
+                rankInIndicator: 1,
+                rankInDisenroll: 6,
                 isRecommend: true,
 
                 groupId: 3,
@@ -450,7 +450,7 @@ module.exports = [
                 rankInGroup: 47,
                 rankInGrade: 69,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 0,
                 actualCount: 0,
@@ -464,8 +464,8 @@ module.exports = [
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: 10,
-                rankInDisenroll: 14,
+                rankInIndicator: 4,
+                rankInDisenroll: 7,
                 isRecommend: true,
 
                 groupId: 4,
@@ -475,7 +475,7 @@ module.exports = [
                 rankInGroup: 51,
                 rankInGrade: 85,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -489,8 +489,8 @@ module.exports = [
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: 10,
-                rankInDisenroll: 14,
+                rankInIndicator: 2,
+                rankInDisenroll: 18,
                 isRecommend: true,
 
                 groupId: 5,
@@ -500,7 +500,7 @@ module.exports = [
                 rankInGroup: 23,
                 rankInGrade: 73,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 23,
@@ -514,8 +514,8 @@ module.exports = [
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: 10,
-                rankInDisenroll: 14,
+                rankInIndicator: 3,
+                rankInDisenroll: 12,
                 isRecommend: true,
 
                 groupId: 6,
@@ -525,7 +525,7 @@ module.exports = [
                 rankInGroup: 43,
                 rankInGrade: 77,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -542,7 +542,7 @@ module.exports = [
             models: [
               {
                 scoreSumGroup: 521,
-                groupIndicator: 30,
+                groupIndicator: 2,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -556,10 +556,10 @@ module.exports = [
                 rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 2,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
                 groupApprovedCount: 300,
@@ -568,7 +568,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 548,
-                groupIndicator: 30,
+                groupIndicator: 4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -582,7 +582,7 @@ module.exports = [
                 rankInGroup: 14,
                 rankInGrade: 62,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 2,
                 actualCount: 4,
@@ -594,7 +594,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 511,
-                groupIndicator: 30,
+                groupIndicator: -2,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -608,7 +608,7 @@ module.exports = [
                 rankInGroup: 47,
                 rankInGrade: 69,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 0,
                 actualCount: 0,
@@ -619,7 +619,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 578,
-                groupIndicator: 30,
+                groupIndicator: -4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -633,7 +633,7 @@ module.exports = [
                 rankInGroup: 51,
                 rankInGrade: 85,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -644,7 +644,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 513,
-                groupIndicator: 30,
+                groupIndicator: 4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -658,7 +658,7 @@ module.exports = [
                 rankInGroup: 23,
                 rankInGrade: 73,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 4,
@@ -669,7 +669,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 535,
-                groupIndicator: 30,
+                groupIndicator: -4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -683,7 +683,7 @@ module.exports = [
                 rankInGroup: 43,
                 rankInGrade: 77,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -700,7 +700,7 @@ module.exports = [
             models: [
               {
                 scoreSumGroup: 521,
-                groupIndicator: 30,
+                groupIndicator: 2,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -714,10 +714,10 @@ module.exports = [
                 rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 2,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
                 groupApprovedCount: 300,
@@ -726,7 +726,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 548,
-                groupIndicator: 30,
+                groupIndicator: 4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -740,7 +740,7 @@ module.exports = [
                 rankInGroup: 14,
                 rankInGrade: 62,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 2,
                 actualCount: 4,
@@ -752,7 +752,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 511,
-                groupIndicator: 30,
+                groupIndicator: -2,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -766,7 +766,7 @@ module.exports = [
                 rankInGroup: 47,
                 rankInGrade: 69,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 0,
                 actualCount: 0,
@@ -777,7 +777,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 578,
-                groupIndicator: 30,
+                groupIndicator: -4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -791,7 +791,7 @@ module.exports = [
                 rankInGroup: 51,
                 rankInGrade: 85,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -802,7 +802,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 513,
-                groupIndicator: 30,
+                groupIndicator: 4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -816,7 +816,7 @@ module.exports = [
                 rankInGroup: 23,
                 rankInGrade: 73,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 4,
@@ -827,7 +827,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 535,
-                groupIndicator: 30,
+                groupIndicator: -4,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -841,7 +841,7 @@ module.exports = [
                 rankInGroup: 43,
                 rankInGrade: 77,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -858,7 +858,7 @@ module.exports = [
             models: [
               {
                 scoreSumGroup: 521,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -872,7 +872,7 @@ module.exports = [
                 rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -884,7 +884,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 548,
-                groupIndicator: 30,
+                groupIndicator: 1,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -898,19 +898,19 @@ module.exports = [
                 rankInGroup: 14,
                 rankInGrade: 62,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 2,
-                actualCount: 1,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 200,
+                groupApprovedCount: 201,
                 groupForceAdjustedCount: 0
               },
 
               {
                 scoreSumGroup: 511,
-                groupIndicator: 30,
+                groupIndicator: -1,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -924,7 +924,7 @@ module.exports = [
                 rankInGroup: 47,
                 rankInGrade: 69,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 0,
                 actualCount: 0,
@@ -935,7 +935,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 578,
-                groupIndicator: 30,
+                groupIndicator: -1,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -949,7 +949,7 @@ module.exports = [
                 rankInGroup: 51,
                 rankInGrade: 85,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -960,7 +960,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 513,
-                groupIndicator: 30,
+                groupIndicator: 1,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -974,18 +974,18 @@ module.exports = [
                 rankInGroup: 23,
                 rankInGrade: 73,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
-                actualCount: 1,
+                actualCount: 0,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 350,
+                groupApprovedCount: 351,
                 groupForceAdjustedCount: 0
               },
               {
                 scoreSumGroup: 535,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -998,8 +998,8 @@ module.exports = [
                 personCount: 150,
                 rankInGroup: 43,
                 rankInGrade: 77,
-                allowSelect: true,
-                disabledReason: '0',
+                allowSelect: false,
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -1016,7 +1016,7 @@ module.exports = [
             models: [
               {
                 scoreSumGroup: 521,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -1030,7 +1030,7 @@ module.exports = [
                 rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -1042,7 +1042,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 548,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -1056,7 +1056,7 @@ module.exports = [
                 rankInGroup: 14,
                 rankInGrade: 62,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 2,
                 actualCount: 1,
@@ -1068,7 +1068,7 @@ module.exports = [
 
               {
                 scoreSumGroup: 511,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -1082,7 +1082,7 @@ module.exports = [
                 rankInGroup: 47,
                 rankInGrade: 69,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 0,
                 actualCount: 0,
@@ -1093,7 +1093,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 578,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -1107,7 +1107,7 @@ module.exports = [
                 rankInGroup: 51,
                 rankInGrade: 85,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,
@@ -1118,7 +1118,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 513,
-                groupIndicator: 30,
+                groupIndicator: 0,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -1132,7 +1132,7 @@ module.exports = [
                 rankInGroup: 23,
                 rankInGrade: 73,
                 allowSelect: false,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 1,
@@ -1143,7 +1143,7 @@ module.exports = [
               },
               {
                 scoreSumGroup: 535,
-                groupIndicator: 30,
+                groupIndicator: -1,
                 bestInIndicator: 20,
                 rankInBest: 16,
                 rankInIndicator: 10,
@@ -1157,7 +1157,7 @@ module.exports = [
                 rankInGroup: 43,
                 rankInGrade: 77,
                 allowSelect: true,
-                disabledReason: '0',
+                disabledReason: '已报满',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 0,

src/views/career/subject/components/select-subjec-report.vue

@@ -7,7 +7,7 @@
     </div>
     <mx-table v-if="activeType == 0 || activeType == 1"  :propDefines="propDefine" :rows="collectList">
       <template #select="{ row }">
-          <i class="el-icon el-icon-success"  style="color: #42b983" v-if="row.isSelectCourse"></i>
+          <i class="el-icon el-icon-success"  style="color: #42b983" v-if="row.isSelectCourse && row.collect"></i>
           <i class="el-icon el-icon-success"  v-else></i>
       </template>
     </mx-table>
@@ -77,7 +77,7 @@ export default {
           label:'院校名称'
         },
         roundName: {
-          label:'批次',
+          label:'选科轮次',
           hidden: false
         },
         marjorName:{

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

@@ -153,6 +153,7 @@ export default {
       modelsWrapper: {},
       selectedList: [],
       singleList: [], // 单志愿列表
+      rows: []
     }
   },
   mounted() {
@@ -180,7 +181,7 @@ export default {
       }
     },
     resolveTableSuffix() {
-
+      const hidden = this.generation.active != this.generation.current
       return {
         allowSelectTips: {
           label: '报名状态'
@@ -204,11 +205,13 @@ export default {
           label: '操作',
           slot: 'signUp',
           width: '100',
-          fixed: 'right'
+          fixed: 'right',
+          hidden:hidden
         }
       }
     },
     resolveDynamicTable() {
+      if (!this.formatRows) return {}
       const options = this.generation.options
       if (!options || !this.generation.active) return {}
       const optValues = Object.values(options)
@@ -218,26 +221,28 @@ export default {
         const resolverKey = opt.key + 'Resolver'
         const resolver = this[resolverKey]
         if (typeof resolver === 'function') {
-          const genColumns = resolver(gen)
+          const genColumns = resolver(gen,this.generation.active)
           Object.assign(dynamicColumns, genColumns)
         }
       }
       console.log('resolveDynamicTable',dynamicColumns)
       return dynamicColumns
     },
+    // 初始化 rows 填充固定数据
+
     formatRows() {
+      if (!this.optionalMajors) return []
       if(!this.generation.status?.groupIds) return []
       const generationModels = this.generation.activeModels.find(item => item.generation == this.generation.active).models
       return this.generation.status.groupIds.split(',').map(groupId => {
-        console.log(groupId)
         const row = generationModels.find(item => item.groupId== groupId)
-        console.log(row)
-        row.allowSelectTips = row.allowSelect ? '报名中' : row.disabledReason
+        row.allowSelectTips = row.allowSelect ? '报名中' : row.disabledReason || '无法报名'
         row.subjects = this.optionalMajors.filter(college => {
-            if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+            if (college.matchedGroupIds.indexOf(row.groupId) != -1) return college.majorCategoryName
         }).map(item => item.majorCategoryName)
+        console.log(row.subjects)
         row.colleges = this.optionalMajors.filter(college => {
-          if (college.matchedGroupIds.indexOf(item.groupId) != -1) return college.majorCategoryName
+          if (college.matchedGroupIds.indexOf(row.groupId) != -1) return college.majorCategoryName
         }).map(item => {
           return {
               college: item.collegeName,
@@ -253,6 +258,7 @@ export default {
           allowSelectTips :row.allowSelectTips,
           colleges :row.colleges,
           subjects :row.subjects,
+          allowSelect: row.allowSelect
         }
       })
     },

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

@@ -1,44 +1,37 @@
 export default {
   methods: {
-    backTrackingResolver(gen) {
-      // const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 3)
-      // const primaryDMIndex = this.generation.activeModels.findIndex(item => item.generation == 2)
-      // const primaryDMModels = this.generation.activeModels[primaryDMIndex].models
-      // // 激活状态的row初始化
-      // 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
-      //     }
-      //   })
-      //   console.log(primaryDMModels)
-      //   const index = primaryDMModels.findIndex(primary => primary.groupId == item.groupId )
-      //   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
-      //   item.allowSelectTips = item.prmarySituation >= 0 ? '已满' : '可报名'
-      //   item.prmarySituation = item.prmarySituation >= 0 ? '' : `缺${-item.prmarySituation }`
-      //   return item
-      // })
+    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
+
+      console.log('primary',models)
+      console.log('primary',generation)
+      this.formatRows.forEach(item => {
+        const currentGroup = models.find(group => group.groupId == item.groupId)
+        console.log(currentGroup)
+        item.rankInIndicator = currentGroup.rankInIndicator
+        item.rankInDisenroll = currentGroup.rankInDisenroll
+      })
+
+
+      if(active < 4){
+        return {
+          applyCount:{
+            label:'选科人数比'
+          },
+          prmarySituation:{
+            label:'超/缺'
+          },
+          rankInGroup:{
+            label:'当前组合实时排名'
+          },
+          rankInGrade:{
+            label:'选科全校排名'
+          }
+        }
+      }else {
+        return {
 
-      return {
-        applyCount:{
-          label:'初录选科人数比'  // 初录结束的人数比
-        },
-        prmarySituation:{
-          label:'超/缺'  // 现阶段的超缺
-        },
-        rankInIndicator:{
-          label:'当前组合实时排名' // 在指标内的排名
-        },
-        rankInDisenroll:{
-          label:'选科全校排名'
         }
       }
     }

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

@@ -1,42 +1,32 @@
 export default {
   methods: {
-    backTrackingDMResolver() {
-      // 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)
-      //   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
-      //   item.prmarySituation = item.prmarySituation >= 0 ? '' : `缺${-item.prmarySituation }`
-      //   return item
-      // })
-      // console.log(primaryDMIndex)
+    backTrackingDMResolver(gen) {
+      const models = this.generation.activeModels.find(item => item.generation == gen).models
+      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
+
+      console.log('primary',models)
+      console.log('primary',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}`
+        }
+
+      })
+
+
       return {
         applyCount:{
           label:'初录情况'
         },
         prmarySituation:{
-          label:'初录超/缺'
+          label:'初录超缺'
         },
         supplyRecord:{
           label:'补录情况' // 补录情况 =

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

@@ -1,50 +1,25 @@
 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.allowSelectTips = item.allowSelect ? '可报名' : '不可报名'
-      //   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
+    finalAdjustResolver(gen) {
+      const models = this.generation.activeModels.find(item => item.generation == gen).models
+      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
+
+      console.log('primary',models)
+      console.log('primary',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}`
+      //   }
       //
-      //   // 初录的字段
-      //   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:'初录情况'
-        },
-        groupIndicator:{
-          label:'初录超/缺'
-        },
-        supplyRecord:{
-          label:'补录情况' // 补录情况 =
-          // groupApprovedCount(补录阶段实际报名人数) + actualCount(补录本组合已被录取人数) / personCount（设置的人数）
-        },
-        supplyIndicator:{
-          label:'补录结果' // 补录的超缺
-        }
       }
     }
   }

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

@@ -1,56 +1,21 @@
 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
-      // })
+    finalAdjustDMResolver(gen) {
+      const models = this.generation.activeModels.find(item => item.generation == gen).models
+      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
+      console.log('primary',models)
+      console.log('primary',generation)
+      this.formatRows.forEach(item => {
+        const currentGroup = models.find(group => group.groupId == item.groupId)
+
+        item.towSupplyIndicator = currentGroup.groupIndicator >= 0 ? `超${currentGroup.groupIndicator}` : `缺${-currentGroup.groupIndicator}`
+        if(currentGroup.groupIndicator >= 0) {
+          item.towSupplyRecord = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
+        }else {
+          item.towSupplyRecord = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
+        }
+      })
       return {
-        applyCount:{
-          label:'初录情况'
-        },
-        groupIndicator:{
-          label:'初录超/缺'
-        },
-        supplyRecord:{
-          label:'补录情况' // 补录情况 =
-          // groupApprovedCount(补录阶段实际报名人数) + actualCount(补录本组合已被录取人数) / personCount（设置的人数）
-        },
-        supplyIndicator:{
-          label:'补录结果' // 补录的超缺
-        },
         towSupplyRecord:{
           label:'二次补录情况'
         },

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

@@ -1,70 +1,21 @@
 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.allowSelectTips = item.allowSelect ? '可报名' : item.disabledReason || '不可报名'
-      //   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.groupIndicator
-      //
-      //   // 二次补录结果字段
-      //   const towSupplyIndex = towBackDMModels.findIndex(primary => primary.groupId == item.groupId )
-      //
-      //   item.towSupplyRecord = `${towBackDMModels[towSupplyIndex].groupApprovedCount + towBackDMModels[towSupplyIndex].actualCount} / ${towBackDMModels[towSupplyIndex].personCount}`
-      //   item.towSupplyIndicator = towBackDMModels[towSupplyIndex].groupIndicator
-      //
-      //
-      //   // 补录结果字段
-      //   const supplyIndex = backDMModels.findIndex(primary => primary.groupId == item.groupId )
-      //   item.supplyRecord = `${backDMModels[supplyIndex].groupApprovedCount + backDMModels[supplyIndex].actualCount} / ${backDMModels[supplyIndex].personCount}`
-      //   item.supplyIndicator = backDMModels[supplyIndex].groupIndicator
-      //   // 初录的字段
-      //   const index = primaryDMModels.findIndex(primary => primary.groupId == item.groupId )
-      //   item.applyCount = `${primaryDMModels[index].actualCount + primaryDMModels[index].groupApprovedCount}/${primaryDMModels[index].personCount}`
-      //   item.prmaryIndicator = primaryDMModels[index].groupIndicator
-      //   return item
-      // })
+    forceAdjustResolver(gen) {
+      const models = this.generation.activeModels.find(item => item.generation == gen).models
+      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
+      console.log('primary',models)
+      console.log('primary',generation)
+      this.formatRows.forEach(item => {
+        const currentGroup = models.find(group => group.groupId == item.groupId)
+
+        item.adjustIndicator = currentGroup.groupIndicator >= 0 ? `超${currentGroup.groupIndicator}` : `缺${-currentGroup.groupIndicator}`
+        if(currentGroup.groupIndicator >= 0) {
+          item.adjustRecord = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
+        }else {
+          item.adjustRecord = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
+        }
+      })
       return {
-        applyCount:{
-          label:'初录情况'
-        },
-        groupIndicator:{
-          label:'初录超/缺'
-        },
-        supplyRecord:{
-          label:'补录情况' // 补录情况 =
-          // groupApprovedCount(补录阶段实际报名人数) + actualCount(补录本组合已被录取人数) / personCount（设置的人数）
-        },
-        supplyIndicator:{
-          label:'补录结果' // 补录的超缺
-        },
-        towSupplyRecord:{
-          label:'二次补录情况'
-        },
-        towSupplyIndicator:{
-          label:'二次补录结果'
-        },
         adjustRecord:{
           label:'调剂补录情况'
         },

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

@@ -1,43 +1,38 @@
 export default {
   methods: {
-    primaryResolver(gen) {
-      // const models = this.generation.activeModels.find(item => item.generation == gen)
-      // // 激活状态的row初始化
-      // 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)
-      //   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
-      //     }
-      //   })
-      //
-      //
-      //   return item
-      // })
-      //
-      //
-      // this.formatRows = this.formatRows.map(item => {
-      //   item.applyCount = `${item.actualCount}/${item.personCount}`
-      //   return item
-      // })
+    primaryResolver(gen,active) {
+      const models = this.generation.activeModels.find(item => item.generation == gen).models
+      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
+      console.log('primary',models)
+      console.log('primary',generation)
+      this.formatRows.forEach(item => {
+        // item.applyCount = `${item.actualCount}/${item.personCount}`
+        // item.rankInGroup = item.rankInGroup
+        const currentGroup = models.find(group => group.groupId == item.groupId)
+        console.log(currentGroup)
+        item.applyCount = `${currentGroup.actualCount} /${currentGroup.personCount}`
+        item.rankInGroup = currentGroup.rankInGroup
+        item.rankInGrade = currentGroup.rankInGrade
+      })
+
+      if(active < 4){
+        return {
+          applyCount:{
+            label:'选科人数比'
+          },
+          rankInGroup:{
+            label:'当前组合实时排名'
+          },
+          rankInGrade:{
+            label:'选科全校排名'
+          }
+        }
+      }else {
+        return {
 
-      return {
-        applyCount:{
-          label:'选科人数比'
-        },
-        rankInGroup:{
-          label:'当前组合实时排名'
-        },
-        rankInGrade:{
-          label:'选科全校排名'
         }
       }
+
     }
   }
 }

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

@@ -1,41 +1,45 @@
 export default {
   methods: {
-    primaryDMResolver() {
-      // const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 2)
-      // 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
-      //     }
-      //   })
-      //   return item
-      // })
-      // this.formatRows = this.formatRows.map(item => {
-      //   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:'选科人数比'
-        },
-        prmarySituation:{
-          label:'超/缺'
-        },
-        rankInGroup:{
-          label:'当前组合实时排名'
-        },
-        rankInGrade:{
-          label:'选科全校排名'
+    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
+      console.log('primaryDM',generation)
+      console.log('primaryDM',models)
+
+      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 >= 0 ? `超${currentGroup.groupIndicator}` : `缺${-currentGroup.groupIndicator}`
+        // 录取人数加指标/ 设置人数
+        if(currentGroup.groupIndicator >= 0) {
+          item.applyCount = `${currentGroup.groupApprovedCount + currentGroup.groupIndicator} /${currentGroup.personCount}`
+        }else {
+          item.applyCount = `${currentGroup.groupApprovedCount} /${currentGroup.personCount}`
+        }
+  })
+      console.log(active)
+      if(active < 4){
+        return {
+          applyCount:{
+            label:'选科人数比'
+          },
+          prmarySituation:{
+            label:'超/缺'
+          },
+          rankInGroup:{
+            label:'当前组合实时排名'
+          },
+          rankInGrade:{
+            label:'选科全校排名'
+          }
+        }
+      }else {
+        return {
+
         }
       }
+
     }
   }
 }

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

@@ -152,6 +152,7 @@ export default {
       propData: {},
       stepOptions: config.electiveGenerationOptions,
       activeStep: '',
+      mode: [],
       generationModels: []
     }
   },
@@ -218,6 +219,7 @@ export default {
     getStudentElectiveModels() {
       getStudentElectiveModels().then(res => {
         this.generationModels =res.data
+        this.mode = res.data
       })
     },
     getRecommendMajor() {