From cffa0a71a4ee4bc1b68549cd30e50f1e122c16ab Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 12 八月 2020 13:41:38 +0800
Subject: [PATCH] fix 统计查询样式bug
---
src/pages/search/index/Searching.vue | 12 +++++++-----
src/pages/desktop/index/components/DFrame.vue | 7 ++++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 7dcebb3..ac00319 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -104,18 +104,19 @@
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame(data, e) {
+ debugger
//鎵惧埌褰撳墠鐨刬frame
let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
html2canvas(curIframe.contentWindow.document.body, {
dpi: window.devicePixelRatio * 4,
- //logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
+ logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
removeContainer: true,
imageTimeout: 0,
- //useCORS: true //寮�鍚法鍩熼厤缃�
+ useCORS: true, //寮�鍚法鍩熼厤缃�
+ //allowTaint: true
}).then(canvas => {
let shotSrc = canvas.toDataURL();
-
this.$store.commit('desktop/addMinDock', {
id: this.data.id,
src: this.data.icon,
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 7ecb916..7cead48 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -120,7 +120,7 @@
<b class="clear-searching" @click="clearSearch">閲嶇疆</b>
</p>
</div>
- <div ref="mid" style="height:100%;">
+ <div ref="mid" style="height:calc(100% - 50px);">
<div class="left-selection" v-if="VideoPhotoData.uploadDiaplay">
<upload-img ref="uploadImg" @labelDisabled="disabled"></upload-img>
</div>
@@ -676,7 +676,7 @@
color: rgba(0, 0, 0, 0.78) !important;
}
.searching-right-content {
- height: calc(100% - 135px);
+ height: calc(100% - 80px);
width: 100%;
box-sizing: border-box;
.top {
@@ -728,8 +728,8 @@
overflow: hidden;
width: 100%;
height: 80px;
- line-height: 80px;
- padding-top: 24px;
+ //line-height: 80px;
+ padding-top: 20px;
padding-right: 24px;
box-sizing: border-box;
text-align: right;
@@ -840,7 +840,9 @@
.right-section {
//width: calc(100% - 315px);
height: 100%;
- float: left;
+ padding-bottom: 20px;
+ box-sizing: border-box;
+ //float: left;
overflow: auto;
position: relative;
}
--
Gitblit v1.8.0