Merge branch 'dev' into 'master'

历史数据翻页bug

See merge request duoji/duoji-frontend!1

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(){

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()
         },
     },

src/views/roadwayManage/index.vue

@@ -3,6 +3,7 @@
         <a-button type="primary" class="add" @click="showModel('add','')">
             新增巷道
         </a-button>
+        
         <a-table
          style="margin-top:40px"
             :columns="columns"

src/views/videoWall/index.vue

@@ -110,8 +110,8 @@ export default {
                         let idName = rowIndex + "-" + columnIndex;
                         console.log("idName:"+idName);
                         let video = document.getElementById(idName);
-                        let player = new WebRtcPlayer(video,"camera"+cameras[i].id);
+                        let player = new WebRtcPlayer(video,"camera"+cameras[i-1].id);
-                        player.play('camera'+cameras[i].id);
+                        player.play('camera'+cameras[i-1].id);
 
                     }
                 }