From 8b4d8a76acf3a699744caeda8ca6f0268136727e Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期一, 11 一月 2021 17:51:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 --- web_src/src/components/channelList.vue | 5 ++--- web_src/src/components/videoList.vue | 2 +- src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 6 +++--- 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 ee7ccec..546a3e4 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 @@ @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<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online); return new PageInfo<>(all); } @@ -131,7 +131,7 @@ @Override public PageInfo<DeviceChannel> 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<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null); return new PageInfo<>(all); } @@ -151,7 +151,7 @@ */ @Override public PageInfo<Device> queryVideoDeviceList(int page, int count) { - PageHelper.startPage(page+1, count); + PageHelper.startPage(page, count); List<Device> all = deviceMapper.getDevices(); return new PageInfo<>(all); } diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index 9772324..a6a5bd6 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -153,11 +153,10 @@ }, 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 @@ 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 002a581..01dae2c 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 } } ) -- Gitblit v1.8.0