From 9e28923b8c1c333df8ce3caf741b0e16da2ed48a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 20 六月 2023 14:15:27 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/dialog/chooseChannel.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index be7e969..86bea83 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -8,7 +8,7 @@
<el-tab-pane label="鐩綍缁撴瀯" name="catalog">
<el-container>
<el-main v-bind:style="{backgroundColor: '#FFF', maxHeight: winHeight + 'px'}">
- <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformDeviceId=platformDeviceId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" :treeType=treeType ></chooseChannelForCatalog>
+ <chooseChannelForCatalog ref="chooseChannelForCatalog" :platformId=platformId :platformDeviceId=platformDeviceId :platformName=platformName :defaultCatalogId=defaultCatalogId :catalogIdChange="catalogIdChange" ></chooseChannelForCatalog>
</el-main>
</el-container>
</el-tab-pane>
@@ -67,14 +67,13 @@
platformName: "",
defaultCatalogId: "",
showDialog: false,
- treeType: null,
chooseData: {},
winHeight: window.innerHeight - 250,
};
},
methods: {
- openDialog(platformId, platformDeviceId, platformName, defaultCatalogId, treeType, closeCallback) {
+ openDialog(platformId, platformDeviceId, platformName, defaultCatalogId, closeCallback) {
console.log("defaultCatalogId: " + defaultCatalogId)
this.platformId = platformId
this.platformDeviceId = platformDeviceId
@@ -82,7 +81,6 @@
this.defaultCatalogId = defaultCatalogId
this.showDialog = true
this.closeCallback = closeCallback
- this.treeType = treeType
},
tabClick (tab, event){
--
Gitblit v1.8.0