Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/common/mx-const.js

@@ -71,7 +71,7 @@ export default {
       knowledge: 3    // 知识兴趣
     },
     electivePermission: {
-      studentApplyCount: 'elective:student:apply:applyCount', //初录选科人数比 elective:student:apply:scoreByGroup
+      applyCount: 'elective:student:apply:applyCount', //初录选科人数比 elective:student:apply:scoreByGroup
       scoreByGroup: 'elective:student:apply:scoreByGroup', // 组合成绩
       rankInGroup: 'elective:student:apply:rankInGroup', // 当前组合实时排名
       rankInGrade: 'elective:student:apply:rankInGrade', // 当前组合全校排名

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

@@ -26,7 +26,7 @@
       </template>
       <template #colleges="{row}">
         <el-row>
-          <el-col :span="12" v-for="college in row.colleges">
+          <el-col :span="12" v-for="college in row.colleges" class="mb10 ai-center fx-row">
             <el-popover
               placement="top"
               popper-class="zero-padding-popover"
@@ -35,10 +35,10 @@
               <div class="fx-column">
                 <el-button plain type="text">{{ college.major }}</el-button>
               </div>
-              <el-tag type="success" slot="reference" class="mr10 mb10">{{ college.major[0] }}</el-tag>
+              <el-tag type="success" slot="reference" class="mr10">{{ college.major[0] }}</el-tag>
             </el-popover>
             :
-            <span>{{ college.college }}</span>
+            <span class="text-ellipsis" :title="college.college">{{ college.college }}</span>
           </el-col>
         </el-row>
       </template>
@@ -69,7 +69,7 @@ export default {
     }
   },
   created() {
-    const optionalMajors = this.optionalMajorsoptionalMajors
+    const optionalMajors = this.optionalMajors
     // 初始化rows 当前activeModels
     this.rows = this.generation.activeModel.models.map(row => {
       row.colleges = optionalMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName }))

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

@@ -59,7 +59,7 @@
       </template>
       <template #colleges="{row}">
         <el-row>
-          <el-col :span="12" v-for="college in row.colleges">
+          <el-col :span="12" v-for="college in row.colleges" class="mb10 ai-center fx-row">
             <el-popover
               placement="top"
               popper-class="zero-padding-popover"
@@ -68,10 +68,10 @@
               <div class="fx-column">
                 <el-button plain type="text">{{ college.major }}</el-button>
               </div>
-              <el-tag type="success" slot="reference" class="mr10 mb10">{{ college.major[0] }}</el-tag>
+              <el-tag type="success" slot="reference" class="mr10">{{ college.major[0] }}</el-tag>
             </el-popover>
             :
-            <span>{{ college.college }}</span>
+            <span class="text-ellipsis" :title="college.college">{{ college.college }}</span>
           </el-col>
         </el-row>
       </template>
@@ -145,6 +145,8 @@ import EsignDialog from '@/views/system/user/profile/components/esign-dialog'
 import ReportStep from './report-step'
 import OverUnderBadge from '@/views/elective/publish/components/steps/fauclty/over-under-badge'
 import { rejectRecommend, submitElectiveModels } from '@/api/webApi/elective/selected-subject'
+import consts from '@/common/mx-const'
+import { mapGetters } from 'vuex'
 import ElectiveEnrollInfo from '@/views/system/user/profile/components/elective-enroll-info'
 
 const resolverModules = require.context('./round-select-resolvers', false, /\.js$/)
@@ -183,6 +185,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['hasPermissions']),
     enrollInfoVisible() {
       return this.generation.active > this.generation.options.primary.value
     },
@@ -306,7 +309,8 @@ export default {
           width: '85px'
         },
         scoreSumGroup: {
-          label: '组合成绩'
+          label: '组合成绩',
+          hidden: this.hasPermissions([consts.enum.electivePermission.rankInGroup.scoreByGroup])
         },
         classCount: {
           label: '开设班级数'
@@ -324,9 +328,11 @@ export default {
       return {
         rankInGroup: {
           label: '当前组合实时排名',
+          hidden: this.hasPermissions([consts.enum.electivePermission.rankInGroup])
         },
         rankInGrade: {
-          label: '选科全校排名'
+          label: '选科全校排名',
+          hidden: this.hasPermissions([consts.enum.electivePermission.rankInGrade])
         },
         allowSelectTips: {
           label: '报名状态'

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

@@ -1,10 +1,4 @@
-import { mapGetters } from 'vuex'
-import consts from '@/common/mx-const'
-
 export default {
-  computed: {
-    ...mapGetters(['hasPermissions'])
-  },
   methods: {
     backTrackingResolver(gen, active,context) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
@@ -16,8 +10,7 @@ export default {
       if (active < 4) {
         return {
           backTrackingApply: {
-            label: '补录报名情况',
-            hidden: this.hasPermissions([consts.enum.electivePermission.studentApplyCount])
+            label: '补录报名情况'
           }
         }
       } else {

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

@@ -1,4 +1,10 @@
+import consts from '@/common/mx-const'
+import { mapGetters } from 'vuex'
+
 export default {
+  computed: {
+    ...mapGetters(['hasPermissions'])
+  },
   methods: {
     primaryResolver(gen, active) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
@@ -11,7 +17,8 @@ export default {
       if(active < 4){
         return {
           applyCount:{
-            label:'选科人数比'
+            label:'选科人数比',
+            hidden: this.hasPermissions([consts.enum.electivePermission.applyCount])
           }
         }
       }else {

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

@@ -20,7 +20,7 @@
     </el-card>
     <!--  自选专业 推荐专业  -->
     <select-subject class="mt20" :evaluationMajors="evaluationMajors" :optionalMajors="optionalMajors"
-                    :list="roundGroups"></select-subject>
+                    :list="activeModel ? activeModel.models : []"></select-subject>
     <!--  选科报名表  -->
     <el-card class="box-card mt20">
       <template #header>