From c88e6fc89736da8faa46d525c8781c0f1dac5384 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 19 三月 2021 01:50:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/LayerController/LayerController.vue | 130 ++++++++++++------------------------------
1 files changed, 38 insertions(+), 92 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index 7f2fd10..0d010eb 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,27 +1,11 @@
<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>
+ <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">
+ <lc-service-layer></lc-service-layer>
</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>
@@ -30,10 +14,11 @@
import presets from './layerControllerPresets'
import iconSetting from '@/assets/images/map-pages/icon/setting.png'
+import LcServiceLayer from './modules/LcServiceLayer'
export default {
name: 'LayerController',
- components: {},
+ components: { LcServiceLayer },
props: {
preset: {
type: String,
@@ -49,18 +34,16 @@
},
layerHelper () {
return this.$store.state.map.layerHelper
- },
- layerControllerVisible () {
- return this.$store.state.map.layerControllerVisible
}
},
data () {
return {
- height: '200px',
+ width: '250px',
isShow: true,
icons: {
setting: iconSetting
},
+ layerControllerVisible: false,
panelSwitch: {
main: true // 涓荤獥鍙�
}
@@ -72,6 +55,9 @@
})
},
methods: {
+ showPanel () {
+ this.layerControllerVisible = !this.layerControllerVisible
+ },
init () {
this.initPreset()
},
@@ -89,10 +75,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
}
}
@@ -101,23 +87,29 @@
</script>
<style lang="less">
-
.float-panel {
position: absolute;
- left: 10px;
- bottom: 10px;
- width: 230px;
+ left: 2px;
+ top: 120px;
height: auto;
font-size: 11px;
z-index: 1000;
div {
- color: #90c8e0;
+ color: #00fff6;
}
-
- #panelInnerContent {
- overflow: hidden;
- transition: all 0.5s linear;
+ .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;
}
.title-border {
width: 100%;
@@ -153,11 +145,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 +163,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,22 +210,9 @@
background-color: rgba(44, 62, 80, 0.6);
border: 1px solid #10488c;
margin-top: -1px;
+ margin-left: 30px;
height: auto;
}
-
- .switch-head-up {
- width: 22px;
- height: 16px;
- float: right;
- margin-top: 10px;
- margin-right: 10px;
- cursor: pointer;
- background-image: url(../../assets/images/map-pages/icon/xljt1.png);
- transform: rotateX(0deg);
- transform-origin: 50% 50%;
- transition: transform 0.5s linear 0s;
- }
-
.switch-head-down {
transform: rotateX(180deg);
transform-origin: 50% 50%;
@@ -249,38 +227,6 @@
color: #569EB7;
padding: 0 16px;
}
-
- .horn {
- width: 6px;
- height: 6px;
- float: left;
- position: absolute;
- }
-
- .horn-tl {
- background-image: url(../../assets/images/map-pages/cosmetics/horn_tl.png) ;
- left: -1px;
- top: -1px;
- }
-
- .horn-tr {
- background-image: url(../../assets/images/map-pages/cosmetics/horn_tr.png);
- right: -1px;
- top: -1px;
- }
-
- .horn-bl {
- background-image: url(../../assets/images/map-pages/cosmetics/horn_bl.png);
- left: -1px;
- bottom: -1px;
- }
-
- .horn-br {
- background-image: url(../../assets/images/map-pages/cosmetics/horn_br.png);
- right: -1px;
- bottom: -1px;
- }
-
::-webkit-scrollbar {
width: 7px;
height: 5px !important;
--
Gitblit v1.8.0