From 6a5962fe9544005dba620b00fb36c25fe2da4e76 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期二, 16 十一月 2021 15:24:46 +0800
Subject: [PATCH] 后端没修改的情况下添加默认背景图
---
src/pages/searchForCluster/index/Searching.vue | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/pages/searchForCluster/index/Searching.vue b/src/pages/searchForCluster/index/Searching.vue
index 68e5e41..8c5390f 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>
@@ -236,8 +238,8 @@
<script>
import Card from "@/components/subComponents/Card";
import UploadImg from "@/components/searching/UploadImg";
-//import CardWindow from "../components/cardWindow";
import bus from "./main";
+import { getUrlKey } from "@/api/utils";
export default {
components: {
Card,
@@ -255,7 +257,6 @@
searchImgCardWidth: "",
tagValues: [],
alarmValues: [],
- dialogVisible: false,
taskValues: [],
searchTime: [
this.$moment().format("YYYY-MM-DD 00:00:00"),
@@ -263,7 +264,6 @@
],
searchText: "",
currentPage: 1,
-
};
},
@@ -271,7 +271,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,20 +295,28 @@
// this.VideoTaskData.tasks[this.VideoTaskData.activeIndex].taskId
// ];
// }
-
- this.searchTime = this.getDateInit();
- this.VideoPhotoData.searchTime = this.getDateInit();
-
+ let start = getUrlKey("start")
+ let end = 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")) {
+ if (getUrlKey("showType")) {
this.VideoPhotoData.uploadDiaplay = true;
// console.log("鍒璺宠繃鏉ョ殑浠ュ浘鎼滃浘");
- this.VideoPhotoData.picUrl = this.getUrlKey("picSmUrl");
- this.VideoPhotoData.uploadImg = this.getUrlKey("picSmUrl");
+ this.VideoPhotoData.picUrl = getUrlKey("picSmUrl");
+ this.VideoPhotoData.uploadImg = getUrlKey("picSmUrl");
this.VideoPhotoData.uploadType = true
- this.VideoPhotoData.compTargetId = this.getUrlKey("targetId")
- this.VideoPhotoData.compTargetType = this.getUrlKey("compType")
+ this.VideoPhotoData.compTargetId = getUrlKey("targetId")
+ this.VideoPhotoData.compTargetType = getUrlKey("compType")
this.VideoPhotoData.size = 30
this.VideoPhotoData.compareTabs = ["esData"];
this.VideoPhotoData.findPerson2(); // 鏌ユ壘姝や汉
@@ -438,6 +448,11 @@
this.VideoPhotoData.uploadType = false;
this.VideoPhotoData.showType = "search";
}
+ }
+ },
+ computed: {
+ searchTimeFormated() {
+ return this.format(this.searchTime)
}
},
methods: {
@@ -610,7 +625,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 +670,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());
@@ -721,9 +737,6 @@
fn.then(_ => {
this.AuthData.closeLoad();
})
- },
- getUrlKey(name) {
- return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
},
tagChange(obj) {
console.log(obj)
--
Gitblit v1.8.0