From 261e25074b7f35010efccb86bf82f6fe36e4b10d Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 14 十月 2020 10:27:19 +0800
Subject: [PATCH] 添加硬件信息显示
---
src/pages/search/index/Searching.vue | 68 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 1929f51..7cd82d6 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"
@@ -406,6 +406,7 @@
console.log("椤甸潰妯″紡锛�", value)
if (value) {
this.typeDisable = true;
+ this.disabled = true;
} else {
this.typeDisable = false;
this.VideoPhotoData.querySearchList();
@@ -417,20 +418,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,6 +441,28 @@
}
},
methods: {
+ 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;
},
@@ -463,7 +473,11 @@
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)`;
},
@@ -527,7 +541,6 @@
})
},
getDetails(ev, index) {
- debugger
//let obj = this.CardList.datalist[index];
this.CardList.datalist = this.VideoPhotoData.cards;
let obj = this.CardList.datalist[index];
@@ -538,7 +551,6 @@
this.VideoPhotoData.activeCard = obj.activeObject.id;
},
toAdd(item) {
- debugger
this.CardList.addBaseList.push(item)
},
handleClose(done) {
@@ -711,6 +723,18 @@
},
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 +842,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;
--
Gitblit v1.8.0