From 3d6db7478d79b824f93708f936c598cc622221f2 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 20 六月 2022 15:10:31 +0800
Subject: [PATCH] fix设备状态查询接口
---
web_src/src/components/common/DeviceTree.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/web_src/src/components/common/DeviceTree.vue b/web_src/src/components/common/DeviceTree.vue
index fab895f..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, node.data.id, (catalogData) => {
- this.deviceService.getAllChannel(false, 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)
})
})
}
@@ -109,7 +121,7 @@
let nodeList = []
for (let i = 0; i < data.length; i++) {
let type = 3;
- if (data[i].subCount > 0) {
+ if (data[i].subCount > 0 || data[i].parental === 1) {
type = 2;
}else if (data[i].ptztype === 1 ) { // 1-鐞冩満;2-鍗婄悆;3-鍥哄畾鏋満;4-閬ユ帶鏋満
type = 4;
--
Gitblit v1.8.0