|  | @@ -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()
 |