From de24fe37e2af8456c49981dbe1ed9318ad2666b8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 15:32:26 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/LayerController.vue | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index c826ec3..dcb6ed3 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,13 +1,16 @@
<template>
<div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
- <div @click="showPanel" class="iconBtn transition" :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>
- <transition name="fade">
- <div :class="'legend-content map-background'" v-show="layerControllerVisible" style=" transform-origin: top left;">
+
+ <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>
- <buttom @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></buttom>
+ <button @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></button>
</div>
</transition>
</div>
@@ -15,7 +18,6 @@
<script>
import '@assets/css/map/magic.min.css'
-import presets from './layerControllerPresets'
import iconSetting from '@/assets/images/map-pages/icon/setting.png'
import LcServiceLayer from './modules/LcServiceLayer'
@@ -53,28 +55,9 @@
}
}
},
- mounted () {
- this.$nextTick(function () {
- this.init()
- })
- },
methods: {
showPanel () {
this.layerControllerVisible = !this.layerControllerVisible
- },
- init () {
- this.initPreset()
- },
- initPreset () {
- if (this.preset !== 'default') {
- const prmPreset = presets[this.preset]
- Object.assign(this.layerControllerVisible, prmPreset) // 闃叉棰勮鍙傛暟涓庨粯璁ゅ弬鏁颁笉涓�鑷村鑷存姤閿欙紝濡傛灉娌℃湁鎸夌収鎮ㄧ殑閰嶇疆鍙戠敓鏀瑰彉锛岃妫�鏌ユ嫾鍐欐槸鍚︽纭�
- if (prmPreset === 'undefined') {
- console.log('璇ュ浘灞傛帶鍒堕潰鏉跨殑棰勮娌℃湁鎵惧埌锛岃妫�鏌ラ璁惧悕绉版槸鍚︽纭紒')
- } else {
- this.$store.commit('updateLayerControllerVisible', this.layerControllerVisible)
- }
- }
},
switchPanel () {
this.panelSwitch.main = !this.panelSwitch.main
@@ -91,15 +74,28 @@
</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: 0.14583rem;
- top: 0.8rem;
+ 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;
}
@@ -249,12 +245,13 @@
position: absolute;
top:0;
right: -26px;
+ border-radius: 0.03rem 50% 50% 0.03rem;
}
.el-button--default:hover{
background:@background-color;
}
.legend-content{
- width: 1.79167rem;
+ width: 250px;
}
}
--
Gitblit v1.8.0