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/search/index/Searching.vue | 164 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 58 deletions(-)
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 1929f51..f78deed 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -27,12 +27,12 @@
<el-select
v-model="tagValues"
multiple
- @change="searchingBtn"
:disabled="isDisabled"
collapse-tags
size="mini"
style="width:calc(100% - 40px);min-width: 120px;"
placeholder="璇烽�夋嫨"
+ @change="tagChange"
>
<el-option
v-for="item in VideoPhotoData.tabs"
@@ -137,6 +137,7 @@
:outHeight="'162px'"
:outWidth="VideoPhotoData.uploadDiaplay?searchImgCardWidth:cardWidth"
:data="item"
+ :searchTime="searchTimeFormated"
:showType="showType"
@detailsClick="getDetails($event, index)"
@addToBase="toAdd"
@@ -243,7 +244,7 @@
Card,
UploadImg
},
- data() {
+ data () {
return {
cardWidth: "",
center: "",
@@ -266,15 +267,19 @@
};
},
-
- created() {
+ computed: {
+ searchTimeFormated(){
+ return this.format(this.searchTime)
+ }
+ },
+ created () {
this.TreeDataPool.readonly = true;
this.TreeDataPool.gbReadonly = true;
this.TreeDataPool.multiple = true;
this.TreeDataPool.clean();
this.TreeDataPool.fetchTreeData();
},
- mounted() {
+ mounted () {
this.$nextTick(() => {
let scrollContain = this.$refs.scrollContain
this.VideoPhotoData.scrollContainDom = scrollContain
@@ -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") {
@@ -314,6 +325,7 @@
this.searchTime = this.getDateInit();
this.VideoPhotoData.searchTime = this.getDateInit();
// this.VideoPhotoData.querySearchList();
+ console.log('mounted 鏌ヨes')
this.setLoadSearch(this.VideoPhotoData.querySearchList());
}
@@ -327,7 +339,7 @@
});
});
},
- destroyed() {
+ destroyed () {
window.removeEventListener("resize", this.getHeight);
this.CardList.details = [];
// this.TreeDataPool.treeActiveName = "camera";
@@ -342,12 +354,20 @@
this.VideoPhotoData.selectWhites = [];
},
watch: {
- "TreeDataPool.showTreeBox"(value) {
+ 'TreeDataPool.treeActiveName' (n, o) {
+ if (n && n == 'camera') {
+ console.log('mounted 鏌ヨes')
+ this.VideoPhotoData.treeNodes = [];
+ this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ }
+ },
+ "TreeDataPool.showTreeBox" (value) {
this.getHeight();
if (this.VideoPhotoData.realSmallPath.length > 0) {
this.VideoPhotoData.findPersonByPage();
} else {
// this.VideoPhotoData.querySearchList();
+ console.log('showTreeBox 鏌ヨes')
this.setLoadSearch(this.VideoPhotoData.querySearchList());
}
},
@@ -365,22 +385,25 @@
if (this.VideoPhotoData.uploadType) {
this.VideoPhotoData.findPersonByPage()
} else {
- // this.VideoPhotoData.querySearchList();
+
+ console.log('TreeDataPool.selectedNodes 鏌ヨes')
this.setLoadSearch(this.VideoPhotoData.querySearchList());
+
}
}
},
deep: true //娣卞害鐩戝惉
},
"DataStackPool.selectedDir": {
- handler(nodes, oldNodes) {
- if (nodes !== oldNodes) {
+ handler (nodes, oldNodes) {
+ if (nodes !== oldNodes && nodes.id != "") {
// this.VideoPhotoData.treeNodes = nodes.map(i=>{return i.id});
this.VideoPhotoData.treeNodes = [nodes.id];
if (this.VideoPhotoData.uploadType) {
this.VideoPhotoData.findPersonByPage()
} else {
// this.VideoPhotoData.querySearchList();
+ console.log('DataStackPool.selectedDir 鏌ヨes')
this.setLoadSearch(this.VideoPhotoData.querySearchList());
}
}
@@ -406,6 +429,7 @@
console.log("椤甸潰妯″紡锛�", value)
if (value) {
this.typeDisable = true;
+ this.disabled = true;
} else {
this.typeDisable = false;
this.VideoPhotoData.querySearchList();
@@ -417,20 +441,7 @@
"VideoPhotoData.selectWhites": function (value) {
this.blackAngWhite()
},
- tagValues: function (newValue, oldValue) {
- if (newValue.length > 0) {
- this.showType = "compare";
- } else {
- this.showType = "search";
- }
- if (newValue.length !== oldValue.length) {
- console.log("tagValue涓殑鍒锋柊鏂规硶");
- // this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
- }
- },
"VideoPhotoData.uploadDiaplay": function (value) {
- debugger
this.getHeight();
console.log("upload鐨勫�兼槸锛�", value)
if (value) {
@@ -453,24 +464,50 @@
}
},
methods: {
- resizeWidth(w) {
+ isShowUpload () {
+ console.log('isShowUpload', this.VideoPhotoData.uploadDiaplay)
+ this.getHeight();
+ console.log("upload鐨勫�兼槸锛�", this.VideoPhotoData.uploadDiaplay)
+ if (this.VideoPhotoData.uploadDiaplay) {
+ if (!this.VideoPhotoData.uploadType) {
+ console.log("uploadDisplay涓殑鍒锋柊");
+ let scrollContain = this.$refs.scrollContain
+ this.VideoPhotoData.scrollContainDom = scrollContain
+ this.VideoPhotoData.showType = "search";
+ // this.VideoPhotoData.querySearchList();
+ //this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.isDisabled = false;
+ } else {
+ //this.VideoPhotoData.scrollContainDom = '';
+ this.VideoPhotoData.showType = "findByPic";
+ }
+ } else {
+ this.VideoPhotoData.uploadType = false;
+ this.VideoPhotoData.showType = "search";
+ }
+ },
+ resizeWidth (w) {
this.defaultWidth = w;
},
- resizeHeight(h) {
+ resizeHeight (h) {
this.defaultHeight = h;
},
- getHeight() {
+ getHeight () {
let w = this.$refs.mid.offsetWidth;
let integer = parseInt(w / 330);
let integerSearchImg = parseInt((w - 300) / 325);
- this.handleSizeChange(integer, integerSearchImg);
+
+ // 鍙栨秷size淇敼
+ // console.log(integer, integerSearchImg)
+ // this.handleSizeChange(integer, integerSearchImg);
+
this.cardWidth = `calc(${100 / integer}% - 20px)`;
this.searchImgCardWidth = `calc(${100 / integerSearchImg}% - 20px)`;
},
- uploadChange() {
+ uploadChange () {
this.VideoPhotoData.uploadDiaplay = false;
},
- blackAngWhite() {
+ blackAngWhite () {
if (this.VideoPhotoData.selectBlacks.length > 0) {
for (let i = 0; i < this.VideoPhotoData.whiteList.length; i++) {
//this.VideoPhotoData.whiteList[i].disabled = true
@@ -496,7 +533,7 @@
}
}
},
- saveAddBase(item, index) {
+ saveAddBase (item, index) {
if (this.VideoPhotoData.selectBlacks.length === 0 && this.VideoPhotoData.selectWhites.length === 0) {
this.$notify({
title: "娉ㄦ剰",
@@ -526,8 +563,7 @@
this.VideoPhotoData.selectWhites = []
})
},
- getDetails(ev, index) {
- debugger
+ getDetails (ev, index) {
//let obj = this.CardList.datalist[index];
this.CardList.datalist = this.VideoPhotoData.cards;
let obj = this.CardList.datalist[index];
@@ -537,18 +573,17 @@
// this.CardList.details.push(obj);
this.VideoPhotoData.activeCard = obj.activeObject.id;
},
- toAdd(item) {
- debugger
+ toAdd (item) {
this.CardList.addBaseList.push(item)
},
- handleClose(done) {
+ handleClose (done) {
this.$confirm('纭鍏抽棴锛�')
.then(_ => {
done();
})
.catch(_ => { });
},
- showUpload() {
+ showUpload () {
this.VideoPhotoData.uploadDiaplay = !this.VideoPhotoData.uploadDiaplay;
//鍒濆鍖栨暟鎹�
this.VideoPhotoData.clearStatus();
@@ -558,7 +593,7 @@
// }
//this.VideoPhotoData.uploadImg = require("C:/Users/mdesign/Desktop/cvasdv.jpg");
},
- getDateInit() {
+ getDateInit () {
// 瑕佹眰 榛樿涓�涓湀
const end = new Date();
const start = new Date();
@@ -574,13 +609,13 @@
this.$moment(end).format("YYYY-MM-DD HH:mm:ss")
];
},
- format(array) {
+ format (array) {
return [
this.$moment(array[0]).format("YYYY-MM-DD HH:mm:ss"),
this.$moment(array[1]).format("YYYY-MM-DD HH:mm:ss")
];
},
- searchingBtn() {
+ searchingBtn () {
// let obj = document.getElementById('searchMid');
// console.log(obj,'target',document)
// let load = this.$loading({
@@ -608,6 +643,7 @@
this.VideoPhotoData.uploadDiaplay = false;
//this.VideoPhotoData.page = this.currentPage;
// this.VideoPhotoData.querySearchList();
+ console.log('鎼滅储鎸夐挳瑙﹀彂 鏌ヨes')
this.setLoadSearch(this.VideoPhotoData.querySearchList());
} else {
console.log("浠ュ浘鎼滃浘");
@@ -616,7 +652,7 @@
this.setLoadSearch(this.VideoPhotoData.findPersonByPage());
}
},
- stringToNum() {
+ stringToNum () {
var arr = [];
this.alarmValues.forEach(element => {
if (element == "-1") {
@@ -641,7 +677,7 @@
// console.log("杈撳嚭鐨勬暟缁勶細", arr);
return arr;
},
- changePages(page) {
+ changePages (page) {
this.VideoPhotoData.page = page;
if (!this.VideoPhotoData.uploadType) {
console.log("鍒嗛〉鏀瑰彉锛�")
@@ -653,10 +689,10 @@
this.setLoadSearch(this.VideoPhotoData.findPersonByPage());
}
},
- closeWindow(index) {
+ closeWindow (index) {
this.CardList.addBaseList.splice(index, 1);
},
- handleSizeChange(integer, integerSearchImg) {
+ handleSizeChange (integer, integerSearchImg) {
if (this.VideoPhotoData.uploadDiaplay) {
this.VideoPhotoData.size = integerSearchImg * 10;
//this.VideoPhotoData.findPersonByPage();
@@ -665,7 +701,7 @@
//this.VideoPhotoData.querySearchList();
}
},
- sizeChange(size) {
+ sizeChange (size) {
if (this.VideoPhotoData.uploadType) {
this.VideoPhotoData.size = size;
this.VideoPhotoData.findPersonByPage();
@@ -676,7 +712,7 @@
this.setLoadSearch(this.VideoPhotoData.querySearchList());
}
},
- clearSearch() {
+ clearSearch () {
this.tagValues = []
this.taskValues = []
this.alarmValues = []
@@ -694,23 +730,35 @@
this.setLoadSearch(this.VideoPhotoData.findPersonByPage());
}
},
- disabled(data) {
+ disabled (data) {
this.isDisabled = data;
},
- getCenter() {
+ getCenter () {
this.center = {
x: document.documentElement.clientWidth / 2 - 250,
y: document.documentElement.clientHeight / 2 - 200
};
},
- setLoadSearch(fn) {
+ setLoadSearch (fn) {
this.AuthData.setLoading("searchMid", this);
fn.then(_ => {
this.AuthData.closeLoad();
})
},
- getUrlKey(name) {
+ getUrlKey (name) {
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
+ },
+ tagChange (obj) {
+ console.log(obj)
+ if (obj.length > 0) {
+ this.showType = "compare";
+ } else {
+ this.showType = "search";
+ }
+
+ this.VideoPhotoData.queryTabs = obj;
+
+ this.setLoadSearch(this.VideoPhotoData.querySearchList());
}
}
};
@@ -818,12 +866,12 @@
white-space: nowrap;
text-overflow: ellipsis;
}
-.titlebar{
- height: 10px!important;
- background: #fff!important;
- .button{
+.titlebar {
+ height: 10px !important;
+ background: #fff !important;
+ .button {
position: absolute;
- font-size: 25px!important;
+ font-size: 25px !important;
right: 10px;
top: 10px;
z-index: 3;
@@ -912,7 +960,7 @@
width: 100%;
height: 100%;
.el-loading-spinner-search {
- background: url("/images/search/searchLoading.gif") no-repeat;
+ background: url('/images/search/searchLoading.gif') no-repeat;
}
}
}
--
Gitblit v1.8.0