From 78691c94a8bcb735ea8af4cc89c9380bece92794 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 17:19:11 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/layer/src/layer.vue | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index 4b281a0..ef3f970 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -1,7 +1,8 @@
<template>
- <div class="public-bounced map-background" v-drag>
+ <div class="public-bounced map-background" v-drag :style="style">
<div class="public-bounced-title panel-title" ref="publicBounced">
<span>{{title}}</span>
+ <i class="el-icon-circle-close" @click="max"></i>
<i class="el-icon-circle-close" @click="close"></i>
</div>
<div class="public-bounced-content" :id="id">
@@ -18,6 +19,7 @@
cls: {
'vl-notify-iframe': true
},
+ style: {},
id: 'vlip' + new Date().getTime()
}
},
@@ -30,13 +32,6 @@
}
},
computed: {
- contentStyle () {
- return {
- height: 'calc(100% - 50px)', // parseInt(this.options.area[1]) - 50 + "px",
- minHeight: '20px',
- overflow: 'auto'
- }
- }
},
async mounted () {
helper.hiddenScrollBar(this.options)
@@ -58,6 +53,25 @@
})
instance.vm = instance.$mount()
document.getElementById(this.id).appendChild(instance.vm.$el)
+ },
+ max () {
+ // 鏈�澶у寲绐楀彛
+ let height = document.documentElement.clientHeight
+ if (height % 2 === 1) {
+ height += 1
+ }
+ this.style = {
+ overflow: 'hidden',
+ left: '50%',
+ width: '100%',
+ height: height + 'px',
+ minHeight: '42px'
+ }
+ this.maxMiniState = 2
+ },
+ maxmini () { // 杩樺師
+ document.getElementById(this.options.id).removeAttribute('style')
+ this.maxMiniState = 0
}
}
}
--
Gitblit v1.8.0