From cb897aaeed0f3a24f91dc4265b8ff0d2b31284c6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 23 四月 2023 17:35:00 +0800
Subject: [PATCH] Merge pull request #829 from kairlec/wvp-28181-2.0
---
web_src/src/components/dialog/chooseChannel.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index ad911e8..be7e969 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -1,14 +1,14 @@
<template>
-<div id="chooseChannel" v-loading="isLoging">
+<div id="chooseChannel" >
- <el-dialog title="閫夋嫨閫氶亾" v-if="showDialog" top="2rem" width="90%" :close-on-click-modal="false" :visible.sync="showDialog" :destroy-on-close="true" @close="close()">
+ <el-dialog title="閫夋嫨閫氶亾" v-loading="loading" v-if="showDialog" top="2rem" width="90%" :close-on-click-modal="false" :visible.sync="showDialog" :destroy-on-close="true" @close="close()">
<el-row>
<el-col :span="10">
<el-tabs v-model="catalogTabActiveName" >
<el-tab-pane label="鐩綍缁撴瀯" name="catalog">
<el-container>
<el-main v-bind:style="{backgroundColor: '#FFF', maxHeight: winHeight + 'px'}">
- <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" :treeType=treeType ></chooseChannelForCatalog>
+ <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformDeviceId=platformDeviceId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" :treeType=treeType ></chooseChannelForCatalog>
</el-main>
</el-container>
</el-tab-pane>
@@ -56,10 +56,11 @@
},
data() {
return {
- isLoging: false,
+ loading: false,
tabActiveName: "gbChannel",
catalogTabActiveName: "catalog",
platformId: "",
+ platformDeviceId: "",
catalogId: "",
catalogName: "",
currentCatalogId: "",
@@ -73,8 +74,10 @@
};
},
methods: {
- openDialog(platformId, platformName, defaultCatalogId, treeType, closeCallback) {
+ openDialog(platformId, platformDeviceId, platformName, defaultCatalogId, treeType, closeCallback) {
+ console.log("defaultCatalogId: " + defaultCatalogId)
this.platformId = platformId
+ this.platformDeviceId = platformDeviceId
this.platformName = platformName
this.defaultCatalogId = defaultCatalogId
this.showDialog = true
@@ -91,18 +94,17 @@
},
save: function() {
- var that = this;
this.$axios({
method:"post",
url:"/api/platform/update_channel_for_gb",
data:{
- platformId: that.platformId,
- channelReduces: that.chooseData
+ platformId: this.platformId,
+ channelReduces: this.chooseData
}
}).then((res)=>{
if (res.data.code === 0) {
- that.$message({
+ this.$message({
showClose: true,
message: '淇濆瓨鎴愬姛,',
type: 'success'
@@ -111,6 +113,7 @@
}).catch(function (error) {
console.log(error);
});
+
},
catalogIdChange: function (id, name) {
this.catalogId = id;
--
Gitblit v1.8.0