From 97a7d4a2a256b9171bca05e69d154996645b4722 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 16 三月 2021 10:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/LayerController/LayerController.vue | 199 ++++++++++++++++++++++++++-----------------------
1 files changed, 106 insertions(+), 93 deletions(-)
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index 61e0339..8f24ad7 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,39 +1,28 @@
<template>
- <div class="floatPanel">
- <!-- <i class="horn horn-tl"></i> -->
- <!-- <i class="horn horn-tr"></i> -->
- <i class="horn horn-br"></i>
- <i class="horn horn-bl"></i>
-
- <div class="head titleBorder">
- <div class="titleTextBorder">
- <div class="titleIcon"></div>
- <div class="titleText">涓氬姟鐪嬫澘</div>
- <div class="titleButton" :class="{switchHeadUp:true, switchHeadDown: !panelSwitch.main}" @click="switchPanel">
- <!-- <i class="el-icon-arrow-down"></i> -->
+ <div class="float-panel">
+ <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>
- </div>
- <div class="bodyBox" id="panelContent">
- <div id="panelInnerContent" style="height: auto; overflow: hidden;">
- <slot></slot>
- </div>
- </div>
+ </transition>
</div>
</template>
<script>
-import api from './LayerControllerAPI'
-import { mapState, mapMutations } from 'vuex'
import '@assets/css/map/magic.min.css'
import presets from './layerControllerPresets'
-import $ from 'jquery'
import iconSetting from '@/assets/images/map-pages/icon/setting.png'
export default {
name: 'LayerController',
- components: { },
+ components: {},
props: {
preset: {
type: String,
@@ -41,74 +30,79 @@
}
},
computed: {
- ...mapState({
- map: state => state.map,
- L: state => state.L,
- layerHelper: state => state.layerHelper,
- layerControllerVisible: state => state.layerControllerVisible
- })
+ map () {
+ return this.$store.state.map.map
+ },
+ L () {
+ return this.$store.state.map.L
+ },
+ layerHelper () {
+ return this.$store.state.map.layerHelper
+ },
+ layerControllerVisible () {
+ return this.$store.state.map.layerControllerVisible
+ }
},
- data() {
+ data () {
return {
- icons:{
- setting:iconSetting
+ width: '250px',
+ isShow: true,
+ icons: {
+ setting: iconSetting
},
panelSwitch: {
main: true // 涓荤獥鍙�
}
}
},
- mounted() {
- this.$nextTick(function() {
- this.init()
- console.log(api)
- })
+ mounted () {
+ this.$nextTick(function () {
+ this.init()
+ })
},
methods: {
- ...mapMutations(['updateLayerControllerVisible']),
- async init() {
+ init () {
this.initPreset()
},
- initPreset() {
+ initPreset () {
if (this.preset !== 'default') {
- let prmPreset = presets[this.preset]
+ const prmPreset = presets[this.preset]
Object.assign(this.layerControllerVisible, prmPreset) // 闃叉棰勮鍙傛暟涓庨粯璁ゅ弬鏁颁笉涓�鑷村鑷存姤閿欙紝濡傛灉娌℃湁鎸夌収鎮ㄧ殑閰嶇疆鍙戠敓鏀瑰彉锛岃妫�鏌ユ嫾鍐欐槸鍚︽纭�
if (prmPreset === 'undefined') {
console.log('璇ュ浘灞傛帶鍒堕潰鏉跨殑棰勮娌℃湁鎵惧埌锛岃妫�鏌ラ璁惧悕绉版槸鍚︽纭紒')
} else {
- this.updateLayerControllerVisible(this.layerControllerVisible)
+ this.$store.commit('updateLayerControllerVisible', this.layerControllerVisible)
}
}
},
- switchPanel() {
+ switchPanel () {
this.panelSwitch.main = !this.panelSwitch.main
if (this.panelSwitch.main) {
- $('#panelInnerContent').animate({ height: '500px' }, 'fast', 'swing', () => {
- $('#panelInnerContent').css('height', 'auto')
- $('#panelContent').css('height', 'auto')
- })
+ this.width = '250px'
+ this.isShow = true
} else {
- $('#panelInnerContent').animate({ height: '0px' }, 'fast', 'swing')
+ this.width = '0px'
+ this.isShow = false
}
- },
+ }
}
}
</script>
<style lang="less">
-.floatPanel{
+.float-panel {
position: absolute;
- left: 10px;
- bottom: 10px;
- width: 230px;
+ top: 120px;
height: auto;
font-size: 11px;
z-index: 1000;
- div{
- color:#90c8e0;
+
+ div {
+ color: #90c8e0;
}
- .titleBorder{
+
+ .title-border {
width: 100%;
height: 28px;
background: #10488c;
@@ -116,7 +110,8 @@
clip-path: polygon(0px 0px, 0px 28px, 230px 28px, 230px 9px, 95px 9px, 86px 0px);
position: relative;
}
- .titleBorder:before {
+
+ .title-border:before {
content: "";
display: block;
position: absolute;
@@ -126,7 +121,8 @@
left: 0;
background-color: #38c8ef;
}
- .titleBorder:after {
+
+ .title-border:after {
content: "";
display: block;
position: absolute;
@@ -138,34 +134,37 @@
-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);
}
- .titleTextBorder {
- width: 100%;
- height: 28px;
+
+ .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);
+ // -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);
}
- .titleIcon{
+
+ .title-icon {
float: left;
width: 22px;
height: 22px;
margin-top: 4px;
margin-left: 2px;
- background-image: url(/assets/images/map-pages/icon/setting.png);
+ background-image: url(../../assets/images/map-pages/icon/setting.png);
}
- .titleText{
- float: left;
- width: 150px;
+
+ .title-text {
+ 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;
}
- .titleline{
+
+ .title-line {
display: inline-block;
width: 120px;
height: 1px;
@@ -175,7 +174,8 @@
line-height: 5px;
vertical-align: middle;
}
- .titlepoint{
+
+ .title-point {
display: inline-block;
width: 5px;
height: 5px;
@@ -184,42 +184,47 @@
line-height: 5px;
vertical-align: middle;
}
- .titleButton{
+
+ .title-button {
float: right;
width: 28px;
height: 28px;
cursor: pointer;
- :hover{
+
+ :hover {
font-weight: bold;
color: white;
}
}
- .bodyBox{
- background-color: rgba(44,62,80, 0.6);
+ .body-box {
+ background-color: rgba(44, 62, 80, 0.6);
border: 1px solid #10488c;
margin-top: -1px;
+ margin-left: 30px;
height: auto;
}
- .switchHeadUp{
+ .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);
+ background-image: url(../../assets/images/map-pages/icon/xljt1.png);
transform: rotateX(0deg);
transform-origin: 50% 50%;
transition: transform 0.5s linear 0s;
}
- .switchHeadDown{
+
+ .switch-head-down {
transform: rotateX(180deg);
transform-origin: 50% 50%;
transition: transform 0.5s linear 0s;
}
- select{
+
+ select {
background: transparent;
margin: 6px;
border: .5px solid #569EB7;
@@ -227,48 +232,56 @@
color: #569EB7;
padding: 0 16px;
}
- .horn{
+
+ .horn {
width: 6px;
height: 6px;
float: left;
position: absolute;
}
- .horn-tl{
- background-image: url(/assets/images/map-pages/cosmetics/horn_tl.png) center center no-repeat;
+
+ .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) center center no-repeat;
+
+ .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) center center no-repeat;
+
+ .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) center center no-repeat;
+
+ .horn-br {
+ background-image: url(../../assets/images/map-pages/cosmetics/horn_br.png);
right: -1px;
bottom: -1px;
}
- ::-webkit-scrollbar{
+
+ ::-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;
+ 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;
+ background: #0E3565;
}
}
--
Gitblit v1.8.0