liuyang 5 лет назад
Родитель
Сommit
2242876a40
2 измененных файлов с 8 добавлено и 8 удалено
  1. 1 1
      frontend_web/src/api/duty.js
  2. 7 7
      frontend_web/src/views/duty/index.vue

+ 1 - 1
frontend_web/src/api/duty.js

@@ -50,5 +50,5 @@ export default {
       method: 'get',
       method: 'get',
       params: params
       params: params
     })
     })
-  }
+  },
 }
 }

+ 7 - 7
frontend_web/src/views/duty/index.vue

@@ -135,9 +135,9 @@
       <el-pagination style="margin: -10px;"
       <el-pagination style="margin: -10px;"
                      @size-change="handleSizeChange"
                      @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      @current-change="handleCurrentChange"
-                     :current-page="currpage"
+                     :current-page="search.page.current"
                      :page-sizes="[10, 15, 20]"
                      :page-sizes="[10, 15, 20]"
-                     :page-size="size"
+                     :page-size="search.page.size"
                      layout="total, sizes, prev, pager, next, jumper"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="search.page.total">
                      :total="search.page.total">
       </el-pagination>
       </el-pagination>
@@ -252,7 +252,7 @@ export default {
     // 添加 返回页面
     // 添加 返回页面
     handleCloseAdd () {
     handleCloseAdd () {
       this.$refs.editDialog.dialogvisible = false
       this.$refs.editDialog.dialogvisible = false
-      this.currpage = 1
+      this.search.page.current = 1
       this.initDatas()
       this.initDatas()
     },
     },
     // 编辑 返回页面
     // 编辑 返回页面
@@ -267,7 +267,7 @@ export default {
         _this.CalibrationTime = []
         _this.CalibrationTime = []
       }
       }
       let params = {
       let params = {
-        currentPage: this.search.page.current,
+        current: this.search.page.current,
         size: this.search.page.size,
         size: this.search.page.size,
         Year: this.search.Year,
         Year: this.search.Year,
         Term: this.search.Term,
         Term: this.search.Term,
@@ -283,11 +283,11 @@ export default {
     },
     },
     handleSizeChange (val) {
     handleSizeChange (val) {
       this.search.page.size = val
       this.search.page.size = val
-      this.search.page.currpage = 1
+      this.search.page.current = 1
       this.initDatas()
       this.initDatas()
     },
     },
     handleCurrentChange (val) {
     handleCurrentChange (val) {
-      this.page.currpage = val
+      this.search.page.current = val
       this.initDatas()
       this.initDatas()
     },
     },
     jstimehandle (val) {
     jstimehandle (val) {
@@ -360,7 +360,7 @@ export default {
       }
       }
     },
     },
     clearSearch () {
     clearSearch () {
-      this.currpage = 1
+      this.search.page.current = 1
       this.search.Year = ''
       this.search.Year = ''
       this.search.Name = ''
       this.search.Name = ''
       this.search.classification = ''
       this.search.classification = ''