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 ee7ccec9..546a3e49 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 @@ -119,7 +119,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); } @@ -131,7 +131,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); } @@ -151,7 +151,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 97723244..a6a5bd65 100644 --- a/web_src/src/components/channelList.vue +++ b/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, 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 } } )