From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期三, 20 七月 2022 15:05:58 +0800 Subject: [PATCH] 修复国标配置的bug --- src/Pool/VideoPhotoData.ts | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts index cadcdbc..14abc0d 100644 --- a/src/Pool/VideoPhotoData.ts +++ b/src/Pool/VideoPhotoData.ts @@ -47,6 +47,8 @@ public scrollContainDom: any = ''; public uploadDiaplay: boolean = false; public uploadType: boolean = false; + public dataSource: string = 'camera'; + public collection: string = '' constructor() { this.cards = []; @@ -59,6 +61,8 @@ this.tabs = []; this.tasks = []; this.treeNodes = []; + this.dataSource = 'camera' + this.collection = '' } clearStatus() { @@ -74,7 +78,7 @@ async querySearchList() { this.cards = [] this.preCards = [] - var param:any = { + var param: any = { page: this.page, size: this.size, searchTime: this.searchTime, @@ -82,9 +86,11 @@ inputValue: this.inputValue, tabs: this.queryTabs, tasks: this.queryTasks, - treeNodes: this.treeNodes + treeNodes: this.treeNodes, + dataSource:this.dataSource, + collection:this.collection } - if(this.searchFrom == 'cluster'){ + if (this.searchFrom == 'cluster') { param.isAll = true } const rsp: any = await getSearchList(param); @@ -118,7 +124,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) { @@ -141,7 +148,7 @@ this.cards = [] var compType = this.compTargetType == "1" ? 1 : 0 let param - if ( this.searchFrom== "cluster") { + if (this.searchFrom == "cluster") { param = { page: this.page, size: this.size, @@ -201,7 +208,9 @@ picUrl: this.picUrl, databases: this.compareTabs, compareNum: this.compareNum, - threshold: this.threshold + threshold: this.threshold, + isAll: this.searchFrom == "cluster" ? true : false, + collection:this.collection } const rsp: any = await findPerson(param); if (rsp && rsp.success) { @@ -272,8 +281,8 @@ } async queryTaskList() { - let params:any = {}; - if(this.searchFrom == 'cluster'){ + let params: any = {}; + if (this.searchFrom == 'cluster') { params.isPlatform = 1 } console.log(params) -- Gitblit v1.8.0