Auto stash before merge of "master" and "origin/master"

src/modules/exam/components/CheckPaper.vue

@@ -9,6 +9,13 @@
       :titles="['备选栏', '已选栏']"
     >
     </el-transfer>
+    <el-pagination
+      :current-page.sync="page"
+      layout="total, prev, pager, next"
+      :total="total"
+      :page-size="limit"
+      @current-change="handleCurrentChange"
+    ></el-pagination>
     <el-card style="margin-top: 30px">
       <ul style="margin-top: 20px">
         <li class="paper_desc">考生的试卷会从以上已选的试卷中随机抽取</li>
@@ -31,7 +38,11 @@ import { getExamPaperList, updateExam, getExamPaperDetail } from '../api'
 export default {
   data() {
     return {
-      perPage: 20,
+      total: 0,
+      page: 1,
+      limit: 30,
+
+      // perPage: 20,
       row: {},
       ExamParerList: [],
       q: [],
@@ -49,20 +60,26 @@ export default {
   },
 
   methods: {
+    handleCurrentChange(val) {
+      // console.log(val)
+      this.page = val
+      this.getExamParerList()
+    },
     // 获取试卷列表
     getExamParerList() {
-      const params = { q: '' }
-      params['per-page'] = this.perPage
-      this.ExamParerList = []
+      const params = { q: '', page: this.page, 'per-page': this.limit }
+      // params['per-page'] = this.perPage
+      // this.ExamParerList = []
       getExamPaperList(params).then(res => {
+        this.total = res.data.total
         this.ExamParerList = res.data.list.reduce((a, b) => {
           this.ExamParerList.push({ label: b.paper_title, key: b.id })
           return this.ExamParerList
         }, [])
-        this.perPage = res.data.total
-        if (this.perPage !== res.data.list.length) {
-          this.getExamParerList()
-        }
+        // this.perPage = res.data.total
+        // if (this.perPage !== res.data.list.length) {
+        //   this.getExamParerList()
+        // }
         // this.getCheckedExam()
         if (this.$route.query.exam_id && this.$route.query.isEdit === '2') {
           this.getDetailInfo() // 获取详情