选科查询-我的选科修改

mock/modules/elective-subject.js

@@ -79,7 +79,7 @@ module.exports = [
                 groupName: '物化生',
                 classCount: 6,
                 personCount: 300,
-                rankInGroup: 290,
+                rankInGroup: 315,
                 rankInGrade: 357,
                 allowSelect: true,
                 disabledReason: '0',
@@ -239,7 +239,7 @@ module.exports = [
                 personCount: 300,
                 rankInGroup: 315,
                 rankInGrade: 357,
-                allowSelect: true,
+                allowSelect: false,
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
@@ -265,10 +265,10 @@ module.exports = [
                 personCount: 200,
                 rankInGroup: 14,
                 rankInGrade: 62,
-                allowSelect: true,
+                allowSelect: false,
                 disabledReason: '0',
                 selected: false,
-                selectedRank: 1,
+                selectedRank: 2,
                 actualCount: 261,
                 approved: false,
                 forceAdjusted: false,
@@ -294,7 +294,7 @@ module.exports = [
                 allowSelect: true,
                 disabledReason: '0',
                 selected: false,
-                selectedRank: 1,
+                selectedRank: 0,
                 actualCount: 227,
                 approved: false,
                 forceAdjusted: false,
@@ -341,7 +341,7 @@ module.exports = [
                 personCount: 350,
                 rankInGroup: 23,
                 rankInGrade: 73,
-                allowSelect: true,
+                allowSelect: false,
                 disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
@@ -383,11 +383,11 @@ module.exports = [
           {
             models: [
               {
-                scoreSumGroup: 514,
+                scoreSumGroup: 521,
                 groupIndicator: 30,
                 bestInIndicator: 20,
                 rankInBest: 16,
-                rankInIndicator: 30,
+                rankInIndicator: 10,
                 rankInDisenroll: 14,
                 isRecommend: true,
 
@@ -395,16 +395,143 @@ module.exports = [
                 groupName: '物化生',
                 classCount: 6,
                 personCount: 300,
-                rankInGroup: 10,
+                rankInGroup: 315,
                 rankInGrade: 357,
-                allowSelect: true,
-                disabledReason: '',
+                allowSelect: false,
+                disabledReason: '0',
                 selected: false,
                 selectedRank: 1,
                 actualCount: 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: false,
+                disabledReason: '0',
+                selected: false,
+                selectedRank: 2,
+                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: 0,
+                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: false,
+                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
               }
             ],

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

@@ -108,7 +108,6 @@ export default {
         }
       },
       params: {
-        collect:true,
         pageNum:1,
         pageSize: 10
       }
@@ -130,7 +129,13 @@ export default {
       })
     },
     getXkcxlist() {
-      xkcxlist({ querySource: this.querySource,...this.params }).then(res => {
+      const stat = this.activeType == 0 ? {collect:true} : {isSelectCourse:true,}
+      xkcxlist({
+        querySource: this.querySource,
+        ...this.params,
+        ...stat
+
+      }).then(res => {
         this.collectList = res.rows
         console.log(res)
       })

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

@@ -1,7 +1,7 @@
 export default {
   methods: {
     backTrackingResolver() {
-      const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 1)
+      const activeIndex = this.generation.activeModels.findIndex(item => item.generation == 3)
       // 激活状态的row初始化
       this.formatRows = this.generation.activeModels[activeIndex].models.map(item => {
         item.allowSelectTips = item.allowSelect ? '报名中' : '无法报名'
@@ -16,6 +16,7 @@ export default {
             major: item.majorCategoryName
           }
         })
+        item.applyCount = `${item.actualCount}/${item.personCount}`
         return item
       })
 

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

@@ -16,6 +16,8 @@ export default {
             major: item.majorCategoryName
           }
         })
+
+
         return item
       })