From e3557e27465cacbad62321041fd2d17e4f81a196 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 18 六月 2021 18:10:46 +0800
Subject: [PATCH] 修复数据栈底图显示,添加朔黄的支持
---
src/components/giantTree/index.vue | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/components/giantTree/index.vue b/src/components/giantTree/index.vue
index d7e96d0..d0a15dc 100644
--- a/src/components/giantTree/index.vue
+++ b/src/components/giantTree/index.vue
@@ -5,6 +5,7 @@
:show-checkbox="TreeDataPool.multiple"
:readonly="TreeDataPool.readonly"
:gb28181="gb28181"
+ :setting="setting"
@onCreated="handleCreated"
@onClick="itemClick"
@onCheck="itemCheck"
@@ -16,6 +17,7 @@
@onImport="importCameras"
@onExpand="itemExpand"
@onCollapse="itemCollapse"
+ @onShowPic="showCameraPic"
/>
<div class="dialog-box-bg" v-show="showDialog" @click="hideDialogBox"></div>
<div
@@ -66,9 +68,16 @@
height: {
type: Number,
default: 0
- }
+ },
+ setting: {
+ type: Object,
+ require: false,
+ default: function () {
+ return {};
+ },
+ },
},
- data () {
+ data() {
return {
hoverNodeId: "",
showDialog: false,
@@ -86,7 +95,7 @@
curNodeTid: '',
};
},
- created () {
+ created() {
// console.log(this.height, '鏍戦珮搴�')
this.TreeDataPool.zTree = true;
@@ -117,13 +126,10 @@
//鎽勫儚鏈轰俊鎭洿鏂颁俊鎭悗锛屽鏋滆妭鐐逛綅缃湁鍙榯Id灏变笉鍑嗕簡,this.TreeDataPool.selectedNode姝ゆ椂杩樻槸鏃х殑淇℃伅
let ztreeNodes = ztreeObj.getNodes();
//var curNodeTid = '';
- console.log(ztreeNodes)
_this.findTidByIdFromArr(ztreeNodes);
- console.log('curNodeTid', _this.curNodeTid)
this.TreeDataPool.selectedNode.tId = _this.curNodeTid;
let node = this.ztreeObj.getNodeByTId(this.TreeDataPool.selectedNode.tId)
- console.log('selecBode', this.TreeDataPool.selectedNode)
- console.log('selectedNode.tId', this.TreeDataPool.selectedNode.tId)
+
// 澶氶�夋椂, 閫変腑鍗曢�夊崟鍑荤殑鑺傜偣
if (this.TreeDataPool.multiple) {
this.ztreeObj.checkAllNodes(false);
@@ -134,7 +140,7 @@
}
},
- findTidByIdFromArr (arr) {
+ findTidByIdFromArr(arr) {
let len = arr.length;
let _this = this;
for (var i = 0; i < len; i++) {
@@ -142,13 +148,13 @@
_this.curNodeTid = arr[i].tId;
break;
}
- if(arr[i].children){
+ if (arr[i].children) {
this.findTidByIdFromArr(arr[i].children);
}
}
-
+
},
- onDblClick (evt, treeId, item) {
+ onDblClick(evt, treeId, item) {
if (item.type !== "4" || this.app !== "Camera") {
return;
}
@@ -207,13 +213,13 @@
this.TreeDataPool.activeVideoIndex = nullVideoIndex;
}
},
- addCamera (node) {
+ addCamera(node) {
this.$emit("addDevice", node);
},
- importCameras (node) {
+ importCameras(node) {
this.$emit("import", node);
},
- addNode (node) {
+ addNode(node) {
this.dialogForm = {
text: "",
method: "add",
@@ -221,7 +227,7 @@
};
this.showDialogBox(event);
},
- editNode (node) {
+ editNode(node) {
this.dialogForm = {
text: node.name,
method: "edit",
@@ -231,10 +237,10 @@
};
this.showDialogBox(event);
},
- delNode (node) {
+ delNode(node) {
this.TreeDataPool.del(node.id);
},
- submitForm () {
+ submitForm() {
// 鎻愪氦鏂板鎴栬�呯紪杈戝尯鍩熻妭鐐硅〃鍗�
this.$refs.dialogForm.validate(valid => {
if (valid) {
@@ -254,19 +260,18 @@
});
this.hideDialogBox();
},
- hideDialogBox () {
+ hideDialogBox() {
this.showDialog = false;
this.dialogForm = { text: "" };
},
- showDialogBox (event) {
+ showDialogBox(event) {
let { clientX = 0, offsetY = 0 } = event;
// this.clientX = clientX - 120;
this.clientX = 50;
this.clientY = offsetY;
this.showDialog = true;
},
- itemClick (evt, treeId, treeNode) {
- console.log(evt, treeId)
+ itemClick(evt, treeId, treeNode) {
this.TreeDataPool.selectedNode = treeNode;
this.TreeDataPool.treeType = this.treeName;
@@ -293,7 +298,7 @@
// this.TreeDataPool.updateZTreeCheckNodes([treeNode]);
// },
- itemCheck (evt, treeId, treeNode) {
+ itemCheck(evt, treeId, treeNode) {
this.TreeDataPool.selectedNode = treeNode;
this.TreeDataPool.treeType = this.treeName;
@@ -301,18 +306,27 @@
// this.ztreeObj.checkNode(treeNode, true, false, false);
let checkedNodes = this.ztreeObj.getCheckedNodes(true);
this.TreeDataPool.updateZTreeCheckNodes(checkedNodes);
+
+ // 瀹炴椂缁熻閫変腑涓暟
+ this.TreeDataPool.countCheckedNodes(checkedNodes);
+
+ // 淇濆瓨涓�浠芥暟鎹�
+ this.TreeDataPool.activeTreeData = this.ztreeObj.getNodes()
},
//灞曞紑
- itemExpand (e, id, node) {
- this.TreeDataPool.foldNodeList[node.id] = true
- },
- // 鎶樺彔
- itemCollapse (e, id, node) {
+ itemExpand(e, id, node) {
delete this.TreeDataPool.foldNodeList[node.id]
},
- dropNode (node, item, draggedItem, e) {
+ // 鎶樺彔
+ itemCollapse(e, id, node) {
+ this.TreeDataPool.foldNodeList[node.id] = true
+ },
+ dropNode(node, item, draggedItem, e) {
// console.log('dropNode', node, item, draggedItem);
this.TreeDataPool.dropNode(draggedItem.id, item.id)
+ },
+ showCameraPic(nodeId) {
+ this.TreeDataPool.showBaseImage(nodeId)
}
}
};
--
Gitblit v1.8.0