From 58bf48cea61c6c5b4381a4b8ff5b4a39eb4671eb Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期五, 10 六月 2022 09:36:03 +0800
Subject: [PATCH] 国标摄像机信息接口

---
 src/Pool/VideoPhotoData.ts |   66 ++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index 33e5c3d..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,12 +277,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