From 021b8207369ed9549c4d3c6fcb3ded2138e298ff Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: Mon, 11 Jan 2021 17:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=89=8D=E7=AB=AF=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++--- web_src/src/components/channelList.vue | 5 ++--- web_src/src/components/videoList.vue | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java index 73d4dfa3..e11c1416 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java @@ -107,7 +107,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @Override public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) { // 获取到所有正在播放的流 - PageHelper.startPage(page+1, count); + PageHelper.startPage(page, count); List all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online); return new PageInfo<>(all); } @@ -119,7 +119,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @Override public PageInfo querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) { - PageHelper.startPage(page+1, count); + PageHelper.startPage(page, count); List all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null); return new PageInfo<>(all); } @@ -139,7 +139,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { */ @Override public PageInfo queryVideoDeviceList(int page, int count) { - PageHelper.startPage(page+1, count); + PageHelper.startPage(page, count); List all = deviceMapper.getDevices(); return new PageInfo<>(all); } diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index a8392d09..4ee2b7c1 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -151,11 +151,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, @@ -252,7 +251,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, diff --git a/web_src/src/components/videoList.vue b/web_src/src/components/videoList.vue index 002a5813..01dae2c3 100644 --- a/web_src/src/components/videoList.vue +++ b/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 } } )