From f20a554bdb24e9dfde9dc6a69d78595944f61d15 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期二, 25 十月 2022 14:53:57 +0800
Subject: [PATCH] 设备管理 样式调整
---
src/Pool/VideoPhotoData.ts | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index e86de54..08ad20c 100644
--- a/src/Pool/VideoPhotoData.ts
+++ b/src/Pool/VideoPhotoData.ts
@@ -82,7 +82,8 @@
inputValue: this.inputValue,
tabs: this.queryTabs,
tasks: this.queryTasks,
- treeNodes: this.treeNodes
+ treeNodes: this.treeNodes,
+ dataSource: "camera"
}
if (this.searchFrom == 'cluster') {
param.isAll = true
@@ -93,6 +94,15 @@
this.preCards.length = 0
if (rsp.data.datalist) {
rsp.data.datalist.forEach(element => {
+
+ if(element.activeObject.targetInfo&&element.activeObject.targetInfo.length === 0) {
+ element.activeObject.targetInfo = null
+ }
+
+ if(element.list[0].targetInfo&&element.list[0].targetInfo.length === 0) {
+ element.list[0].targetInfo = null
+ }
+
element.ownerPage = this.page
this.cards.push(element as any);
// 鍙厑璁告瘡涓猚ard娓叉煋涓�寮犲浘鐗�
@@ -225,20 +235,20 @@
this.tabsForUploadImg.splice(0, this.tabsForUploadImg.length)
if (rsp && rsp.success) {
var arr1 = new Array
- arr1 = rsp.data.filter(i => {
+ arr1 = rsp.data&&rsp.data.tags.filter(i => {
if (i.status === 1) {
i.title = i.title + '(宸插垹闄�)'
return i
}
});
- this.tabs = rsp.data.filter(function (i) {
+ this.tabs = rsp.data&&rsp.data.tags.filter(function (i) {
if (i.status !== 1) {
return i
}
})
this.tabs.push(...arr1)
this.tabsForUploadImg.push({ key: "esData", title: "鎶撴媿搴�" });
- rsp.data.forEach(element => {
+ rsp.data.tags.forEach(element => {
this.tabsForUploadImg.push(element as any);
});
// 鏀剧疆榛戠櫧鍚嶅崟 0涓虹櫧鍚嶅崟
@@ -246,7 +256,7 @@
this.whiteList.length = 0
var josn = JSON.stringify(rsp)
var resp = JSON.parse(josn)
- resp.data.forEach(i => {
+ resp.data.tags.forEach(i => {
if (i.status === 0 && i.bwType === "0") { //鐧藉悕鍗�
if (i.analyServerId === "") { //鍚屾搴�
i.title = i.title + '(鍚屾搴�)'
@@ -287,7 +297,7 @@
// });
let taskNames = [];
this.tasks = [];
- rsp.data.forEach((d: any) => {
+ rsp.data.aggs.forEach((d: any) => {
if (taskNames.indexOf(d.name) < 0) {
taskNames.push(d.name);
this.tasks.push(d)
--
Gitblit v1.8.0