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 | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index a8392d0..a6a5bd6 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -31,6 +31,8 @@
<el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
<el-table-column prop="channelId" label="閫氶亾缂栧彿" width="210">
</el-table-column>
+ <el-table-column prop="channelId" label="璁惧缂栧彿" width="210">
+ </el-table-column>
<el-table-column prop="name" label="閫氶亾鍚嶇О">
</el-table-column>
<el-table-column prop="subCount" label="瀛愯妭鐐规暟">
@@ -151,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,
@@ -252,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,
--
Gitblit v1.8.0