From d889eaf990af99c06970e51f2bc421ac0015489c Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 05 五月 2022 13:30:31 +0800
Subject: [PATCH] bug修复
---
src/Pool/TreeData.ts | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/src/Pool/TreeData.ts b/src/Pool/TreeData.ts
index 27be295..8c9ad4c 100644
--- a/src/Pool/TreeData.ts
+++ b/src/Pool/TreeData.ts
@@ -11,6 +11,8 @@
getCameraBaseImage
} from '@/api/area'
+import {getClusterDevList} from '@/api/clusterManage'
+
export default class TreeDataPool {
public openeds: Array<boolean>
public activeTreeData: Array<object>
@@ -64,6 +66,9 @@
public gb28181CameraBaseImage: string
public baseImageLoading: boolean
+ public activeNode: string
+
+
constructor() {
this.openeds = [true, true, false]
this.activeTreeData = []
@@ -102,7 +107,11 @@
this.cameraNameForBaseImage = ""
this.gb28181CameraBaseImage = ""
this.baseImageLoading = false
+ this.activeNode = ''
+
+
}
+
setVideoArr(index: number, value: object, vue: any): void {
vue.$set(this.videoArr, index, value)
@@ -338,17 +347,22 @@
async fetchLocalTree() {
let params: any = {
+ parentId:"",
searchType: this.searchCamType,
- cameraName: this.searchInput
+ cameraName: this.searchInput,
+
//isPlatform: 1
}
if (this.searchFrom == 'cluster') {
params.isPlatform = 1
}
+
+
const rsp: any = await getLocalCameraTree(params)
if (rsp && rsp.success) {
- this.treeData = rsp.data ? rsp.data : []
+
+ this.treeData = rsp.data.treeMenu ? rsp.data.treeMenu : []
if (this.treeData && this.treeData.length > 0) {
this.sortTreeData(this.treeData)
}
@@ -376,20 +390,21 @@
}
async fetchGbTree() {
- const rsp: any = await getGB28181CameraTree({
- searchType: this.searchCamType,
- cameraName: this.searchInput
- })
+ // 鍚庨棬
+ // const rsp: any = await getGB28181CameraTree({
+ // searchType: this.searchCamType,
+ // cameraName: this.searchInput
+ // })
- if (rsp && rsp.success) {
- this.gb28181Data = rsp.data ? rsp.data : []
- if (this.gb28181Data && this.gb28181Data.length > 0) {
- this.sortTreeData(this.gb28181Data)
- }
+ // if (rsp && rsp.success) {
+ // this.gb28181Data = rsp.data ? rsp.data : []
+ // if (this.gb28181Data && this.gb28181Data.length > 0) {
+ // this.sortTreeData(this.gb28181Data)
+ // }
- this.gb28181DataPure = JSON.parse(JSON.stringify(this.gb28181Data))
- this.isFold(this.gb28181Data)
- }
+ // this.gb28181DataPure = JSON.parse(JSON.stringify(this.gb28181Data))
+ // this.isFold(this.gb28181Data)
+ // }
}
async fetchTreeData() {
@@ -404,7 +419,7 @@
async add(name: string, parent: string) {
await addAreaTreeData({
name: name,
- parentId: parent
+ parentId: parent,
})
this.fetchTreeData()
@@ -412,7 +427,7 @@
async del(id: string) {
await delAreaTreeData({
- id: id
+ id: id,
})
this.fetchTreeData()
@@ -423,7 +438,7 @@
id: id,
name: name,
parentId: this.getParent(id, isGb),
- alias: alias
+ alias: alias,
})
this.fetchTreeData()
--
Gitblit v1.8.0