From 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 15:33:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/LayerController.vue | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index 9536833..dcb6ed3 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,9 +1,16 @@
<template>
- <div class="float-panel">
- <div :class='["iconBtn",layerControllerVisible ? "active" : ""]' @click="showPanel"><span><img src="@assets/images/map-pages/icon/layer.png" alt="" width="26px" style="display: block;margin: auto"><span class="icon-name">鍥惧眰</span></span></div>
- <transition name="fade">
- <div :class="'legend-content map-background'" style="position: absolute;left: 50px;top: 0" v-show="layerControllerVisible">
+ <div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
+
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥惧眰" placement="left">
+ <div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style=" position: absolute;top:0;left: 0;">
+ <img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon">
+ <!-- <span class="icon-name">鍥惧眰</span>-->
+ </div>
+ </el-tooltip>
+ <transition name="animationChange">
+ <div :class="'legend-content map-background'" v-show="layerControllerVisible">
<lc-service-layer></lc-service-layer>
+ <button @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></button>
</div>
</transition>
</div>
@@ -48,11 +55,6 @@
}
}
},
- mounted () {
- this.$nextTick(function () {
- this.init()
- })
- },
methods: {
showPanel () {
this.layerControllerVisible = !this.layerControllerVisible
@@ -72,29 +74,34 @@
</script>
<style lang="less">
+ .animationChange-enter-active, .animationChange-leave-active {
+ transition: all 0.5s;
+ }
+
+ .animationChange-enter, .animationChange-leave-to {
+ opacity: 0;
+ transform: translateX(-100px);
+ }
+ .float-panel.active{
+ overflow: visible;
+ }
.float-panel {
position: absolute;
- left: 2px;
- top: 120px;
+ left: 0.14583rem;
+ top: 0.73979rem;
height: auto;
font-size: 11px;
z-index: 1000;
-
+ display: flex;
+ min-height: 0.28rem;
+ min-width: 0.28rem;
+ overflow: hidden;
div {
color: #00fff6;
}
- .iconBtn {
- width:45px;
- text-align: center;
- background: rgba(0, 16, 30, 0.5);
- cursor: pointer;
- color: #00fff6;
- border: 0.00521rem solid #00fff6;
- box-shadow: 0 0 0.03rem #00fff6;
- }
- .active {
- border: 0.00521rem solid #fff700;
- box-shadow: 0 0 0.03rem #fff700;
+
+ .iconBtn.active{
+ display: none;
}
.title-border {
width: 100%;
@@ -201,9 +208,8 @@
.switch-head-down {
transform: rotateX(180deg);
transform-origin: 50% 50%;
- transition: transform 0.5s linear 0s;
+ transition: transform 2s linear 0s;
}
-
select {
background: transparent;
margin: 6px;
@@ -231,6 +237,22 @@
border-radius: 0px;
background: #0E3565;
}
+ .el-button--default{
+ margin-left: 10px;
+ padding: 15px 3px;
+ background:@background-color;
+ color:@color-tool;
+ position: absolute;
+ top:0;
+ right: -26px;
+ border-radius: 0.03rem 50% 50% 0.03rem;
+ }
+ .el-button--default:hover{
+ background:@background-color;
+ }
+ .legend-content{
+ width: 250px;
+ }
}
</style>
--
Gitblit v1.8.0