From c8ec73b4b4ea9513789d8aa72d721ee7445d12cb Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 13 八月 2020 15:12:46 +0800
Subject: [PATCH] 修复card查看大图功能

---
 src/pages/desktop/index/components/DFrame.vue |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 66e5497..8152d1e 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -101,28 +101,37 @@
       this.fullScreen = !this.fullScreen;
     },
     frameClick(e) {
-      debugger
       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,
           alt: this.data.title,
           type: "3",
           screenshot: shotSrc
+        });
+      }).catch(e=>{
+        console.log(e);
+        this.$store.commit('desktop/addMinDock', {
+          id: this.data.id,
+          src: this.data.icon,
+          alt: this.data.title,
+          type: "3",
+          screenshot: ''
         });
       });
       return false;
@@ -221,6 +230,7 @@
 }
 
 .d-frame .d-frame-title {
+  /* min-width: 378px; */
   height: 30px;
   background-color: #e0e0e0;
   border-radius: 4px 4px 0 0;

--
Gitblit v1.8.0