From 7b2f20f1299306f087d89aa202b52708df7ec4e6 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 09:14:44 +0800
Subject: [PATCH] 统一样式修改部分完成。
---
src/components/panel/ToolBoxPanel.vue | 107 ++++++++++++++++++++++++++++-------------------------
1 files changed, 57 insertions(+), 50 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 92b018e..3808d49 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,36 +1,37 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"
- @mouseover.enter.native="changeSelectMouse">
- <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt=""/>
- <span class="span-default">宸ュ叿</span>
+ <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @mouseover.enter.native="changeSelectMouse">
+ <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
+ <span class="span-default">宸ュ叿</span>
</el-button>
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
+ trigger="manual"
placement="bottom"
- trigger="click"
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
+ v-model="isShow[index]"
>
- <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
- @click="changeChoose(index)">
- <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
+ <el-button slot="reference" class="el-button"
+ :class="active === index? 'tools-panel-choose':''"
+ @click.native="changeChoose(index)">
+ <img :src="item.iconSelecd" alt="" v-if="active === index"/>
<img :src="item.icon" alt="" v-else/>
- <span v-if="active === index && checked">{{ item.label }}</span>
+ <span v-if="active === index">{{ item.label }}</span>
<span v-else class="default-span">{{ item.label }}</span>
</el-button>
<el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
v-show="item.index!=='2'">
- <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT"/>
- <img :src="itemT.icon" :title="itemT.title" v-else/>
+ <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem" alt=""/>
+ <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
</el-button>
<div class="base-map-inner-panel" v-show="item.index==='2'">
- <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
+ <div v-for="item in basemapHelper.basemapList" :key="item.code" class="basemap-layer-item">
<img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
- @click="changeBasemap(item)"/>
+ @click="changeBasemap(item)" alt=""/>
<el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
label="鏍囨敞" @change="changeBasemap(item)">
</el-checkbox>
@@ -83,6 +84,11 @@
import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
+// 涓嬭浇
+import FullScreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
+import cross from '@assets/images/map-pages/icon/toolbox/cross.png'
+import vertical from '@assets/images/map-pages/icon/toolbox/vertical.png'
+
// 娴嬮噺鐨勬柟娉�
import Measure from '@/components/plugin/MeaSure'
@@ -90,7 +96,7 @@
name: 'ToolBoxPanel',
data () {
return {
- isShow: false,
+ isShow: [],
currentBaseMapCode: 'tianditu_img',
basemapList: [],
selectGroup: false,
@@ -98,9 +104,11 @@
drawLayerArray: [],
map: null,
active: -1,
- Selecd: -1,
checked: false,
checkbutton: -1,
+ checkedItem: false,
+ Selecd: -1,
+ isSelecd: -1,
menuList: [
{
icon: plot,
@@ -228,19 +236,19 @@
{
index: '4-1',
label: '鍏ㄥ睆',
- icon: '',
+ icon: FullScreen,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
- icon: '',
+ icon: cross,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
- icon: '',
+ icon: vertical,
title: 'A4绾靛悜'
}
]
@@ -253,23 +261,16 @@
return this.$store.state.map.basemapHelper
}
},
- watch: {
- basemapHelper (newVal) {
- if (newVal != null) {
- this.updateBasemapList()
- }
- }
- },
methods: {
- updateBasemapList () {
- this.basemapList = this.basemapHelper.getBasemapList()
+ init (map) {
+ this.map = map
+ this.toolBoxPanelVisible = true
},
changeBasemap (itm) {
this.active = -1
const code = itm.code
- this.basemapList.forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
if (item.code === code) {
- console.log(this.currentBaseMapCode)
if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
this.currentBaseMapCode = code
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
@@ -277,7 +278,7 @@
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
}
- this.basemapHelper.getBasemapList().forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
item.layer.bringToBack()
})
}
@@ -288,20 +289,28 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
- if (this.checkbutton === index) {
- this.checked = !this.checked
- } else {
- if (this.checkbutton === -1) {
- this.checked = !this.checked
- } else {
- this.checked = true
+ console.log(this.basemapList)
+ for (let i = 0; i < this.isShow.length; i++) {
+ if (i !== index) {
+ this.isShow[i] = false
}
}
- this.checkbutton = index
+ // debugger
+ this.isShow[index] = !this.isShow[index]
+ this.isShow[index] ? (this.active = index) : (this.active = '')
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
- this.active = -1
+ if (this.isSelecd === indexT) {
+ this.checkedItem = !this.checkedItem
+ } else {
+ if (this.isSelecd === -1) {
+ this.checkedItem = !this.checkedItem
+ } else {
+ this.checkedItem = true
+ }
+ }
+ this.isSelecd = indexT
switch (itemT.label) {
case '鐐规爣缁�':
var myIcon = this.L.icon({
@@ -379,6 +388,7 @@
printerY.printMap('A4Portrait page', '绾靛悜')
break
}
+ this.active = -1
},
setLogic () {
this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
@@ -393,7 +403,7 @@
},
changeSelectMouse () {
this.selectGroup = true
- this.checked = false
+ this.isShow = []
}
}
}
@@ -411,8 +421,8 @@
.left-top-toolbox-panel {
position: absolute;
- left: 0;
- top: 15px;
+ left: 0.14583rem;
+ top: 0.11979rem;
z-index: 999;
.specific-tools {
@@ -434,22 +444,18 @@
.base-map-img:hover {
cursor: pointer;
}
-
img {
width: 22px;
height: 22px;
}
-
.span-default {
display: block;
- color: @color-shadow;
- font-size: 11px;
+ font-size: 10px;
}
-
span {
display: block;
- color: @color-over;
- font-size: 11px;
+ font-size: 10px;
+ color: #0B89B5;
}
}
@@ -457,7 +463,8 @@
left: 500px;
z-index: 999;
padding: 0;
- margin: 0 0.015rem;
+ margin: 0;
+ margin-right:0.015rem;
width: 45px;
height: 45px;
background: @background-color;
--
Gitblit v1.8.0