From 9bb61a70ab78aeb414fd44a50c1ae7932e6d7d93 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期三, 22 六月 2022 14:26:46 +0800
Subject: [PATCH] 添加国标级联录像控制功能
---
web_src/src/components/common/DeviceTree.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/common/DeviceTree.vue b/web_src/src/components/common/DeviceTree.vue
index 066c344..73618cc 100644
--- a/web_src/src/components/common/DeviceTree.vue
+++ b/web_src/src/components/common/DeviceTree.vue
@@ -84,22 +84,34 @@
}else {
resolve([])
}
+ }, (list)=>{
+ console.log("璁惧鍔犺浇瀹屾垚")
}, (error)=>{
})
}
if (node.level === 1) {
- this.deviceService.getAllChannel(true, true, node.data.id, (catalogData) => {
- this.deviceService.getAllChannel(false, true, node.data.id, (channelData) => {
- let data = catalogData.concat(channelData)
- this.channelDataHandler(data, resolve)
+ let channelArray = []
+ this.deviceService.getAllChannel(true, true, node.data.id, catalogData =>{
+ channelArray = channelArray.concat(catalogData)
+ this.channelDataHandler(channelArray, resolve)
+ },(endCatalogData) => {
+ this.deviceService.getAllChannel(false, true, node.data.id, channelData => {
+ channelArray = channelArray.concat(channelData)
+ this.channelDataHandler(channelArray, resolve)
+ }, endChannelList => {
+
})
})
}else if (node.level > 1){
+ let channelArray = []
this.deviceService.getAllSubChannel(true, node.data.deviceId, node.data.id, (catalogData)=>{
+ channelArray = channelArray.concat(catalogData)
+ this.channelDataHandler(channelArray, resolve)
+ }, (endCatalogData)=>{
this.deviceService.getAllSubChannel(false, node.data.deviceId, node.data.id, (channelData)=>{
- let data = catalogData.concat(channelData)
- this.channelDataHandler(data, resolve)
+ channelArray = channelArray.concat(channelData)
+ this.channelDataHandler(channelArray, resolve)
})
})
}
--
Gitblit v1.8.0