选科报名mock数据

mock/modules/elective-subject.js

@@ -67,6 +67,14 @@ module.exports = [
           {
             models: [
               {
+                scoreSumGroup: 521,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
@@ -82,6 +90,133 @@ module.exports = [
                 forceAdjusted: false,
                 groupApprovedCount: 0,
                 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: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 261,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: 1,
+                actualCount: 227,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: 230,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 373,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: 89,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                groupForceAdjustedCount: 0
               }
             ],
             generation: 1,
@@ -90,20 +225,155 @@ module.exports = [
           {
             models: [
               {
+                scoreSumGroup: 521,
+                groupIndicator: 30,
+                bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: 10,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
                 personCount: 300,
-                rankInGroup: 290,
+                rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: true,
-                disabledReason: '',
+                disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 320,
                 approved: false,
                 forceAdjusted: false,
-                groupApprovedCount: 300,
+                groupApprovedCount: 0,
+                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: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 261,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: 1,
+                actualCount: 227,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: 230,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: true,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 1,
+                actualCount: 373,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
+                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: 89,
+                approved: false,
+                forceAdjusted: false,
+                groupApprovedCount: 0,
                 groupForceAdjustedCount: 0
               }
             ],
@@ -113,14 +383,14 @@ module.exports = [
           {
             models: [
               {
+                scoreSumGroup: 514,
                 groupIndicator: 30,
-                rankInIndicator: 14,
-                rankInBest: 16,
-                rankInDisenroll: 0,
                 bestInIndicator: 20,
-                scoreSumAll: 0,
-                scoreSumGroup: 514,
-                isRecommend: false,
+                rankInBest: 16,
+                rankInIndicator: 30,
+                rankInDisenroll: 14,
+                isRecommend: true,
+
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
@@ -144,14 +414,15 @@ module.exports = [
           {
             models: [
               {
+                scoreSumGroup: 514,
                 groupIndicator: 30,
-                rankInIndicator: 14,
-                rankInBest: 16,
-                rankInDisenroll: 0,
                 bestInIndicator: 20,
+                rankInBest: 16,
+                rankInIndicator: '',
+                rankInDisenroll: 14,
+                isRecommend: true,
+
                 scoreSumAll: 0,
-                scoreSumGroup: 514,
-                isRecommend: false,
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
@@ -175,14 +446,14 @@ module.exports = [
           {
             models: [
               {
+                scoreSumGroup: 514,
                 groupIndicator: 30,
-                rankInIndicator: 14,
-                rankInBest: 16,
-                rankInDisenroll: 0,
                 bestInIndicator: 20,
-                scoreSumAll: 0,
-                scoreSumGroup: 514,
-                isRecommend: false,
+                rankInBest: 16,
+                rankInIndicator: '',
+                rankInDisenroll: 14,
+                isRecommend: true,
+
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
@@ -206,14 +477,14 @@ module.exports = [
           {
             models: [
               {
+                scoreSumGroup: 514,
                 groupIndicator: 30,
-                rankInIndicator: 14,
-                rankInBest: 16,
-                rankInDisenroll: 0,
                 bestInIndicator: 20,
-                scoreSumAll: 0,
-                scoreSumGroup: 514,
-                isRecommend: false,
+                rankInBest: 16,
+                rankInIndicator: '',
+                rankInDisenroll: 14,
+                isRecommend: true,
+
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
@@ -237,14 +508,14 @@ module.exports = [
           {
             models: [
               {
+                scoreSumGroup: 514,
                 groupIndicator: 30,
-                rankInIndicator: 14,
-                rankInBest: 16,
-                rankInDisenroll: 0,
                 bestInIndicator: 20,
-                scoreSumAll: 0,
-                scoreSumGroup: 514,
-                isRecommend: false,
+                rankInBest: 16,
+                rankInIndicator: '',
+                rankInDisenroll: 14,
+                isRecommend: true,
+
                 groupId: 1,
                 groupName: '物化生',
                 classCount: 6,
@@ -266,222 +537,221 @@ module.exports = [
             studentId: 1001
           }
         ]
-
       }
     }
   },
   // 选科报名models
-  {
-    url: '/mock/front/elective/studentElectiveModels',
-    type:'get',
-    response: config => {
-      return {
-        code: '200',
-        msg: 'success',
-        data: [
-          {
-            "models": [
-              {
-                "groupId": 1,
-                "groupName": '物化生',
-                "classCount": 6,
-                "personCount": 300,
-                "rankInGroup": 290,
-                "rankInGrade": 357,
-                "allowSelect": true,
-                "disabledReason": '0',
-                "selected": false,
-                "selectedRank": 1,
-                "actualCount": 320,
-                "approved": false,
-                "forceAdjusted": false,
-                "groupApprovedCount":0,
-                "groupForceAdjustedCount": 0
-              }
-            ],
-            "generation": 1,
-            "studentId": 1001
-          },
-          {
-            "models": [
-              {
-                "groupId": 1,
-                "groupName": '物化生',
-                "classCount": 6,
-                "personCount": 300,
-                "rankInGroup": 290,
-                "rankInGrade": 357,
-                "allowSelect": true,
-                "disabledReason": '',
-                "selected": false,
-                "selectedRank": 1,
-                "actualCount": 320,
-                "approved": false,
-                "forceAdjusted": false,
-                "groupApprovedCount": 300,
-                "groupForceAdjustedCount": 0
-              }
-            ],
-            "generation": 2,
-            "studentId": 1001
-          },
-          {
-            "models": [
-              {
-                "groupIndicator":30,
-                "rankInIndicator": 14,
-                "rankInBest": 16,
-                "rankInDisenroll": 0,
-                "bestInIndicator": 20,
-                "scoreSumAll": 0,
-                "scoreSumGroup": 514,
-                "isRecommend": false,
-                "groupId": 1,
-                "groupName": '物化生',
-                "classCount": 6,
-                "personCount": 300,
-                "rankInGroup": 10,
-                "rankInGrade": 357,
-                "allowSelect": true,
-                "disabledReason": '',
-                "selected": false,
-                "selectedRank": 1,
-                "actualCount": 320,
-                "approved": false,
-                "forceAdjusted": false,
-                "groupApprovedCount": 300,
-                "groupForceAdjustedCount": 0
-              }
-            ],
-            "generation": 3,
-            "studentId": 1001
-          },
-          {
-            "models": [
-              {
-                "groupIndicator":30,
-                "rankInIndicator": 14,
-                "rankInBest": 16,
-                "rankInDisenroll": 0,
-                "bestInIndicator": 20,
-                "scoreSumAll": 0,
-                "scoreSumGroup": 514,
-                "isRecommend": false,
-                "groupId": 1,
-                "groupName": '物化生',
-                "classCount": 6,
-                "personCount": 300,
-                "rankInGroup": 10,
-                "rankInGrade": 357,
-                "allowSelect": true,
-                "disabledReason": '',
-                "selected": false,
-                "selectedRank": 1,
-                "actualCount": 302,
-                "approved": false,
-                "forceAdjusted": false,
-                "groupApprovedCount": 300,
-                "groupForceAdjustedCount": 0
-              }
-            ],
-            "generation": 4,
-            "studentId": 1001
-          },
-          {
-            "models": [
-              {
-                "groupIndicator":30,
-                "rankInIndicator": 14,
-                "rankInBest": 16,
-                "rankInDisenroll": 0,
-                "bestInIndicator": 20,
-                "scoreSumAll": 0,
-                "scoreSumGroup": 514,
-                "isRecommend": false,
-                "groupId": 1,
-                "groupName": '物化生',
-                "classCount": 6,
-                "personCount": 300,
-                "rankInGroup": 10,
-                "rankInGrade": 357,
-                "allowSelect": true,
-                "disabledReason": '',
-                "selected": false,
-                "selectedRank": 1,
-                "actualCount": 302,
-                "approved": false,
-                "forceAdjusted": false,
-                "groupApprovedCount": 300,
-                "groupForceAdjustedCount": 0
-              }
-            ],
-            "generation": 5,
-            "studentId": 1001
-          },
-          {
-            "models": [
-              {
-                "groupIndicator": 30,
-                "rankInIndicator": 14,
-                "rankInBest": 16,
-                "rankInDisenroll": 0,
-                "bestInIndicator": 20,
-                "scoreSumAll": 0,
-                "scoreSumGroup": 514,
-                "isRecommend": false,
-                "groupId": 1,
-                "groupName": '物化生',
-                "classCount": 6,
-                "personCount": 300,
-                "rankInGroup": 10,
-                "rankInGrade": 357,
-                "allowSelect": true,
-                "disabledReason": '',
-                "selected": false,
-                "selectedRank": 1,
-                "actualCount": 300,
-                "approved": false,
-                "forceAdjusted": false,
-                "groupApprovedCount": 300,
-                "groupForceAdjustedCount": 0
-              }
-            ],
-            "generation": 6,
-            "studentId": 1001
-          },
-          {
-            "models": [
-              {
-                "groupIndicator":30,
-                "rankInIndicator": 14,
-                "rankInBest": 16,
-                "rankInDisenroll": 0,
-                "bestInIndicator": 20,
-                "scoreSumAll": 0,
-                "scoreSumGroup": 514,
-                "isRecommend": false,
-                "groupId": 1,
-                "groupName": '物化生',
-                "classCount": 6,
-                "personCount": 300,
-                "rankInGroup": 10,
-                "rankInGrade": 357,
-                "allowSelect": true,
-                "disabledReason": '',
-                "selected": false,
-                "selectedRank": 1,
-                "actualCount": 300,
-                "approved": false,
-                "forceAdjusted": false,
-                "groupApprovedCount": 300,
-                "groupForceAdjustedCount": 0
-              }
-            ],
-            "generation": 7,
-            "studentId": 1001
-          }
-        ]
-      }
-    }
-  }
+  // {
+  //   url: '/mock/front/elective/studentElectiveModels',
+  //   type:'get',
+  //   response: config => {
+  //     return {
+  //       code: '200',
+  //       msg: 'success',
+  //       data: [
+  //         {
+  //           "models": [
+  //             {
+  //               "groupId": 1,
+  //               "groupName": '物化生',
+  //               "classCount": 6,
+  //               "personCount": 300,
+  //               "rankInGroup": 290,
+  //               "rankInGrade": 357,
+  //               "allowSelect": true,
+  //               "disabledReason": '0',
+  //               "selected": false,
+  //               "selectedRank": 1,
+  //               "actualCount": 320,
+  //               "approved": false,
+  //               "forceAdjusted": false,
+  //               "groupApprovedCount":0,
+  //               "groupForceAdjustedCount": 0
+  //             }
+  //           ],
+  //           "generation": 1,
+  //           "studentId": 1001
+  //         },
+  //         {
+  //           "models": [
+  //             {
+  //               "groupId": 1,
+  //               "groupName": '物化生',
+  //               "classCount": 6,
+  //               "personCount": 300,
+  //               "rankInGroup": 290,
+  //               "rankInGrade": 357,
+  //               "allowSelect": true,
+  //               "disabledReason": '',
+  //               "selected": false,
+  //               "selectedRank": 1,
+  //               "actualCount": 320,
+  //               "approved": false,
+  //               "forceAdjusted": false,
+  //               "groupApprovedCount": 300,
+  //               "groupForceAdjustedCount": 0
+  //             }
+  //           ],
+  //           "generation": 2,
+  //           "studentId": 1001
+  //         },
+  //         {
+  //           "models": [
+  //             {
+  //               "groupIndicator":30,
+  //               "rankInIndicator": 14,
+  //               "rankInBest": 16,
+  //               "rankInDisenroll": 0,
+  //               "bestInIndicator": 20,
+  //               "scoreSumAll": 0,
+  //               "scoreSumGroup": 514,
+  //               "isRecommend": false,
+  //               "groupId": 1,
+  //               "groupName": '物化生',
+  //               "classCount": 6,
+  //               "personCount": 300,
+  //               "rankInGroup": 10,
+  //               "rankInGrade": 357,
+  //               "allowSelect": true,
+  //               "disabledReason": '',
+  //               "selected": false,
+  //               "selectedRank": 1,
+  //               "actualCount": 320,
+  //               "approved": false,
+  //               "forceAdjusted": false,
+  //               "groupApprovedCount": 300,
+  //               "groupForceAdjustedCount": 0
+  //             }
+  //           ],
+  //           "generation": 3,
+  //           "studentId": 1001
+  //         },
+  //         {
+  //           "models": [
+  //             {
+  //               "groupIndicator":30,
+  //               "rankInIndicator": 14,
+  //               "rankInBest": 16,
+  //               "rankInDisenroll": 0,
+  //               "bestInIndicator": 20,
+  //               "scoreSumAll": 0,
+  //               "scoreSumGroup": 514,
+  //               "isRecommend": false,
+  //               "groupId": 1,
+  //               "groupName": '物化生',
+  //               "classCount": 6,
+  //               "personCount": 300,
+  //               "rankInGroup": 10,
+  //               "rankInGrade": 357,
+  //               "allowSelect": true,
+  //               "disabledReason": '',
+  //               "selected": false,
+  //               "selectedRank": 1,
+  //               "actualCount": 302,
+  //               "approved": false,
+  //               "forceAdjusted": false,
+  //               "groupApprovedCount": 300,
+  //               "groupForceAdjustedCount": 0
+  //             }
+  //           ],
+  //           "generation": 4,
+  //           "studentId": 1001
+  //         },
+  //         {
+  //           "models": [
+  //             {
+  //               "groupIndicator":30,
+  //               "rankInIndicator": 14,
+  //               "rankInBest": 16,
+  //               "rankInDisenroll": 0,
+  //               "bestInIndicator": 20,
+  //               "scoreSumAll": 0,
+  //               "scoreSumGroup": 514,
+  //               "isRecommend": false,
+  //               "groupId": 1,
+  //               "groupName": '物化生',
+  //               "classCount": 6,
+  //               "personCount": 300,
+  //               "rankInGroup": 10,
+  //               "rankInGrade": 357,
+  //               "allowSelect": true,
+  //               "disabledReason": '',
+  //               "selected": false,
+  //               "selectedRank": 1,
+  //               "actualCount": 302,
+  //               "approved": false,
+  //               "forceAdjusted": false,
+  //               "groupApprovedCount": 300,
+  //               "groupForceAdjustedCount": 0
+  //             }
+  //           ],
+  //           "generation": 5,
+  //           "studentId": 1001
+  //         },
+  //         {
+  //           "models": [
+  //             {
+  //               "groupIndicator": 30,
+  //               "rankInIndicator": 14,
+  //               "rankInBest": 16,
+  //               "rankInDisenroll": 0,
+  //               "bestInIndicator": 20,
+  //               "scoreSumAll": 0,
+  //               "scoreSumGroup": 514,
+  //               "isRecommend": false,
+  //               "groupId": 1,
+  //               "groupName": '物化生',
+  //               "classCount": 6,
+  //               "personCount": 300,
+  //               "rankInGroup": 10,
+  //               "rankInGrade": 357,
+  //               "allowSelect": true,
+  //               "disabledReason": '',
+  //               "selected": false,
+  //               "selectedRank": 1,
+  //               "actualCount": 300,
+  //               "approved": false,
+  //               "forceAdjusted": false,
+  //               "groupApprovedCount": 300,
+  //               "groupForceAdjustedCount": 0
+  //             }
+  //           ],
+  //           "generation": 6,
+  //           "studentId": 1001
+  //         },
+  //         {
+  //           "models": [
+  //             {
+  //               "groupIndicator":30,
+  //               "rankInIndicator": 14,
+  //               "rankInBest": 16,
+  //               "rankInDisenroll": 0,
+  //               "bestInIndicator": 20,
+  //               "scoreSumAll": 0,
+  //               "scoreSumGroup": 514,
+  //               "isRecommend": false,
+  //               "groupId": 1,
+  //               "groupName": '物化生',
+  //               "classCount": 6,
+  //               "personCount": 300,
+  //               "rankInGroup": 10,
+  //               "rankInGrade": 357,
+  //               "allowSelect": true,
+  //               "disabledReason": '',
+  //               "selected": false,
+  //               "selectedRank": 1,
+  //               "actualCount": 300,
+  //               "approved": false,
+  //               "forceAdjusted": false,
+  //               "groupApprovedCount": 300,
+  //               "groupForceAdjustedCount": 0
+  //             }
+  //           ],
+  //           "generation": 7,
+  //           "studentId": 1001
+  //         }
+  //       ]
+  //     }
+  //   }
+  // }
 ]

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

@@ -169,6 +169,9 @@ export default {
         groupName: {
           label: '选科组合'
         },
+        scoreSumGroup:{
+          label:'组合成绩'
+        },
         classCount: {
           label: '开设班级数'
         },

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

@@ -153,226 +153,7 @@ export default {
       propData: {},
       stepOptions: config.electiveGenerationOptions,
       activeStep: '',
-      generationModels: [
-        {
-          models: [
-            {
-              scoreSumGroup: 514,
-              groupIndicator: 30,
-              bestInIndicator: 20,
-              rankInBest: 16,
-              rankInIndicator: 10,
-              rankInDisenroll: 14,
-              isRecommend: true,
-
-              groupId: 1,
-              groupName: '物化生',
-              classCount: 6,
-              personCount: 300,
-              rankInGroup: 290,
-              rankInGrade: 357,
-              allowSelect: true,
-              disabledReason: '0',
-              selected: false,
-              selectedRank: 1,
-              actualCount: 320,
-              approved: false,
-              forceAdjusted: false,
-              groupApprovedCount: 0,
-              groupForceAdjustedCount: 0
-            }
-          ],
-          generation: 1,
-          studentId: 1001
-        },
-        {
-          models: [
-            {
-              scoreSumGroup: 514,
-              groupIndicator: 30,
-              bestInIndicator: 20,
-              rankInBest: 16,
-              rankInIndicator: 10,
-              rankInDisenroll: 10,
-              isRecommend: true,
-
-              groupId: 1,
-              groupName: '物化生',
-              classCount: 6,
-              personCount: 300,
-              rankInGroup: 290,
-              rankInGrade: 357,
-              allowSelect: true,
-              disabledReason: '',
-              selected: false,
-              selectedRank: 1,
-              actualCount: 320,
-              approved: false,
-              forceAdjusted: false,
-              groupApprovedCount: 300,
-              groupForceAdjustedCount: 0
-            }
-          ],
-          generation: 2,
-          studentId: 1001
-        },
-        {
-          models: [
-            {
-              scoreSumGroup: 514,
-              groupIndicator: 30,
-              bestInIndicator: 20,
-              rankInBest: 16,
-              rankInIndicator: 30,
-              rankInDisenroll: 14,
-              isRecommend: true,
-
-              groupId: 1,
-              groupName: '物化生',
-              classCount: 6,
-              personCount: 300,
-              rankInGroup: 10,
-              rankInGrade: 357,
-              allowSelect: true,
-              disabledReason: '',
-              selected: false,
-              selectedRank: 1,
-              actualCount: 320,
-              approved: false,
-              forceAdjusted: false,
-              groupApprovedCount: 300,
-              groupForceAdjustedCount: 0
-            }
-          ],
-          generation: 3,
-          studentId: 1001
-        },
-        {
-          models: [
-            {
-              scoreSumGroup: 514,
-              groupIndicator: 30,
-              bestInIndicator: 20,
-              rankInBest: 16,
-              rankInIndicator: '',
-              rankInDisenroll: 14,
-              isRecommend: true,
-
-              scoreSumAll: 0,
-              groupId: 1,
-              groupName: '物化生',
-              classCount: 6,
-              personCount: 300,
-              rankInGroup: 10,
-              rankInGrade: 357,
-              allowSelect: true,
-              disabledReason: '',
-              selected: false,
-              selectedRank: 1,
-              actualCount: 302,
-              approved: false,
-              forceAdjusted: false,
-              groupApprovedCount: 300,
-              groupForceAdjustedCount: 0
-            }
-          ],
-          generation: 4,
-          studentId: 1001
-        },
-        {
-          models: [
-            {
-              scoreSumGroup: 514,
-              groupIndicator: 30,
-              bestInIndicator: 20,
-              rankInBest: 16,
-              rankInIndicator: '',
-              rankInDisenroll: 14,
-              isRecommend: true,
-
-              groupId: 1,
-              groupName: '物化生',
-              classCount: 6,
-              personCount: 300,
-              rankInGroup: 10,
-              rankInGrade: 357,
-              allowSelect: true,
-              disabledReason: '',
-              selected: false,
-              selectedRank: 1,
-              actualCount: 302,
-              approved: false,
-              forceAdjusted: false,
-              groupApprovedCount: 300,
-              groupForceAdjustedCount: 0
-            }
-          ],
-          generation: 5,
-          studentId: 1001
-        },
-        {
-          models: [
-            {
-              scoreSumGroup: 514,
-              groupIndicator: 30,
-              bestInIndicator: 20,
-              rankInBest: 16,
-              rankInIndicator: '',
-              rankInDisenroll: 14,
-              isRecommend: true,
-
-              groupId: 1,
-              groupName: '物化生',
-              classCount: 6,
-              personCount: 300,
-              rankInGroup: 10,
-              rankInGrade: 357,
-              allowSelect: true,
-              disabledReason: '',
-              selected: false,
-              selectedRank: 1,
-              actualCount: 300,
-              approved: false,
-              forceAdjusted: false,
-              groupApprovedCount: 300,
-              groupForceAdjustedCount: 0
-            }
-          ],
-          generation: 6,
-          studentId: 1001
-        },
-        {
-          models: [
-            {
-              scoreSumGroup: 514,
-              groupIndicator: 30,
-              bestInIndicator: 20,
-              rankInBest: 16,
-              rankInIndicator: '',
-              rankInDisenroll: 14,
-              isRecommend: true,
-
-              groupId: 1,
-              groupName: '物化生',
-              classCount: 6,
-              personCount: 300,
-              rankInGroup: 10,
-              rankInGrade: 357,
-              allowSelect: true,
-              disabledReason: '',
-              selected: false,
-              selectedRank: 1,
-              actualCount: 300,
-              approved: false,
-              forceAdjusted: false,
-              groupApprovedCount: 300,
-              groupForceAdjustedCount: 0
-            }
-          ],
-          generation: 7,
-          studentId: 1001
-        }
-      ]
+      generationModels: []
     }
   },
   created() {
@@ -432,15 +213,15 @@ export default {
   },
   mounted() {
     this.loadStudentSelected()
-
+    this.getModels()
     this.getOptionalMajors()
     // this.getReportList()
     this.getRecommendMajor()
   },
   methods: {
-    getData() {
+    getModels() {
       getModels().then(res => {
-        console.log(res)
+        this.generationModels =res.data
       })
     },
     getRecommendMajor() {
@@ -449,11 +230,10 @@ export default {
       })
     },
     getReportList() {
-      getPrimaryElectivesModels().then(res => {
+      getModels().then(res => {
         this.reportInfo = res.data
         this.$refs.reportRef.init(this.reportInfo)
       })
-
     },
     getOptionalMajors() {
       getOptionalMajors().then(res => {