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 | 98 +++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 36 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 5589cdc..28280ff 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -2,14 +2,22 @@
<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="el-icon-error d-frame-operation-close" @click="closeFrame()"></i>
- <i class="el-icon-remove d-frame-operation-minus" @click="minFrame(data)"></i>
- <i class="el-icon-circle-plus d-frame-operation-full" @click="changeFullScreen()"></i>
+ <i class="icon-minus d-frame-operation-minus" @click="minFrame(data,$event)">
+ <img :src="`${publicPath}images/desktop/header-icon/min.png`" alt />
+ </i>
+ <i class="icon-screen-toggle d-frame-operation-full" @click="changeFullScreen($event)">
+ <img
+ :src="fullScreen?`${publicPath}images/desktop/header-icon/mini.png`:`${publicPath}images/desktop/header-icon/max.png`"
+ alt
+ />
+ </i>
+ <i class="icon-close d-frame-operation-close" @click="closeFrame($event)"></i>
</div>
<slot name="d-frame-title-content">
<div class="d-frame-title-content">
@@ -42,6 +50,7 @@
},
data() {
return {
+ publicPath: process.env.BASE_URL,
fullScreen: false,
width: this.data.width || 1024,
height: this.data.height || 512,
@@ -54,17 +63,10 @@
}
}
},
- mounted() {
- window.addEventListener('message', e => {
- if (e.data && e.data.msg == "logout") {
- location.assign("/");
- }
- })
- },
+
methods: {
//resize
mousedown(e) {
- debugger
this.resizeObj.mouX = e.clientX;
this.resizeObj.mouY = e.clientY;
this.resizeObj.startW = this.width;
@@ -78,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() {
@@ -94,21 +99,23 @@
changeFullScreen: function () {
this.fullScreen = !this.fullScreen;
},
- frameClick: function () {
+ frameClick(e) {
+ debugger
this.$store.commit('desktop/refreshFrame', this.data);
},
- minFrame: function (data) {
+ minFrame(data, e) {
//鎵惧埌褰撳墠鐨刬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 //寮�鍚法鍩熼厤缃�
}).then(canvas => {
let shotSrc = canvas.toDataURL();
+
this.$store.commit('desktop/addMinDock', {
id: this.data.id,
src: this.data.icon,
@@ -116,8 +123,8 @@
type: "3",
screenshot: shotSrc
});
- })
-
+ });
+ return false;
//this.refreshDock();
},
refreshDock: function () {
@@ -148,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 <= 0 ){
- toTop = 0
- }else if(toTop >= document.body.getBoundingClientRect().height-40){
- toTop = document.body.getBoundingClientRect().height-40;
+ if (toTop <= 40) {
+ toTop = 40
+ } else if (toTop >= document.body.getBoundingClientRect().height - 31) {
+ toTop = document.body.getBoundingClientRect().height - 31;
}
el.parentElement.style.top = toTop + 'px';
};
@@ -202,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,20 +227,35 @@
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
}
-
+.d-frame-title .icon-close {
+ border-radius: 0 4px 0 0;
+ background: url("/images/desktop/header-icon/close.png") no-repeat 50%;
+}
.d-frame-title-operation {
position: absolute;
- line-height: 30px;
- left: 5px;
+ top: 0;
+ right: 0;
+ height: 30px;
+ z-index: 2;
}
.d-frame-title-operation i {
- margin: 0 3px;
font-size: 18px;
+ display: inline-block;
+ height: 100%;
+ width: 46px;
+ text-align: center;
+ vertical-align: middle;
+ cursor: pointer;
+ line-height: 28px;
}
-.d-frame-operation-close {
- color: red;
+.d-frame-title-operation i:hover {
+ background-color: #c7cacf;
+}
+.d-frame-title-operation .icon-close:hover {
+ background-color: red;
+ background-image: url("/images/desktop/header-icon/close-hover.png");
}
/* .d-frame-title-operation:hover .d-frame-operation-close::before {
@@ -258,19 +281,22 @@
.d-frame-title-content {
line-height: 30px;
text-align: center;
+ background: #dee1e6;
}
.d-frame-title-content img {
width: auto;
height: 18px;
position: relative;
- top: 3px;
+ top: 2px;
margin-right: 6px;
}
.d-frame-title-content span {
position: relative;
top: -1px;
+ font-size: 15px;
+ color: #777;
/* font-family: '榛戜綋'; */
}
--
Gitblit v1.8.0