From ce3b404a5983f03a56ad9cd65a4ae2352db2ba77 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 06 十一月 2020 14:15:56 +0800
Subject: [PATCH] 集群树节点状态切换查询参数treeNodes错误修复
---
src/components/treeMenu/index.vue | 2 +-
src/components/treeMenu/jsTree/tree.vue | 1 +
src/Pool/TreeData.ts | 27 ++++++++++++++++++---------
src/Pool/VideoPhotoData.ts | 1 -
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/Pool/TreeData.ts b/src/Pool/TreeData.ts
index 98708da..7ab436f 100644
--- a/src/Pool/TreeData.ts
+++ b/src/Pool/TreeData.ts
@@ -113,6 +113,7 @@
return;
}
let _selected = this.selectedNodes;
+ console.log(this.selectedNodes)
function nodeFilter(node: any) {
if (node.type === "4" && node.selected) {
_selected.push(node.id);
@@ -124,25 +125,33 @@
}
}
if (this.selectedNode.cameraType === 0) {
- this.treeData.forEach((n: any) => {
- nodeFilter(n);
- });
+ //鎽勫儚鏈烘爲
+ if(this.treeActiveName == "camera"){
+ this.treeData.forEach((n: any) => {
+ nodeFilter(n);
+ });
+ }else if(this.treeActiveName == "cluster"){
+ //闆嗙兢鏍�
+ this.clusterData.forEach((n: any) => {
+ nodeFilter(n);
+ });
+ }
}
if (this.selectedNode.cameraType === 1) {
this.gb28181Data.forEach((n: any) => {
nodeFilter(n);
});
}
- if (this.selectedNode.cameraType === -1) {
- this.clusterData.forEach((n: any) => {
- nodeFilter(n);
- });
- }
+ // if (this.selectedNode.cameraType === -1) {
+ // this.clusterData.forEach((n: any) => {
+ // nodeFilter(n);
+ // });
+ // }
}
getCameraInfoByIp(ipaddr) {
let camera = null;
-
+
function nodeFilter(node: any) {
if (node.rtsp && node.rtsp.indexOf(ipaddr) != -1) {
camera = node;
diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index 33e5c3d..31383b0 100644
--- a/src/Pool/VideoPhotoData.ts
+++ b/src/Pool/VideoPhotoData.ts
@@ -257,7 +257,6 @@
params.isPlatform = 1
}
console.log(params)
- debugger
const rsp: any = await getTaskList(params);
if (rsp && rsp.success) {
// this.tasks.splice(0, this.tasks.length)
diff --git a/src/components/treeMenu/index.vue b/src/components/treeMenu/index.vue
index 48b9547..7b0acac 100644
--- a/src/components/treeMenu/index.vue
+++ b/src/components/treeMenu/index.vue
@@ -321,7 +321,7 @@
this.showDialog = true;
},
itemClick(node, item, e) {
- // console.log('jsTree index.vue', item)
+ console.log('jsTree index.vue', item)
this.TreeDataPool.selectedNode = item;
this.TreeDataPool.updateSelectedNodes();
this.TreeDataPool.treeType = this.treeName;
diff --git a/src/components/treeMenu/jsTree/tree.vue b/src/components/treeMenu/jsTree/tree.vue
index 13bb17f..7f4251f 100644
--- a/src/components/treeMenu/jsTree/tree.vue
+++ b/src/components/treeMenu/jsTree/tree.vue
@@ -229,6 +229,7 @@
oriNode.model.selected = true;
},
handleBatchSelectItems(oriNode, oriItem) {
+ console.log('oriNode, oriItem',oriNode, oriItem)
this.handleRecursionNodeChilds(oriNode, node => {
if (!!node.model) {
if (!!node.model.disabled) return;
--
Gitblit v1.8.0