From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/search/index/Searching.vue | 18 ++++++++++--------
src/Pool/VideoPhotoData.ts | 8 ++++----
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index 54f10a5..ec150b3 100644
--- a/src/Pool/VideoPhotoData.ts
+++ b/src/Pool/VideoPhotoData.ts
@@ -49,8 +49,8 @@
constructor() {
this.cards = [];
- this.size = 40;
- this.pageSizeOption = [30, 40, 50]
+ this.size = 60;
+ this.pageSizeOption = [30, 60, 120]
this.alarmlevel = [];
this.inputValue = "";
this.searchTime = [];
@@ -63,8 +63,8 @@
clearStatus() {
//this.cards = [];
this.page = 1;
- this.size = 40;
- this.pageSizeOption = [30, 40, 50]
+ this.size = 60;
+ this.pageSizeOption = [30, 60, 120]
this.alarmlevel = [];
this.inputValue = "";
this.showType = "search";
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 1929f51..5fee51a 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -463,7 +463,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 +531,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 +541,6 @@
this.VideoPhotoData.activeCard = obj.activeObject.id;
},
toAdd(item) {
- debugger
this.CardList.addBaseList.push(item)
},
handleClose(done) {
@@ -818,12 +820,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