From 51f8540633fe9eaa9c2c9b5ff439f2bf9bf9094e Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 04 八月 2020 17:31:09 +0800
Subject: [PATCH] iframe ui调整,GB28181 radio操作修复,应用打开方式调整
---
src/pages/desktop/index/components/DFrame.vue | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 5589cdc..c19e0fc 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -7,9 +7,16 @@
>
<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 +49,7 @@
},
data() {
return {
+ publicPath: process.env.BASE_URL,
fullScreen: false,
width: this.data.width || 1024,
height: this.data.height || 512,
@@ -64,7 +72,6 @@
methods: {
//resize
mousedown(e) {
- debugger
this.resizeObj.mouX = e.clientX;
this.resizeObj.mouY = e.clientY;
this.resizeObj.startW = this.width;
@@ -97,7 +104,8 @@
frameClick: function () {
this.$store.commit('desktop/refreshFrame', this.data);
},
- minFrame: function (data) {
+ minFrame (data,e) {
+ //e.stopPropagation()
//鎵惧埌褰撳墠鐨刬frame
let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
@@ -154,8 +162,8 @@
toLeft = document.body.getBoundingClientRect().width-40;
}
el.parentElement.style.left = toLeft + 'px';
- if(toTop <= 0 ){
- toTop = 0
+ if(toTop <= 40 ){
+ toTop = 40
}else if(toTop >= document.body.getBoundingClientRect().height-40){
toTop = document.body.getBoundingClientRect().height-40;
}
@@ -218,21 +226,33 @@
border-top: 1px solid #d0d0d0;
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;
}
.d-frame-title-operation i {
- margin: 0 3px;
font-size: 18px;
+ display: inline-block;
+ height: 100%;
+ width: 46px;
+ text-align: center;
+ vertical-align: middle;
}
-
-.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 +278,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