From 0b737708e696c45720499759b5c31aced87fdbb6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 七月 2021 14:10:03 +0800
Subject: [PATCH] merge master
---
src/Pool/TreeData.ts | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/Pool/TreeData.ts b/src/Pool/TreeData.ts
index 4d5c6a5..27be295 100644
--- a/src/Pool/TreeData.ts
+++ b/src/Pool/TreeData.ts
@@ -5,8 +5,10 @@
addAreaTreeData,
delAreaTreeData,
updateAreaTreeData,
+ getGb28181Pool,
refreshGB28181Tree,
- updateCameraArea
+ updateCameraArea,
+ getCameraBaseImage
} from '@/api/area'
export default class TreeDataPool {
@@ -57,6 +59,11 @@
// 鎬绘憚鍍忔満涓暟
public gb28181ChildNodeCount: number
+ // 鍥芥爣鎽勫儚鏈烘睜鐨勫簳鍥�
+ public cameraNameForBaseImage: string
+ public gb28181CameraBaseImage: string
+ public baseImageLoading: boolean
+
constructor() {
this.openeds = [true, true, false]
this.activeTreeData = []
@@ -91,6 +98,10 @@
this.checkedTreeNode = []
this.gb28181CheckedCount = 0
this.gb28181ChildNodeCount = 0
+
+ this.cameraNameForBaseImage = ""
+ this.gb28181CameraBaseImage = ""
+ this.baseImageLoading = false
}
setVideoArr(index: number, value: object, vue: any): void {
@@ -452,8 +463,12 @@
return arry.length
}
- async fetchVideosvrCameras() {
- const rsp: any = await refreshGB28181Tree()
+ async fetchVideosvrCameras(update: Boolean) {
+ let fn = getGb28181Pool
+ if (update) {
+ fn = refreshGB28181Tree
+ }
+ const rsp: any = await fn()
if (rsp && rsp.success) {
this.selectedNode = {}
@@ -503,4 +518,22 @@
return newTree
}
+
+ async showBaseImage(node: any) {
+ this.baseImageLoading = true
+ this.gb28181CameraBaseImage = ""
+ this.cameraNameForBaseImage = node.name
+
+ try {
+ const rsp: any = await getCameraBaseImage({ id: node.id })
+
+ if (rsp && rsp.data) {
+ this.gb28181CameraBaseImage = rsp.data
+ }
+ } catch (error) {
+ console.log(error)
+ }
+
+ this.baseImageLoading = false
+ }
}
--
Gitblit v1.8.0