Przeglądaj źródła

选科报名表bug 修复

shilipojs 2 lat temu
rodzic
commit
2e9a080f8c

+ 1 - 1
src/views/career/vocation/new-detail.vue

@@ -172,7 +172,7 @@
 </template>
 <script>
 import MxChart from '@/components/MxChart/index'
-import { vocationalPostsDetail,vocationalPosts } from '@/api/webApi/vocation'
+import { vocationalPostsDetail,vocationalPosts,vocationalOverview } from '@/api/webApi/vocation'
 import MxVocationTranslateMixin from '@/components/Cache/modules/mx-vocation-translate-mixin'
 
 export default {

+ 1 - 0
src/views/elective/generation/components/elective-generation-steps.vue

@@ -103,6 +103,7 @@ export default {
   },
   methods: {
     handleStepChange(step) {
+      console.log(step)
       const target = step.value
       this.generation.hiddenGenerations.remove(target) // force display
       if (target != this.activeStep) {

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

@@ -18,23 +18,22 @@
         </el-col>
       </el-row>
     </el-card>
-    <!--  自选专业 推荐专业  -->
-    <div v-if="allowSelect" >
+    <div v-if="allowSelect">
+      <!--  自选专业 推荐专业  -->
       <select-subject class="mt20" :evaluationMajors="evaluationMajors" :optionalMajors="optionalMajors"
                       :list="activeModel ? activeModel.models : []"></select-subject>
       <!--  选科报名表  -->
       <el-card class="box-card mt20" >
         <template #header>
-          <elective-generation-steps v-if="selectObj" :generation="generation"
-                                     disable-hidden-feature></elective-generation-steps>
+          <elective-generation-steps v-model="activeStep"  v-if="selectObj" :generation="generation"
+                                     disable-hidden-feature ></elective-generation-steps>
         </template>
         <report-table v-if="activeModel&&activeModel.models" :generation="generation"
                       :optional-majors="optionalMajors"></report-table>
         <evaluation-empty v-else :shadow="false" :title="emptyTitle"></evaluation-empty>
       </el-card>
     </div>
-
-    <evaluation-empty v-else class="mt20" title="选科未开启"></evaluation-empty>
+    <evaluation-empty class="mt20" v-else :shadow="false" title="暂未开启选科"></evaluation-empty>
     <el-card class="mt20">
       <template #header>选科报告</template>
       <el-button v-if="false" @click="goReportDemo">选科报告1</el-button>
@@ -194,7 +193,8 @@ export default {
         status.preferenceCount = res.data.preferenceCount || 3
         this.selectObj = res.data['selectResult']
         this.allowSelect = res.data.allowSelect
-        if(this.allowSelect){
+        if(this.allowSelect || res.data.currentGeneration >= 7) {
+          this.allowSelect  = true
           this.loadStudentElectiveModels()
           this.getOptionalMajors()
           this.getRecommendMajor()