|
|
@@ -19,12 +19,11 @@
|
|
|
<div style="min-height: 400px; font-family: PingFangSC-Regular, PingFang SC, Helvetica, serif;">
|
|
|
<!-- <component :is="isComponent"></component> -->
|
|
|
<div class="list-page">
|
|
|
- <simulate-notice v-if="active == 1"></simulate-notice>
|
|
|
- <component :is="isNewCollegeEntranceExam ? 'NewFillScore' : 'FillScore'" ref="score" :isDisIndex="isDisIndex" v-if="active == 2"></component>
|
|
|
- <fill-batch @onFillIn="onFillIn" ref="batch" :zytbBatchesList="zytbBatchesList" :subject="curSubject" :isNewCollegeEntranceExam="isNewCollegeEntranceExam" :firstSubject="firstSubject" :lastSubject="lastSubject" :score="curScore" v-if="active == 3"></fill-batch>
|
|
|
- <fill-major ref="major" :batch="curBatch" :batchInfo="curBatchInfo" :subject="curSubject" :score="curScore" :isNewCollegeEntranceExam="isNewCollegeEntranceExam" :firstSubject="firstSubject" :lastSubject="lastSubject" :year="curBatchInfo.year" v-if="active == 4"></fill-major>
|
|
|
+ <component :is="isNewCollegeEntranceExam ? 'NewFillScore' : 'FillScore'" ref="score" :isDisIndex="isDisIndex" v-if="active == 1"></component>
|
|
|
+ <fill-batch @onFillIn="onFillIn" ref="batch" :zytbBatchesList="zytbBatchesList" :subject="curSubject" :isNewCollegeEntranceExam="isNewCollegeEntranceExam" :firstSubject="firstSubject" :lastSubject="lastSubject" :score="curScore" v-if="active == 2"></fill-batch>
|
|
|
+ <fill-major ref="major" :batch="curBatch" :batchInfo="curBatchInfo" :subject="curSubject" :score="curScore" :isNewCollegeEntranceExam="isNewCollegeEntranceExam" :firstSubject="firstSubject" :lastSubject="lastSubject" :year="curBatchInfo.year" v-if="active == 3"></fill-major>
|
|
|
|
|
|
- <div class="success-complete" v-if="active == 5">
|
|
|
+ <div class="success-complete" v-if="active == 4">
|
|
|
<div class="text">填报完成</div>
|
|
|
<img src="@/assets/images/career/icon_data.png" alt="" />
|
|
|
<div style="margin-top: 20px">
|
|
|
@@ -35,11 +34,11 @@
|
|
|
</div>
|
|
|
<el-divider></el-divider>
|
|
|
<!-- 底部按钮-->
|
|
|
- <div style="text-align: center; margin-top: 30px" v-if="active != 5">
|
|
|
+ <div style="text-align: center; margin-top: 30px" v-if="active != 4">
|
|
|
<el-button @click="goVolunteerList">查看记录</el-button>
|
|
|
<el-button type="primary" @click="toBackPage" :disabled="active == 1">上一步</el-button>
|
|
|
- <el-button type="primary" v-if="active < 3" :disabled="active == 5" @click="nextStep">下一步</el-button>
|
|
|
- <el-button type="primary" v-if="active >= 3" @click="saveData()">保存志愿</el-button>
|
|
|
+ <el-button type="primary" v-if="active < 2" :disabled="active == 4" @click="nextStep">下一步</el-button>
|
|
|
+ <el-button type="primary" v-if="active >= 2" @click="saveData()">保存志愿</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -70,11 +69,11 @@ export default {
|
|
|
firstSubject: "",
|
|
|
lastSubject: [],
|
|
|
topStep: [
|
|
|
- { index: 1, label: "填报须知" },
|
|
|
- { index: 2, label: "高考分数" },
|
|
|
- { index: 3, label: "填报批次" },
|
|
|
- { index: 4, label: "院校专业" },
|
|
|
- { index: 5, label: "保存志愿" },
|
|
|
+ // { index: 1, label: "填报须知" },
|
|
|
+ { index: 1, label: "高考分数" },
|
|
|
+ { index: 2, label: "填报批次" },
|
|
|
+ { index: 3, label: "院校专业" },
|
|
|
+ { index: 4, label: "保存志愿" },
|
|
|
],
|
|
|
};
|
|
|
},
|
|
|
@@ -104,7 +103,7 @@ export default {
|
|
|
onFillIn(item) {
|
|
|
this.curBatch = item.batch;
|
|
|
this.curBatchInfo = item;
|
|
|
- this.active = 4;
|
|
|
+ this.active = 3;
|
|
|
},
|
|
|
onChangeInputScore(e) {
|
|
|
console.log(e);
|
|
|
@@ -135,7 +134,7 @@ export default {
|
|
|
mode: this.curSubject || [this.firstSubject, ...this.lastSubject].toString(),
|
|
|
score: this.curScore,
|
|
|
};
|
|
|
- if (this.active == 4) {
|
|
|
+ if (this.active == 3) {
|
|
|
let wishe = [];
|
|
|
let dataList = this.$refs.major.dataList;
|
|
|
let len = dataList.length;
|
|
|
@@ -173,19 +172,16 @@ export default {
|
|
|
},
|
|
|
httpSave(req) {
|
|
|
zytbSave(req).then((res) => {
|
|
|
- this.active = 5;
|
|
|
+ this.active = 4;
|
|
|
});
|
|
|
},
|
|
|
nextStep() {
|
|
|
let self = this;
|
|
|
- if (this.active >= 5) {
|
|
|
+ if (this.active >= 4) {
|
|
|
return;
|
|
|
}
|
|
|
switch (this.active) {
|
|
|
case 1:
|
|
|
- self.active = 2;
|
|
|
- break;
|
|
|
- case 2:
|
|
|
let score = self.$refs.score;
|
|
|
if (this.isNewCollegeEntranceExam) {
|
|
|
//console.log(111111111);
|
|
|
@@ -214,7 +210,7 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
this.httpzytbBatches(() => {
|
|
|
- self.active = 3;
|
|
|
+ self.active = 2;
|
|
|
});
|
|
|
break;
|
|
|
}
|
shilipojs