From 00370307a2fe475ea9f50db47a0d28a470c6c212 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 四月 2021 15:46:44 +0800
Subject: [PATCH] 修正国标配置相关的接口地址
---
src/pages/searchForCluster/index/Searching.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/pages/searchForCluster/index/Searching.vue b/src/pages/searchForCluster/index/Searching.vue
index 9e7012d..8ca04f6 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,11 +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.searchForm = 'cluster';
+ this.VideoPhotoData.searchFrom = 'cluster';
+ //this.TreeDataPool.searchFrom = 'cluster';
// 鏆傛椂鍏抽棴璺宠浆 20200730
// if (this.$route.query.showType === "findByPic") {
if (this.getUrlKey("showType")) {
@@ -439,6 +450,11 @@
this.VideoPhotoData.uploadType = false;
this.VideoPhotoData.showType = "search";
}
+ }
+ },
+ computed: {
+ searchTimeFormated(){
+ return this.format(this.searchTime)
}
},
methods: {
@@ -611,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;
--
Gitblit v1.8.0