From c7a549da66df42d4ec5c78ddf2cc138772616941 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 19 四月 2021 14:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/LayerController.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index e494157..3a49054 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -3,7 +3,8 @@
<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>
@@ -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
@@ -247,14 +261,19 @@
background: #0E3565;
}
.el-button--default{
- padding: 15px 3px;
+ padding: 0;
background:@background-color4;
color:@color-tool;
position: absolute;
- top:0;
- left: 100%;
- margin-left: .02rem;
- border:1px solid @color-tool;
+ top:24px;
+ 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{
@@ -264,7 +283,7 @@
color:@color;
}
.legend-content{
- width: 1.79167rem;
+ //width: 1.79167rem;
}
}
--
Gitblit v1.8.0