Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

web_src/src/components/channelList.vue

@@ -153,11 +153,10 @@ export default {
         },
         getDeviceChannelList: function () {
             let that = this;
-            console.log(this.currentPage - 1)
 
             this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, {
                     params: {
-                        page: that.currentPage - 1,
+                        page: that.currentPage,
                         count: that.count,
                         query: that.searchSrt,
                         online: that.online,
@@ -254,7 +253,7 @@ export default {
 
             this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
                     params: {
-                        page: that.currentPage - 1,
+                        page: that.currentPage,
                         count: that.count,
                         query: that.searchSrt,
                         online: that.online,

web_src/src/components/videoList.vue

@@ -134,7 +134,7 @@
 				this.getDeviceListLoading = true;
 				this.$axios.get(`/api/devices`,{
 					params: {
-						page: that.currentPage - 1,
+						page: that.currentPage,
 						count: that.count
 					}
 				} )