From ccee429d379e0108b7445f72ade8d97c110a6fb3 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 18:01:59 +0800
Subject: [PATCH] 问题修复
---
src/pages/searchForCluster/index/Searching.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/pages/searchForCluster/index/Searching.vue b/src/pages/searchForCluster/index/Searching.vue
index 68e5e41..9814964 100644
--- a/src/pages/searchForCluster/index/Searching.vue
+++ b/src/pages/searchForCluster/index/Searching.vue
@@ -137,7 +137,9 @@
:outHeight="'162px'"
:outWidth="VideoPhotoData.uploadDiaplay?searchImgCardWidth:cardWidth"
:data="item"
+ :isFromCluster="true"
:showType="showType"
+ :searchTime="searchTimeFormated"
@detailsClick="getDetails($event, index)"
@addToBase="toAdd"
></Card>
@@ -271,7 +273,9 @@
this.TreeDataPool.readonly = true;
this.TreeDataPool.gbReadonly = true;
this.TreeDataPool.multiple = true;
+ this.TreeDataPool.searchFrom = 'cluster';
this.TreeDataPool.clean();
+
this.TreeDataPool.fetchTreeData();
},
mounted() {
@@ -293,10 +297,18 @@
// this.VideoTaskData.tasks[this.VideoTaskData.activeIndex].taskId
// ];
// }
-
- this.searchTime = this.getDateInit();
- this.VideoPhotoData.searchTime = this.getDateInit();
-
+ let start = this.getUrlKey("start")
+ let end = this.getUrlKey("end")
+ if (start && end) {
+ this.searchTime = [start, end]
+ this.VideoPhotoData.searchTime = [start, end]
+ } else {
+ this.searchTime = this.getDateInit();
+ this.VideoPhotoData.searchTime = this.getDateInit();
+ }
+ //璁剧疆鎼滅储鏉ユ簮(搴旂敤鍚嶇О)
+ this.VideoPhotoData.searchFrom = 'cluster';
+ //this.TreeDataPool.searchFrom = 'cluster';
// 鏆傛椂鍏抽棴璺宠浆 20200730
// if (this.$route.query.showType === "findByPic") {
if (this.getUrlKey("showType")) {
@@ -438,6 +450,11 @@
this.VideoPhotoData.uploadType = false;
this.VideoPhotoData.showType = "search";
}
+ }
+ },
+ computed: {
+ searchTimeFormated() {
+ return this.format(this.searchTime)
}
},
methods: {
@@ -610,7 +627,6 @@
tasks = tasks.concat(arr)
});
this.VideoPhotoData.queryTasks = tasks;
-
this.VideoPhotoData.queryAlarmlevel = this.stringToNum();
this.VideoPhotoData.searchTime = this.format(this.searchTime);
//this.VideoPhotoData.inputValue = this.searchText;
@@ -656,8 +672,10 @@
},
changePages(page) {
this.VideoPhotoData.page = page;
+ this.VideoPhotoData.isAll = true;
+ console.log("鍒嗛〉鏀瑰彉锛�", this.VideoPhotoData.page)
+
if (!this.VideoPhotoData.uploadType) {
- console.log("鍒嗛〉鏀瑰彉锛�")
this.VideoPhotoData.uploadDiaplay = false;
// this.VideoPhotoData.querySearchList();
this.setLoadSearch(this.VideoPhotoData.querySearchList());
--
Gitblit v1.8.0