diff --git a/dist.zip b/dist.zip index 42cfca0..88ac106 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue index 5ff73ff..3fe4388 100644 --- a/src/views/cameraManage/index.vue +++ b/src/views/cameraManage/index.vue @@ -95,13 +95,13 @@ export default { }, methods: { handleGetCameraList(pagination) { - console.log(pagination) if(pagination){ this.pagination.current = pagination.current; this.pagination.pageSize = pagination.pageSize; this.pageNum = pagination.current; this.pageSize = pagination.pageSize; } + this.request(); }, request(){ diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue index 380952c..c89bbf7 100644 --- a/src/views/historyMonitoring/index.vue +++ b/src/views/historyMonitoring/index.vue @@ -181,7 +181,8 @@ export default { }, handleSearch() { console.log(this.queryParam) - this.handleGetHistoryList() + this.pageNum = 1 + this.request() }, handleGetHistoryList(pagination) { @@ -216,12 +217,17 @@ export default { console.log(date) console.log(dateString) console.log(date[0].format('YYYY-MM-DD HH:mm')) + this.pageNum = 1 + this.queryParam.startTimestamp = date[0].format('YYYY-MM-DD HH:mm:ss') this.queryParam.endTimestamp = date[1].format('YYYY-MM-DD HH:mm:ss') }, handleReset() { this.queryParam.startTimestamp = "" this.queryParam.endTimestamp = "" + this.pageNum = 1 + this.pageSize = 10 + }, showModel(record) { this.visible = true @@ -239,6 +245,8 @@ export default { this.queryParam.endTimestamp = "" this.queryParam.orderNum = "" this.time = [] + this.pageNum = 1 + this.pageSize = 10 this.handleGetHistoryList() }, }, diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue index 0b68d77..b1d79d9 100644 --- a/src/views/roadwayManage/index.vue +++ b/src/views/roadwayManage/index.vue @@ -3,6 +3,7 @@ 新增巷道 +