|
|
@@ -3,11 +3,12 @@
|
|
|
<div class="zhiyuan-filter">
|
|
|
<div class="header">
|
|
|
<h3 class="f-666">您的选考科目为：<em>{{ formSubject.firstSubject }}<em v-for="item in formSubject.lastSubject"
|
|
|
- >,{{ item }}</em> </em>， 请手动选择志愿</h3>
|
|
|
+ >,{{ item }}</em> </em>， <span class="mr20">总分：<em class="f-primary">{{ formSubject.score }}</em></span>
|
|
|
+ <span class="mr20">位次：<em class="f-primary">{{ formSubject.rank.lowestRank }}</em></span>请手动选择志愿</h3>
|
|
|
</div>
|
|
|
<div class="filters">
|
|
|
<!-- 院校筛选条件 -->
|
|
|
- <filter-form :filter="filter_form"></filter-form>
|
|
|
+ <filter-form :filter="filter_form" :levelHide="true"></filter-form>
|
|
|
<!--其他筛选 -->
|
|
|
<el-row class="radioInput">
|
|
|
<div>
|
|
|
@@ -54,7 +55,7 @@
|
|
|
<div class="tags" style="width: 100%">
|
|
|
<el-tag @close="handleClose(item)" type="success" class="mr5 mb5" closable v-for="item in checkedListName">{{item.name}}</el-tag>
|
|
|
</div>
|
|
|
- <el-button plain size="mini" @click="getList">确认</el-button>
|
|
|
+ <el-button plain size="mini" @click="confirm">确认</el-button>
|
|
|
<el-button plain size="mini" @click="clear">清除</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -73,7 +74,6 @@
|
|
|
<div class="head-college f16">
|
|
|
<el-tag type="success" size="mini" class="mr12">{{ collegeIndex + 1 }}</el-tag>
|
|
|
{{ `${college.university.name}(${college.recruitPlan.collegeCode })` }}
|
|
|
- <i class="el-icon-delete delete-icon"></i>
|
|
|
</div>
|
|
|
<div class="majors f12">
|
|
|
<div class="major mt10" v-for="(major,majorIndex) in college.majors">
|
|
|
@@ -120,7 +120,6 @@ export default {
|
|
|
location:'',
|
|
|
natureTypeCN:'',
|
|
|
type:'',
|
|
|
- level:'',
|
|
|
features:'',
|
|
|
pickType:'',
|
|
|
},
|
|
|
@@ -129,9 +128,9 @@ export default {
|
|
|
show: false,
|
|
|
localFilters: {
|
|
|
picks: [
|
|
|
- { label: '冲刺型', value: '0' },
|
|
|
- { label: '稳妥型', value: '1' },
|
|
|
- { label: '保守型', value: '2' }
|
|
|
+ { label: '冲刺型', value:0 },
|
|
|
+ { label: '稳妥型', value:1 },
|
|
|
+ { label: '保守型', value:2 }
|
|
|
]
|
|
|
},
|
|
|
pageForm: {
|
|
|
@@ -159,7 +158,7 @@ export default {
|
|
|
const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
|
|
|
console.log('scrollDistance',scrollDistance)
|
|
|
// 判断是否到底，可以加载下一页
|
|
|
- if (scrollDistance <= 10) {
|
|
|
+ if (scrollDistance <= 0.5) {
|
|
|
this.load()
|
|
|
}
|
|
|
});
|
|
|
@@ -168,7 +167,7 @@ export default {
|
|
|
filter_form:{
|
|
|
deep:true,
|
|
|
handler(){
|
|
|
- this.getList()
|
|
|
+ this.confirm()
|
|
|
}
|
|
|
},
|
|
|
selectedList:{
|
|
|
@@ -232,10 +231,13 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
+ confirm() {
|
|
|
+ this.pageForm.pageNum = 1
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
load() {
|
|
|
if (Math.ceil(this.total / this.pageForm.pageSize) > this.pageForm.pageNum) {
|
|
|
// 标识正在请求
|
|
|
-
|
|
|
// 加载下一页方法
|
|
|
if(!this.loading){
|
|
|
//当前页数小于总页数就请求
|
|
|
@@ -262,6 +264,10 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
+ if(wishes.length < 3) {
|
|
|
+ this.$message.warning('至少选择三个专业组')
|
|
|
+ return
|
|
|
+ }
|
|
|
const data = {
|
|
|
batch: this.batch.batch,
|
|
|
detail:{
|
|
|
@@ -316,6 +322,7 @@ export default {
|
|
|
this.loading = true
|
|
|
const data = {
|
|
|
batchName: this.batch.name,
|
|
|
+ batch: this.batch.batch,
|
|
|
majors: this.checkedList,
|
|
|
mode: `${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
|
|
|
// mode1: string,
|
