From 817ea18c62e32b2a3394ae1c245f79bc745c5ac2 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 10 八月 2020 17:42:26 +0800
Subject: [PATCH] 实时监控间距调整,统计查询查找此人界面调整

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

diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 86c96e5..fe7257e 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -2,10 +2,11 @@
   <div
     v-show="data.isShow"
     :class="['d-frame', {'d-frame-full': fullScreen}]"
+    ref="dFrame"
     :data-id="data.id"
-    v-bind:style="{left: data.leftOffset + '%', top: data.topOffset + '%', 'z-index': 125 + data.order, width: width + 'px', height: height + 'px'}"
+    v-bind:style="{left: data.leftOffset + 'px', top: data.topOffset + 'px', 'z-index': 125 + data.order, width: width + 'px', height: height + 'px'}"
   >
-    <div class="d-frame-title" v-drag @click="frameClick()">
+    <div class="d-frame-title" v-drag @click="frameClick">
       <div class="d-frame-title-operation">
         <i class="icon-minus d-frame-operation-minus" @click="minFrame(data,$event)">
           <img :src="`${publicPath}images/desktop/header-icon/min.png`" alt />
@@ -26,6 +27,7 @@
       </slot>
     </div>
     <div class="d-frame-content">
+      <div class="iframe-mask" v-if="data.order!=1" @click="frameClick"></div>
       <iframe :src="data.url" v-if="data.url"></iframe>
       <div v-html="data.html" v-if="data.html"></div>
       <!-- <span class="d-frame-operation-resize" v-resize></span> -->
@@ -62,6 +64,7 @@
       }
     }
   },
+ 
   methods: {
     //resize
     mousedown(e) {
@@ -78,8 +81,11 @@
         }
         e = e || window.event;
         e.preventDefault();
-        this.width = this.resizeObj.startW + e.clientX - this.resizeObj.mouX;
-        this.height = this.resizeObj.startH + e.clientY - this.resizeObj.mouY;
+        let curWidth = this.resizeObj.startW + e.clientX - this.resizeObj.mouX;
+        let curHeight = this.resizeObj.startH + e.clientY - this.resizeObj.mouY;
+        
+        this.width = curWidth;
+        this.height = curHeight;
       }.bind(this)
     },
     mouseup() {
@@ -94,8 +100,7 @@
     changeFullScreen: function () {
       this.fullScreen = !this.fullScreen;
     },
-    frameClick: function () {
-      debugger
+    frameClick(e) {
       this.$store.commit('desktop/refreshFrame', this.data);
     },
     minFrame(data, e) {
@@ -104,12 +109,13 @@
       //淇濆瓨褰撳墠搴旂敤蹇収
       html2canvas(curIframe.contentWindow.document.body, {
         dpi: window.devicePixelRatio * 4,
-        logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
+        //logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
         removeContainer: true,
         imageTimeout: 0,
         useCORS: true //寮�鍚法鍩熼厤缃�
       }).then(canvas => {
         let shotSrc = canvas.toDataURL();
+        
         this.$store.commit('desktop/addMinDock', {
           id: this.data.id,
           src: this.data.icon,
@@ -149,16 +155,16 @@
           let toLeft = e.clientX - disx;
           let toTop = e.clientY - disy;
           //杈圭晫澶勭悊
-          if (toLeft <= 0) {
-            toLeft = 0
-          } else if (toLeft >= document.body.getBoundingClientRect().width - 40) {
-            toLeft = document.body.getBoundingClientRect().width - 40;
+          if (toLeft <= -(el.parentElement.offsetWidth-46*3)) {
+            toLeft = -(el.parentElement.offsetWidth-46*3)
+          } else if (toLeft >= document.body.getBoundingClientRect().width - 46*3) {
+            toLeft = document.body.getBoundingClientRect().width - 46*3;
           }
           el.parentElement.style.left = toLeft + 'px';
           if (toTop <= 40) {
             toTop = 40
-          } else if (toTop >= document.body.getBoundingClientRect().height - 40) {
-            toTop = document.body.getBoundingClientRect().height - 40;
+          } else if (toTop >= document.body.getBoundingClientRect().height - 31) {
+            toTop = document.body.getBoundingClientRect().height - 31;
           }
           el.parentElement.style.top = toTop + 'px';
         };
@@ -203,13 +209,14 @@
 }
 .d-frame {
   position: fixed;
+  box-shadow: 0 5px 10px rgba(0,0,0,.5);
 }
 
 .d-frame.d-frame-full {
   width: 100% !important;
   height: 100% !important;
   left: 0 !important;
-  top: 0 !important;
+  top: 40px !important;
 }
 
 .d-frame .d-frame-title {
@@ -219,6 +226,14 @@
   border-top: 1px solid #d0d0d0;
   border-left: 1px solid #d0d0d0;
   border-right: 1px solid #d0d0d0;
+}
+.iframe-mask{
+  position: absolute;
+  top: 30px;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: transparent;
 }
 .d-frame-title .icon-close {
   border-radius: 0 4px 0 0;
@@ -240,6 +255,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
+  line-height: 28px;
 }
 
 .d-frame-title-operation i:hover {

--
Gitblit v1.8.0