Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/views/elective/generation/detail.vue

@@ -45,7 +45,7 @@
         </el-popover>
       </template>
     </mx-table>
-    <pagination :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
                 @pagination="loadGenerationDetails"></pagination>
     <el-dialog title="选科流程明细" v-if="logVisible" :visible.sync="logVisible" :width="logDialogWidth">
       <elective-generation-flow-log :groups="prevData.groups" :histories="logRow.histories"
@@ -166,7 +166,7 @@ export default {
       loading: false,
       requireFields: ['generationQueryCode'],
       queryParams: {
-        pageNo: 1,
+        pageNum: 1,
         pageSize: 20,
         generation: '',
         generationQueryCode: '',
@@ -186,12 +186,12 @@ export default {
   },
   methods: {
     handleQuery() {
-      this.queryParams.pageNo = 1
+      this.queryParams.pageNum = 1
       this.loadGenerationDetails()
     },
     loadGenerationDetails() {
       const params = {
-        pageNo: this.queryParams.pageNo,
+        pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,
         roundId: this.prevData.roundId,
         generation: this.queryParams.generation,
@@ -201,7 +201,7 @@ export default {
       this.loading = true
       this.majorsMap = null
       getElectiveGenerationDetails(params).then(res => {
-        this.total = res['total']
+        this.total = res['total'] || 0
         this.detailWrapper = res.data
 
         const studentIds = res.data.details?.map(d => d['studentId']).toString()