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 | 365 +++++++++++++++++++++++----------------------------
1 files changed, 163 insertions(+), 202 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index e6a8076..0d010eb 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,19 +1,12 @@
<template>
- <div class="float-panel">
- <!-- <i class="horn horn-br"></i>-->
- <!-- <i class="horn horn-bl"></i>-->
- <div class="title-text-border" @click="switchPanel">
- <div class="title-icon"></div>
- <div class="title-text">鍥惧眰鎺у埗</div>
- </div>
- <transition name="el-fade-in-linear">
- <div class="body-box" id="panelContent" :style="{ width:width }">
- <div v-show="isShow">
- <slot></slot>
- </div>
- </div>
- </transition>
- </div>
+ <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">
+ <lc-service-layer></lc-service-layer>
+ </div>
+ </transition>
+ </div>
</template>
<script>
@@ -21,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,
@@ -40,9 +34,6 @@
},
layerHelper () {
return this.$store.state.map.layerHelper
- },
- layerControllerVisible () {
- return this.$store.state.map.layerControllerVisible
}
},
data () {
@@ -52,6 +43,7 @@
icons: {
setting: iconSetting
},
+ layerControllerVisible: false,
panelSwitch: {
main: true // 涓荤獥鍙�
}
@@ -63,6 +55,9 @@
})
},
methods: {
+ showPanel () {
+ this.layerControllerVisible = !this.layerControllerVisible
+ },
init () {
this.initPreset()
},
@@ -92,199 +87,165 @@
</script>
<style lang="less">
+.float-panel {
+ position: absolute;
+ left: 2px;
+ top: 120px;
+ height: auto;
+ font-size: 11px;
+ z-index: 1000;
- .float-panel {
- position: absolute;
- top: 80px;
- height: auto;
- font-size: 11px;
- z-index: 1000;
+ 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;
+ }
+ .title-border {
+ width: 100%;
+ height: 28px;
+ background: #10488c;
+ -webkit-clip-path: polygon(0px 0px, 0px 28px, 230px 28px, 230px 9px, 95px 9px, 86px 0px);
+ clip-path: polygon(0px 0px, 0px 28px, 230px 28px, 230px 9px, 95px 9px, 86px 0px);
+ position: relative;
+ }
- div {
- color: #90c8e0;
- }
+ .title-border:before {
+ content: "";
+ display: block;
+ position: absolute;
+ width: 6px;
+ height: 6px;
+ top: 0;
+ left: 0;
+ background-color: #38c8ef;
+ }
- .title-border {
- width: 100%;
- height: 28px;
- background: #10488c;
- -webkit-clip-path: polygon(0px 0px, 0px 28px, 230px 28px, 230px 9px, 95px 9px, 86px 0px);
- clip-path: polygon(0px 0px, 0px 28px, 230px 28px, 230px 9px, 95px 9px, 86px 0px);
- position: relative;
- }
+ .title-border:after {
+ content: "";
+ display: block;
+ position: absolute;
+ width: 6px;
+ height: 6px;
+ top: 9px;
+ right: 0;
+ background-color: #38c8ef;
+ -webkit-clip-path: polygon(0px 0px, 0px 1px, 5px 1px, 5px 6px, 6px 6px, 6px 0px);
+ clip-path: polygon(0px 0px, 0px 1px, 5px 1px, 5px 6px, 6px 6px, 6px 0px);
+ }
- .title-border:before {
- content: "";
- display: block;
- position: absolute;
- width: 6px;
- height: 6px;
- top: 0;
- left: 0;
- background-color: #38c8ef;
- }
+ .title-text-border {
+ 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);
+ }
- .title-border:after {
- content: "";
- display: block;
- position: absolute;
- width: 6px;
- height: 6px;
- top: 9px;
- right: 0;
- background-color: #38c8ef;
- -webkit-clip-path: polygon(0px 0px, 0px 1px, 5px 1px, 5px 6px, 6px 6px, 6px 0px);
- clip-path: polygon(0px 0px, 0px 1px, 5px 1px, 5px 6px, 6px 6px, 6px 0px);
- }
+ .title-icon {
+ float: left;
+ width: 22px;
+ height: 22px;
+ margin-top: 4px;
+ margin-left: 2px;
+ background-image: url(../../assets/images/map-pages/icon/setting.png);
+ }
- .title-text-border {
- 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);
- }
+ .title-text {
+ width: 25px;
+ color: #00d0f9;
+ font-weight: bold;
+ margin-top: 6px;
+ 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;
+ }
- .title-icon {
- float: left;
- width: 22px;
- height: 22px;
- margin-top: 4px;
- margin-left: 2px;
- background-image: url(../../assets/images/map-pages/icon/setting.png);
- }
+ .title-line {
+ display: inline-block;
+ width: 120px;
+ height: 1px;
+ // margin-top: 14px;
+ margin-left: 4px;
+ background-color: #04527f;
+ line-height: 5px;
+ vertical-align: middle;
+ }
- .title-text {
- width: 25px;
- color: #00d0f9;
- font-weight: bold;
- margin-top: 6px;
- 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;
- }
+ .title-point {
+ display: inline-block;
+ width: 5px;
+ height: 5px;
+ // margin-top: 12px;
+ background-color: #04527f;
+ line-height: 5px;
+ vertical-align: middle;
+ }
- .title-line {
- display: inline-block;
- width: 120px;
- height: 1px;
- // margin-top: 14px;
- margin-left: 4px;
- background-color: #04527f;
- line-height: 5px;
- vertical-align: middle;
- }
+ .title-button {
+ float: right;
+ width: 28px;
+ height: 28px;
+ cursor: pointer;
- .title-point {
- display: inline-block;
- width: 5px;
- height: 5px;
- // margin-top: 12px;
- background-color: #04527f;
- line-height: 5px;
- vertical-align: middle;
- }
-
- .title-button {
- float: right;
- width: 28px;
- height: 28px;
- cursor: pointer;
-
- :hover {
- font-weight: bold;
- color: white;
- }
- }
-
- .body-box {
- 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%;
- transition: transform 0.5s linear 0s;
- }
-
- select {
- background: transparent;
- margin: 6px;
- border: .5px solid #569EB7;
- width: 150px;
- 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;
- }
-
- ::-webkit-scrollbar-thumb {
- /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
- border-radius: 10px;
- box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
- background: #0661AE;
- border: 1px solid transparent;
- }
-
- ::-webkit-scrollbar-track {
- /*婊氬姩鏉￠噷闈㈣建閬�*/
- // box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2);
- border-radius: 0px;
- background: #0E3565;
- }
+ :hover {
+ font-weight: bold;
+ color: white;
}
+ }
+
+ .body-box {
+ background-color: rgba(44, 62, 80, 0.6);
+ border: 1px solid #10488c;
+ margin-top: -1px;
+ margin-left: 30px;
+ height: auto;
+ }
+ .switch-head-down {
+ transform: rotateX(180deg);
+ transform-origin: 50% 50%;
+ transition: transform 0.5s linear 0s;
+ }
+
+ select {
+ background: transparent;
+ margin: 6px;
+ border: .5px solid #569EB7;
+ width: 150px;
+ color: #569EB7;
+ padding: 0 16px;
+ }
+ ::-webkit-scrollbar {
+ width: 7px;
+ height: 5px !important;
+ }
+
+ ::-webkit-scrollbar-thumb {
+ /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ background: #0661AE;
+ border: 1px solid transparent;
+ }
+
+ ::-webkit-scrollbar-track {
+ /*婊氬姩鏉￠噷闈㈣建閬�*/
+ // box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2);
+ border-radius: 0px;
+ background: #0E3565;
+ }
+}
</style>
--
Gitblit v1.8.0