From 0d3db253cad1fb49c4fae9b9a537c8c318c7172f Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期三, 29 十一月 2023 10:23:59 +0800 Subject: [PATCH] 优化应用中心卸载 --- src/Pool/VideoPhotoData.ts | 70 ++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 21 deletions(-) diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts index 33e5c3d..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) { @@ -137,21 +144,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 +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) { @@ -252,12 +281,11 @@ } async queryTaskList() { - let params:any = {}; - if(this.searchFrom == 'cluster'){ + let params: any = {}; + if (this.searchFrom == 'cluster') { params.isPlatform = 1 } console.log(params) - debugger const rsp: any = await getTaskList(params); if (rsp && rsp.success) { // this.tasks.splice(0, this.tasks.length) -- Gitblit v1.8.0