From 182aed85616f7ac60d0ffb02e4feac5661b80e0c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 08 六月 2022 10:40:21 +0800
Subject: [PATCH] 修复初始化页面
---
src/Pool/VideoPhotoData.ts | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index cee90c3..1063f21 100644
--- a/src/Pool/VideoPhotoData.ts
+++ b/src/Pool/VideoPhotoData.ts
@@ -47,6 +47,7 @@
public scrollContainDom: any = '';
public uploadDiaplay: boolean = false;
public uploadType: boolean = false;
+ public dataSource: string = 'camera';
constructor() {
this.cards = [];
@@ -59,6 +60,7 @@
this.tabs = [];
this.tasks = [];
this.treeNodes = [];
+ this.dataSource = 'camera'
}
clearStatus() {
@@ -74,7 +76,7 @@
async querySearchList() {
this.cards = []
this.preCards = []
- var param:any = {
+ var param: any = {
page: this.page,
size: this.size,
searchTime: this.searchTime,
@@ -82,9 +84,10 @@
inputValue: this.inputValue,
tabs: this.queryTabs,
tasks: this.queryTasks,
- treeNodes: this.treeNodes
+ treeNodes: this.treeNodes,
+ dataSource:this.dataSource
}
- if(this.searchFrom == 'cluster'){
+ if (this.searchFrom == 'cluster') {
param.isAll = true
}
const rsp: any = await getSearchList(param);
@@ -118,7 +121,8 @@
treeNodes: this.treeNodes,
picUrl: this.picUrl,
databases: this.compareTabs,
- threshold: this.threshold
+ threshold: this.threshold,
+ isAll: this.searchFrom == "cluster" ? true : false
}
const rsp: any = await findPersonByPic(param);
if (rsp && rsp.success) {
@@ -137,21 +141,41 @@
}
}
async findPerson2() {
+ // 111
this.cards = []
var compType = this.compTargetType == "1" ? 1 : 0
- var param = {
- page: this.page,
- size: this.size,
- searchTime: this.searchTime,
- picUrl: this.picUrl,
- alarmlevel: this.queryAlarmlevel,
- inputValue: this.inputValue,
- tasks: this.queryTasks,
- treeNodes: this.treeNodes,
- compTargetId: this.compTargetId,
- compTargetType: compType,
- databases: this.compareTabs,
- threshold: this.threshold
+ let param
+ if (this.searchFrom == "cluster") {
+ param = {
+ page: this.page,
+ size: this.size,
+ searchTime: this.searchTime,
+ picUrl: this.picUrl,
+ alarmlevel: this.queryAlarmlevel,
+ inputValue: this.inputValue,
+ tasks: this.queryTasks,
+ treeNodes: this.treeNodes,
+ compTargetId: this.compTargetId,
+ compTargetType: compType,
+ databases: this.compareTabs,
+ threshold: this.threshold,
+ isAll: true
+ }
+ } else {
+ param = {
+ page: this.page,
+ size: this.size,
+ searchTime: this.searchTime,
+ picUrl: this.picUrl,
+ alarmlevel: this.queryAlarmlevel,
+ inputValue: this.inputValue,
+ tasks: this.queryTasks,
+ treeNodes: this.treeNodes,
+ compTargetId: this.compTargetId,
+ compTargetType: compType,
+ databases: this.compareTabs,
+ threshold: this.threshold,
+ }
}
const rsp: any = await findPersonByPic(param);
if (rsp && rsp.success) {
@@ -181,7 +205,8 @@
picUrl: this.picUrl,
databases: this.compareTabs,
compareNum: this.compareNum,
- threshold: this.threshold
+ threshold: this.threshold,
+ isAll: this.searchFrom == "cluster" ? true : false
}
const rsp: any = await findPerson(param);
if (rsp && rsp.success) {
@@ -252,7 +277,12 @@
}
async queryTaskList() {
- const rsp: any = await getTaskList({});
+ let params: any = {};
+ if (this.searchFrom == 'cluster') {
+ params.isPlatform = 1
+ }
+ console.log(params)
+ const rsp: any = await getTaskList(params);
if (rsp && rsp.success) {
// this.tasks.splice(0, this.tasks.length)
// rsp.data.forEach(element => {
--
Gitblit v1.8.0