From 509d9b3cbba7ba8fdc7466c34e46db70d41517a8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 二月 2024 10:22:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
web_src/src/components/dialog/chooseChannelForCatalog.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannelForCatalog.vue b/web_src/src/components/dialog/chooseChannelForCatalog.vue
old mode 100644
new mode 100755
index 4303a2f..ae79e64
--- a/web_src/src/components/dialog/chooseChannelForCatalog.vue
+++ b/web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -28,7 +28,7 @@
</span>
</el-tree>
</div>
- <catalogEdit ref="catalogEdit" :platformId="platformId"></catalogEdit>
+ <catalogEdit ref="catalogEdit" :platformId="platformId" :platformDeviceId="platformDeviceId"></catalogEdit>
</div>
</template>
@@ -38,7 +38,7 @@
import catalogEdit from './catalogEdit.vue'
export default {
name: 'chooseChannelForCatalog',
- props: ['platformId', 'platformName', 'defaultCatalogId', 'catalogIdChange', 'treeType'],
+ props: ['platformId', 'platformDeviceId', 'platformName', 'defaultCatalogId', 'catalogIdChange'],
created() {
this.chooseId = this.defaultCatalogId;
this.defaultCatalogIdSign = this.defaultCatalogId;
@@ -101,9 +101,10 @@
},
addCatalog: function (parentId, node){
let that = this;
- console.log(this.treeType)
+ console.log(this.platformId)
+ console.log(parentId)
// 鎵撳紑娣诲姞寮圭獥
- that.$refs.catalogEdit.openDialog(false, null, null, parentId, this.treeType, node.level, ()=>{
+ that.$refs.catalogEdit.openDialog(false, null, null, parentId, node.level, ()=>{
node.loaded = false
node.expand();
});
@@ -171,6 +172,7 @@
});
},
loadNode: function(node, resolve){
+ console.log("this.platformDeviceId锛� " + this.platformDeviceId)
if (node.level === 0) {
resolve([
{
@@ -179,7 +181,7 @@
type: -1
},{
name: this.platformName,
- id: this.platformId,
+ id: this.platformDeviceId,
type: 0
}
]);
@@ -298,6 +300,8 @@
return false;
},
nodeClickHandler: function (data, node, tree){
+ console.log(data)
+ console.log(node)
this.chooseId = data.id;
this.chooseName = data.name;
if (this.catalogIdChange)this.catalogIdChange(this.chooseId, this.chooseName);
--
Gitblit v1.8.0