From 4e0a463f883816d78a4c4241ab23e79b2e805f98 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期四, 28 四月 2022 09:47:46 +0800
Subject: [PATCH] 优化对Parental字段的判断
---
web_src/src/components/common/DeviceTree.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/web_src/src/components/common/DeviceTree.vue b/web_src/src/components/common/DeviceTree.vue
index fab895f..066c344 100644
--- a/web_src/src/components/common/DeviceTree.vue
+++ b/web_src/src/components/common/DeviceTree.vue
@@ -89,8 +89,8 @@
})
}
if (node.level === 1) {
- this.deviceService.getAllChannel(true, node.data.id, (catalogData) => {
- this.deviceService.getAllChannel(false, node.data.id, (channelData) => {
+ 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)
})
@@ -109,7 +109,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