From 98a44e94ecc76abd72b9817648ca4b91469b936a Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 08 八月 2020 16:04:16 +0800
Subject: [PATCH] 添加退出登录,布局调整

---
 src/pages/desktop/index/components/DFrame.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 4909bb4..28280ff 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -2,11 +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 + 'px', top: data.topOffset + 'px', 'z-index': 125 + data.order, width: width + 'px', height: height + 'px'}"
-    @click="frameClick"
   >
-    <div class="d-frame-title" v-drag>
+    <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,7 +26,7 @@
         </div>
       </slot>
     </div>
-    <div class="d-frame-content" @click="frameClick"  >
+    <div class="d-frame-content">
       <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> -->
@@ -63,6 +63,7 @@
       }
     }
   },
+ 
   methods: {
     //resize
     mousedown(e) {
@@ -79,8 +80,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() {
@@ -95,7 +99,8 @@
     changeFullScreen: function () {
       this.fullScreen = !this.fullScreen;
     },
-    frameClick() {
+    frameClick(e) {
+      debugger
       this.$store.commit('desktop/refreshFrame', this.data);
     },
     minFrame(data, e) {

--
Gitblit v1.8.0