Commit 8b4d8a76acf3a699744caeda8ca6f0268136727e
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
Showing
3 changed files
with
6 additions
and
7 deletions
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
| ... | ... | @@ -119,7 +119,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { |
| 119 | 119 | @Override |
| 120 | 120 | public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) { |
| 121 | 121 | // 获取到所有正在播放的流 |
| 122 | - PageHelper.startPage(page+1, count); | |
| 122 | + PageHelper.startPage(page, count); | |
| 123 | 123 | List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online); |
| 124 | 124 | return new PageInfo<>(all); |
| 125 | 125 | } |
| ... | ... | @@ -131,7 +131,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { |
| 131 | 131 | |
| 132 | 132 | @Override |
| 133 | 133 | public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) { |
| 134 | - PageHelper.startPage(page+1, count); | |
| 134 | + PageHelper.startPage(page, count); | |
| 135 | 135 | List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null); |
| 136 | 136 | return new PageInfo<>(all); |
| 137 | 137 | } |
| ... | ... | @@ -151,7 +151,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { |
| 151 | 151 | */ |
| 152 | 152 | @Override |
| 153 | 153 | public PageInfo<Device> queryVideoDeviceList(int page, int count) { |
| 154 | - PageHelper.startPage(page+1, count); | |
| 154 | + PageHelper.startPage(page, count); | |
| 155 | 155 | List<Device> all = deviceMapper.getDevices(); |
| 156 | 156 | return new PageInfo<>(all); |
| 157 | 157 | } | ... | ... |
web_src/src/components/channelList.vue
| ... | ... | @@ -153,11 +153,10 @@ export default { |
| 153 | 153 | }, |
| 154 | 154 | getDeviceChannelList: function () { |
| 155 | 155 | let that = this; |
| 156 | - console.log(this.currentPage - 1) | |
| 157 | 156 | |
| 158 | 157 | this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, { |
| 159 | 158 | params: { |
| 160 | - page: that.currentPage - 1, | |
| 159 | + page: that.currentPage, | |
| 161 | 160 | count: that.count, |
| 162 | 161 | query: that.searchSrt, |
| 163 | 162 | online: that.online, |
| ... | ... | @@ -254,7 +253,7 @@ export default { |
| 254 | 253 | |
| 255 | 254 | this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, { |
| 256 | 255 | params: { |
| 257 | - page: that.currentPage - 1, | |
| 256 | + page: that.currentPage, | |
| 258 | 257 | count: that.count, |
| 259 | 258 | query: that.searchSrt, |
| 260 | 259 | online: that.online, | ... | ... |
web_src/src/components/videoList.vue