From 418970eab27d313307d60fd4f2a187efcea260ff Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期一, 01 三月 2021 18:13:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/ParentPlatformList.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 98907db..298504b 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -89,9 +89,9 @@
};
},
computed: {
-
+
getcurrentDeviceChannels: function() {
-
+
}
},
mounted() {
@@ -137,7 +137,7 @@
});
},
chooseChannel: function(platform) {
- this.$refs.chooseChannelDialog.openDialog(platform.deviceGBId, ()=>{
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, ()=>{
this.initData()
})
},
@@ -155,7 +155,7 @@
getPlatformList: function() {
let that = this;
- this.$axios.get(`/api/platforms/${that.count}/${that.currentPage - 1}`)
+ this.$axios.get(`/api/platforms/${that.count}/${that.currentPage}`)
.then(function (res) {
that.total = res.data.total;
that.platformList = res.data.list;
--
Gitblit v1.8.0