From a53dce38c2f58c0bfd37203e46dc57aa56025f45 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 18:22:24 +0800
Subject: [PATCH] Merge pull request #673 from 648540858/wvp-28181-2.0-multi-network
---
web_src/src/components/dialog/chooseChannelForCatalog.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/dialog/chooseChannelForCatalog.vue b/web_src/src/components/dialog/chooseChannelForCatalog.vue
index a0cb98c..c634b77 100644
--- a/web_src/src/components/dialog/chooseChannelForCatalog.vue
+++ b/web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -38,7 +38,7 @@
import catalogEdit from './catalogEdit.vue'
export default {
name: 'chooseChannelForCatalog',
- props: ['platformId', 'platformName', 'defaultCatalogId', 'catalogIdChange'],
+ props: ['platformId', 'platformDeviceId', 'platformName', 'defaultCatalogId', 'catalogIdChange', 'treeType'],
created() {
this.chooseId = this.defaultCatalogId;
this.defaultCatalogIdSign = this.defaultCatalogId;
@@ -87,8 +87,7 @@
platformId: that.platformId,
parentId: parentId
}
- })
- .then((res)=> {
+ }).then((res)=> {
if (res.data.code === 0) {
if (typeof(callback) === 'function') {
callback(res.data.data)
@@ -102,8 +101,9 @@
},
addCatalog: function (parentId, node){
let that = this;
+ console.log(this.treeType)
// 鎵撳紑娣诲姞寮圭獥
- that.$refs.catalogEdit.openDialog(false, null, null, parentId, ()=>{
+ that.$refs.catalogEdit.openDialog(false, null, null, parentId, this.treeType, node.level, ()=>{
node.loaded = false
node.expand();
});
@@ -139,8 +139,7 @@
id: id,
platformId: this.platformId,
}
- })
- .then((res) => {
+ }).then((res) => {
if (res.data.code === 0) {
console.log("绉婚櫎鎴愬姛")
node.parent.loaded = false
@@ -162,8 +161,7 @@
platformId: this.platformId,
catalogId: id,
}
- })
- .then((res)=> {
+ }).then((res)=> {
if (res.data.code === 0) {
this.defaultCatalogIdSign = id;
}
@@ -173,6 +171,7 @@
});
},
loadNode: function(node, resolve){
+ console.log("this.platformDeviceId锛� " + this.platformDeviceId)
if (node.level === 0) {
resolve([
{
@@ -181,7 +180,7 @@
type: -1
},{
name: this.platformName,
- id: this.platformId,
+ id: this.platformDeviceId,
type: 0
}
]);
@@ -300,6 +299,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