模拟志愿表格翻页

src/views/career/components/UniversitiesLine.vue

@@ -7,7 +7,7 @@
       <mx-search-group class="mb10" justify="space-between" :span="6" v-model="queryParams.name" placeholder="请输入名称" @search="toGetList"
       >
         <el-col :span="12">
-          <el-alert v-if="isThreeFormSix"  type="warning" :closable="false" show-icon>
+          <el-alert v-if="isThreeFormSix"  style="font-size: 16px;" type="warning" :closable="false" show-icon>
             新高考改革后，本省采用“院校专业”的志愿填报方式，自改革年份起的数据，请查询专业数据。
           </el-alert>
         </el-col>
@@ -95,7 +95,7 @@ export default {
 </script>
 
 <style scoped>
-/*>>> .el-form-item__label{*/
-/*  width: 120px !important;*/
-/*}*/
+>>> .el-alert .el-alert__description{
+  font-size: 15px;
+}
 </style>

src/views/career/zhiyuan/NewSimulatedVolunteer.vue

@@ -21,7 +21,7 @@
       <phase @onFillIn="onFillIn" v-if="active.index == 1" :list="zytbBatchesList" :formSubject="form"></phase>
       <recommend :batch="batch" v-if="active.index == 2" :formSubject="form"></recommend>
     </div>
-    <div class="text-center mt15">
+    <div class="text-center" style="    margin-top: 30px;">
       <el-button plain @click="toReport">查看记录</el-button>
       <el-button type="primary" @click="toBackPage" :disabled="currentStep == 0">上一步</el-button>
       <el-button type="primary" @click="next" v-if="currentStep <= 1">下一步</el-button>

src/views/career/zhiyuan/components/recommend.vue

@@ -72,6 +72,7 @@
     </div>
     <div class="zhiyuan-list">
       <zhiyuan-list :loading="loading" :tableList="rows" @apply="apply" :cols="cols" @expand="expand"></zhiyuan-list>
+      <pagination class="mt10 " :total="total" :autoScroll="false" @pagination="onChangePage" :page.sync="pageForm.pageNum" :limit.sync="pageForm.pageSize"></pagination>
     </div>
     <div :class="{'active':show,'right_cart': true}">
       <div class="btn-wrap" @click="show = !show">
@@ -172,17 +173,17 @@ export default {
       this.getCols()
     })
   },
-  mounted() {
-    let dom = document.querySelector('.el-table__body-wrapper')
-    console.log(dom)
-    dom.addEventListener('scroll', (v) => {
-      const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight
-      // 判断是否到底，可以加载下一页
-      if (scrollDistance <= 0.5) {
-        this.load()
-      }
-    })
-  },
+  // mounted() {
+  //   let dom = document.querySelector('.el-table__body-wrapper')
+  //   console.log(dom)
+  //   dom.addEventListener('scroll', (v) => {
+  //     const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight
+  //     // 判断是否到底，可以加载下一页
+  //     if (scrollDistance <= 0.5) {
+  //       this.load()
+  //     }
+  //   })
+  // },
   watch: {
     filter_form: {
       deep: true,
@@ -263,6 +264,9 @@ export default {
     }
   },
   methods: {
+    onChangePage() {
+      this.getList()
+    },
     getListByName() {
       this.filter_form.name = this.name
     },
@@ -270,23 +274,23 @@ export default {
       this.pageForm.pageNum = 1
       this.getList()
       //在执行完跳转页码的数据请求后
-      this.$nextTick(() => {
-        document.querySelector('.el-table__body-wrapper').scrollTop = 0
-      })
-    },
-    load() {
-      if (Math.ceil(this.total / this.pageForm.pageSize) > this.pageForm.pageNum) {
-        // 标识正在请求
-        // 加载下一页方法
-        if (!this.loading) {
-          //当前页数小于总页数就请求
-          this.pageForm.pageNum++ //当前页数自增
-          this.getList('push')
-        }
-      } else {
-        this.$message.warning('已经见底了 ～')
-      }
+      // this.$nextTick(() => {
+      //   document.querySelector('.el-table__body-wrapper').scrollTop = 0
+      // })
     },
+    // load() {
+    //   if (Math.ceil(this.total / this.pageForm.pageSize) > this.pageForm.pageNum) {
+    //     // 标识正在请求
+    //     // 加载下一页方法
+    //     if (!this.loading) {
+    //       //当前页数小于总页数就请求
+    //       this.pageForm.pageNum++ //当前页数自增
+    //       this.getList('push')
+    //     }
+    //   } else {
+    //     this.$message.warning('已经见底了 ～')
+    //   }
+    // },
     save() {
       const wishes = this.selectedList.map(item => {
         return {
@@ -361,7 +365,7 @@ export default {
         this.cols = res.data
       })
     },
-    getList(type) {
+    getList() {
       this.loading = true
       const data = {
         batchName: this.batch.name,
@@ -407,10 +411,6 @@ export default {
             }
           })
         }
-        if (type == 'push') {
-          this.rows.push(...rows)
-          return
-        }
         this.rows = rows
       }).finally(_ => {
         this.loading = false
@@ -559,9 +559,6 @@ em {
   line-height: 30px;
 }
 
-::v-deep .el-input {
-  width: 260px;
-}
 
 .radioInput ::v-deep {
   background-color: #ffffff;

src/views/career/zhiyuan/components/score.vue

@@ -77,7 +77,7 @@ export default {
       if(newval < 0 || newval > this.voluntaryData.maxScore)return
       this.setRankByScore()
     },
-    'form.firstSubject': function() {
+    'form.firstSubject': function(newval) {
       if(newval > this.voluntaryData.maxScore)  return
       this.setRankByScore()
     }

src/views/career/zhiyuan/components/zhiyuan-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <dynamic-table v-loading="loading" ref="table" height="800px" :rows="tableList" :columns="columns"
+  <dynamic-table v-loading="loading" ref="table" :rows="tableList" :columns="columns"
                  @expand-change="expand">
     <template #t0="{row}">
       <!--    录取概率 -->