From 52f9c295f90188d3346b9c129a00e817ab7f14e4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 10 六月 2023 00:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/ParentPlatformList.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 23bebdb..61e93fc 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -127,10 +127,10 @@
deletePlatformCommit: function(platform) {
var that = this;
that.$axios({
- method: 'delete',
- url:`/api/platform/delete/${platform.serverGBId}`
+ method: 'delete',
+ url:`/api/platform/delete/${platform.serverGBId}`
}).then(function (res) {
- if (res.data == "success") {
+ if (res.data.code === 0) {
that.$message({
showClose: true,
message: '鍒犻櫎鎴愬姛',
@@ -143,7 +143,8 @@
});
},
chooseChannel: function(platform) {
- this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, platform.name, platform.catalogId, platform.treeType, this.initData)
+ console.log("platform.name: " + platform.name)
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId,platform.deviceGBId, platform.name, platform.catalogId, platform.treeType, this.initData)
},
initData: function() {
this.getPlatformList();
@@ -163,8 +164,11 @@
method: 'get',
url:`/api/platform/query/${that.count}/${that.currentPage}`
}).then(function (res) {
- that.total = res.data.total;
- that.platformList = res.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.platformList = res.data.data.list;
+ }
+
}).catch(function (error) {
console.log(error);
});
--
Gitblit v1.8.0