From 97a7d4a2a256b9171bca05e69d154996645b4722 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 16 三月 2021 10:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/LayerController/LayerController.vue | 63 +++++++++++--------------------
1 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index 7f2fd10..8f24ad7 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,27 +1,16 @@
<template>
<div class="float-panel">
-<!-- <i class="horn horn-br"></i>-->
-<!-- <i class="horn horn-bl"></i>-->
- <div class="head title-border">
- <div class="title-text-border">
- <div class="title-icon"></div>
- <div class="title-text">涓氬姟鐪嬫澘</div>
- <div class="title-button" :class="{'switch-head-up':true, 'switch-head-down': !panelSwitch.main}"
- @click="switchPanel">
- <!-- <i class="el-icon-arrow-down"></i> -->
+ <div class="title-text-border" @click="switchPanel">
+ <div class="title-icon"></div>
+ <div class="title-text">鍥惧眰鎺у埗</div>
+ </div>
+ <transition name="el-fade-in-linear">
+ <div class="body-box" id="panelContent" :style="{ width:width }">
+ <div v-show="isShow">
+ <slot></slot>
</div>
</div>
- </div>
- <div class="body-box" id="panelContent">
- <div id="panelInnerContent" :style="{ height:height }">
- <transition name="el-fade-in">
- <div v-show="isShow">
- <slot></slot>
- </div>
- </transition>
- </div>
-
- </div>
+ </transition>
</div>
</template>
@@ -56,7 +45,7 @@
},
data () {
return {
- height: '200px',
+ width: '250px',
isShow: true,
icons: {
setting: iconSetting
@@ -89,10 +78,10 @@
switchPanel () {
this.panelSwitch.main = !this.panelSwitch.main
if (this.panelSwitch.main) {
- this.height = '200px'
+ this.width = '250px'
this.isShow = true
} else {
- this.height = '0px'
+ this.width = '0px'
this.isShow = false
}
}
@@ -104,9 +93,7 @@
.float-panel {
position: absolute;
- left: 10px;
- bottom: 10px;
- width: 230px;
+ top: 120px;
height: auto;
font-size: 11px;
z-index: 1000;
@@ -115,10 +102,6 @@
color: #90c8e0;
}
- #panelInnerContent {
- overflow: hidden;
- transition: all 0.5s linear;
- }
.title-border {
width: 100%;
height: 28px;
@@ -153,11 +136,12 @@
}
.title-text-border {
- width: 100%;
- height: 28px;
+ width: 30px;
+ height: 120px;
+ float: left;
background: #091331;
- -webkit-clip-path: polygon(1px 1px, 1px 27px, 229px 27px, 229px 10px, 94px 10px, 85px 1px);
- clip-path: polygon(1px 1px, 1px 27px, 229px 27px, 229px 10px, 94px 10px, 85px 1px);
+ // -webkit-clip-path: polygon(1px 1px, 1px 27px, 229px 27px, 229px 10px, 94px 10px, 85px 1px);
+ // clip-path: polygon(1px 1px, 1px 27px, 229px 27px, 229px 10px, 94px 10px, 85px 1px);
}
.title-icon {
@@ -170,14 +154,12 @@
}
.title-text {
- float: left;
- width: 150px;
+ width: 25px;
color: #00d0f9;
- margin-left: 4px;
- line-height: 20px;
font-weight: bold;
margin-top: 6px;
- text-align: left;
+ text-align: center;
+ font-size: 14px;
filter: brightness(100%);
text-shadow: 0 0 5px #00d0f9, 0 0 0 #00d0f9, 0 0 0 #00d0f9, 0 0 0 #0258c5, 0 0 0 #0258c5, 0 0 2px #0258c5, 0 0 5px #0258c5, 0 0 15px #0258c5;
}
@@ -219,6 +201,7 @@
background-color: rgba(44, 62, 80, 0.6);
border: 1px solid #10488c;
margin-top: -1px;
+ margin-left: 30px;
height: auto;
}
@@ -258,7 +241,7 @@
}
.horn-tl {
- background-image: url(../../assets/images/map-pages/cosmetics/horn_tl.png) ;
+ background-image: url(../../assets/images/map-pages/cosmetics/horn_tl.png);
left: -1px;
top: -1px;
}
--
Gitblit v1.8.0