From 3fc1d9ed6c937c1e8db7004f7102c7a157a2687a Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 12 十一月 2021 16:52:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/search/index/Searching.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 6dd0557..f78deed 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -137,6 +137,7 @@
:outHeight="'162px'"
:outWidth="VideoPhotoData.uploadDiaplay?searchImgCardWidth:cardWidth"
:data="item"
+ :searchTime="searchTimeFormated"
:showType="showType"
@detailsClick="getDetails($event, index)"
@addToBase="toAdd"
@@ -266,7 +267,11 @@
};
},
-
+ computed: {
+ searchTimeFormated(){
+ return this.format(this.searchTime)
+ }
+ },
created () {
this.TreeDataPool.readonly = true;
this.TreeDataPool.gbReadonly = true;
@@ -293,9 +298,15 @@
// 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();
+ }
// 鏆傛椂鍏抽棴璺宠浆 20200730
// if (this.$route.query.showType === "findByPic") {
--
Gitblit v1.8.0