From a312e0dd96d8f7e96fb3341f1a55561b12394405 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 12:29:48 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/LayerController.vue | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index ce4d496..37af978 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -3,11 +3,12 @@
<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">
+ <!-- <img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon"> -->
+ <i class="icon iconfont iconlayer-group"></i>
<!-- <span class="icon-name">鍥惧眰</span>-->
</div>
</el-tooltip>
- <transition name="animationChange">
+ <transition name="layerChange">
<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>
@@ -21,7 +22,7 @@
import iconSetting from '@/assets/images/map-pages/icon/setting.png'
import LcServiceLayer from './modules/LcServiceLayer'
-
+import bus from '@/eventBus'
export default {
name: 'LayerController',
components: { LcServiceLayer },
@@ -55,9 +56,22 @@
}
}
},
+ mounted () {
+ const that = this
+ bus.$on('changeState', function (state) {
+ if (state.num !== 3 && state.type) {
+ that.layerControllerVisible = false
+ }
+ })
+ },
methods: {
showPanel () {
this.layerControllerVisible = !this.layerControllerVisible
+ const state = {
+ type: this.layerControllerVisible,
+ num: 3
+ }
+ bus.$emit('changeState', state)
},
switchPanel () {
this.panelSwitch.main = !this.panelSwitch.main
@@ -74,14 +88,27 @@
</script>
<style lang="less">
- .animationChange-enter-active, .animationChange-leave-active {
+
+ .layerChange-enter-active {
+ transform-origin: top left;
+ animation: bounce-in .2s;
+ }
+ .layerChange-leave-active {
+ transform-origin: top left;
+ animation: bounce-in .2s reverse;
+ }
+ /*
+
+ .layerChange-enter-active,
+ .layerChange-leave-active {
transition: all 0.5s;
}
- .animationChange-enter, .animationChange-leave-to {
+ .layerChange-enter,
+ .layerChange-leave-to {
opacity: 0;
transform: translateX(-100px);
- }
+ }*/
.float-panel.active{
overflow: visible;
}
@@ -234,20 +261,29 @@
background: #0E3565;
}
.el-button--default{
- padding: 15px 3px;
- background:@background-color;
+ padding: 0;
+ background:@background-color4;
color:@color-tool;
position: absolute;
- top:0;
- left: 100%;
- margin-left: .02rem;
- border-radius: 0.03rem 50% 50% 0.03rem;
+ top:20px;
+ right:0.02rem;
+ border:none;//1px solid @color-tool;
+ width: 0.2rem;
+ height: 0.2rem;
+ text-align: center;
+ line-height: 0.2rem;
+ margin-top: -0.1rem;
+ border-radius: 50%;
+ // border-radius: 0.03rem 50% 50% 0.03rem;
}
.el-button--default:hover{
background:@background-color;
+ border:1px solid @color;
+ box-shadow: 0 0 2px @color;
+ color:@color;
}
.legend-content{
- width: 1.79167rem;
+ //width: 1.79167rem;
}
}
--
Gitblit v1.8.0