From d4fca49a4b70fe60c730d7e32e2035153a91fcc5 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 31 五月 2021 17:13:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/ToolBoxPanel.vue | 183 ++++++++++++++++++++++++++++-----------------
1 files changed, 115 insertions(+), 68 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 9733c83..d4f0d28 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -2,49 +2,33 @@
<div class="left-top-toolbox-panel">
<div class="specific-tools">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="宸ュ叿" placement="left">
- <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @click.enter.native="changeSelectMouse">
- <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
- <!--<span class="span-default">宸ュ叿</span>-->
- </el-button>
+ <div :class='["iconBtn",selectGroup === true ? "active-button" : ""]' @click="changeSelectMouse">
+ <i class="icon iconfont icongongju"></i>
+ </div>
</el-tooltip>
<transition name="animationChange">
- <el-row v-show="selectGroup" class="specific-tools-group">
+ <div v-show="selectGroup" class="specific-tools-group">
<el-popover
trigger="manual"
placement="bottom"
: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? 'tools-panel-choose':''"
+ v-model="isShow[index]">
+ <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">{{ item.label }}</span>
- <span v-else class="default-span">{{ item.label }}</span>-->
+ <i :class="'icon iconfont '+item.icon"></i>
</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 && checkedItem" alt=""/>
- <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
+ v-show="item.index!=='2'" :class="indexT==toolActive?'hover':''">
+ <i :class="'icon iconfont '+itemT.icon"></i>
</el-button>
-<!-- <div class="base-map-inner-panel" v-show="item.index==='2'">-->
-<!-- <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)" alt=""/>-->
-<!-- <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"-->
-<!-- label="鏍囨敞" @change="changeBasemap(item)">-->
-<!-- </el-checkbox>-->
-<!-- </div>-->
-<!-- </div>-->
<lc-base-map v-show="item.index==='2'"></lc-base-map>
</el-popover>
<!-- <el-button @click="changeSelect" class="special-button">
<i class="el-icon-d-arrow-left"></i>
</el-button> -->
- </el-row>
+ </div>
</transition>
</div>
</div>
@@ -53,10 +37,10 @@
<script>
import LcBaseMap from '@components/LayerController/modules/LcBaseMap'
// 鍔熻兘瀵艰埅
-import plot from '@assets/images/map-pages/icon/toolbox/biaohui.png'
-import polygon from '@assets/images/map-pages/icon/toolbox/celiang1.png'
-import location from '@assets/images/map-pages/icon/toolbox/ditu.png'
-import fullscreen from '@assets/images/map-pages/icon/toolbox/xiazai.png'
+// import plot from '@assets/images/map-pages/icon/toolbox/biaohui.png'
+// import polygon from '@assets/images/map-pages/icon/toolbox/celiang1.png'
+// import location from '@assets/images/map-pages/icon/toolbox/ditu.png'
+// import fullscreen from '@assets/images/map-pages/icon/toolbox/xiazai.png'
// 瀵艰埅閫変腑鐨勭姸鎬�
import plotChooose from '@assets/images/map-pages/icon/toolbox/Selecd/biaohui.png'
@@ -67,12 +51,12 @@
// 鏍囩粯鐨勫彲閫夋嫨鏁版嵁
import iconRefinery from '@assets/images/map-pages/local.png'
-import marker from '@assets/images/map-pages/icon/toolbox/map.png'
-import line from '@assets/images/map-pages/icon/toolbox/line.png'
-import polygonJ from '@assets/images/map-pages/icon/toolbox/polygon.png'
-import polygonS from '@assets/images/map-pages/icon/toolbox/ju.png'
-import polygonY from '@assets/images/map-pages/icon/toolbox/circle.png'
-import del from '@assets/images/map-pages/icon/toolbox/del.png'
+// import marker from '@assets/images/map-pages/icon/toolbox/map.png'
+// import line from '@assets/images/map-pages/icon/toolbox/line.png'
+// import polygonJ from '@assets/images/map-pages/icon/toolbox/polygon.png'
+// import polygonS from '@assets/images/map-pages/icon/toolbox/ju.png'
+// import polygonY from '@assets/images/map-pages/icon/toolbox/circle.png'
+// import del from '@assets/images/map-pages/icon/toolbox/del.png'
// 鏍囩粯閫変腑鐨勫唴瀹瑰浘鐗�
import markerChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png'
@@ -85,16 +69,19 @@
import mmChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/mianjiceliangmark.png'
// 娴嬮噺
-import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
-import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
+// 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 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'
+
+//
+import bus from '@/eventBus'
export default {
name: 'ToolBoxPanel',
@@ -116,9 +103,10 @@
checkedItem: false,
Selecd: -1,
isSelecd: -1,
+ toolActive: -1,
menuList: [
{
- icon: plot,
+ icon: 'iconjuliceliang', // plot,
iconSelecd: plotChooose,
label: '鏍囩粯',
index: '1',
@@ -126,49 +114,55 @@
{
index: '1-1',
label: '鐐规爣缁�',
- icon: marker,
+ icon: 'iconlocation-full', // marker,
title: '鐐规爣缁�',
+ active: false,
iconChoose: markerChoose
},
{
index: '1-2',
label: '绾挎爣缁�',
- icon: line,
+ icon: 'iconline', // line,
title: '绾挎爣缁�',
+ active: 0,
iconChoose: lineChoose
},
{
index: '1-4',
label: '澶氳竟褰�',
- icon: polygonJ,
+ icon: 'iconliubianxing1', // polygonJ,
title: '澶氳竟褰�',
+ active: 0,
iconChoose: polygonJChoose
},
{
index: '1-5',
label: '鐭╁舰',
- icon: polygonS,
+ icon: 'iconcheckbox-full', // polygonS,
title: '鐭╁舰',
+ active: 0,
iconChoose: polygonSChoose
},
{
index: '1-3',
label: '鍦嗗舰',
- icon: polygonY,
+ icon: 'iconyuan', // polygonY,
title: '鍦嗗舰',
+ active: 0,
iconChoose: polygonYChoose
},
{
index: '1-4',
label: '鍒犻櫎',
- icon: del,
+ active: -1,
+ icon: 'icondelete-fill', // del,
title: '鍒犻櫎鏍囩粯',
iconChoose: delChoose
}
]
},
{
- icon: polygon,
+ icon: 'iconcelianggongju', // polygon,
iconSelecd: polygonChooose,
label: '娴嬮噺',
index: '3',
@@ -176,28 +170,31 @@
{
index: '3-1',
label: '璺濈',
- icon: distance,
+ icon: 'iconjuliceliang', // distance,
title: '璺濈娴嬮噺',
+ active: 0,
iconChoose: distanceChoose
},
{
index: '3-2',
label: '闈㈢Н',
- icon: mm,
+ icon: 'iconmianjiceliang', // mm,
title: '闈㈢Н娴嬮噺',
+ active: 0,
iconChoose: mmChoose
},
{
index: '3-3',
label: '娓呴櫎',
- icon: del,
+ icon: 'icondelete-fill', // del,
title: '娓呴櫎娴嬮噺',
+ active: -1,
iconChoose: delChoose
}
]
},
{
- icon: location,
+ icon: 'iconditu1', // location,
iconSelecd: locationChooose,
label: '鍦板浘',
index: '2',
@@ -205,6 +202,7 @@
{
label: '褰卞儚鍥�',
index: '2-1',
+ active: 0,
items: [
{
index: '2-1-1',
@@ -215,6 +213,7 @@
{
label: '鐭㈤噺鍥�',
index: '2-2',
+ active: 0,
items: [
{
index: '2-2-1',
@@ -225,6 +224,7 @@
{
label: '鍦板舰鍥�',
index: '2-3',
+ active: 0,
items: [
{
index: '2-3-1',
@@ -235,7 +235,7 @@
]
},
{
- icon: fullscreen,
+ icon: 'icondownload', // fullscreen,
iconSelecd: dowloadChooose,
label: '涓嬭浇',
index: '4',
@@ -243,25 +243,39 @@
{
index: '4-1',
label: '鍏ㄥ睆',
- icon: FullScreen,
+ icon: 'icontianchongxing-', // FullScreen,
+ active: 0,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
- icon: cross,
+ icon: 'iconsaoma', // cross,
+ active: 0,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
- icon: vertical,
+ icon: 'iconsaoma zongs', // vertical,
+ active: 0,
title: 'A4绾靛悜'
}
]
}
]
}
+ },
+ mounted () {
+ /* import bus from '@/eventBus' */
+ const that = this
+ bus.$on('changeState', function (state) {
+ if (state.num !== 1 && state.type) {
+ that.selectGroup = false
+ that.isShow = []
+ that.active = -1
+ }
+ })
},
methods: {
init (map) {
@@ -273,7 +287,8 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
- console.log(this.basemapList)
+ this.toolActive = -1
+ // console.log(this.basemapList)
for (let i = 0; i < this.isShow.length; i++) {
if (i !== index) {
this.isShow[i] = false
@@ -285,6 +300,11 @@
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
+ if (itemT.active !== -1) {
+ this.toolActive = indexT
+ } else {
+ this.toolActive = -1
+ }
if (this.isSelecd === indexT) {
this.checkedItem = !this.checkedItem
} else {
@@ -391,12 +411,27 @@
this.isShow = !this.isShow
this.active = -1
}
+ const state = {
+ type: this.selectGroup,
+ num: 1
+ }
+ bus.$emit('changeState', state)
}
}
}
</script>
<style lang="less" scoped>
+
+.tools-panel-content .el-button .zongs {
+ transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ -moz-transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ -o-transform: rotate(90deg);
+ display: block;
+}
+
.animationChange-enter-active, .animationChange-leave-active {
transition: all 0.5s;
}
@@ -415,14 +450,19 @@
.specific-tools {
display: flex;
overflow: hidden;
- .el-button {
+
+ .el-button {
z-index: 999;
padding: 0;
margin: 0 0.015rem;
width: 0.2725rem;
height: 0.2725rem;
+ color: #00fff6;
background: @background-color;
+ border: 0.00521rem solid #00fff6;
vertical-align: middle !important;
+ font-size: 20px;
+
.base-map-img {
position: absolute;
}
@@ -430,21 +470,25 @@
.base-map-img:hover {
cursor: pointer;
}
+
img {
width: 22px;
height: 22px;
}
+
.span-default {
display: block;
font-size: 10px;
}
+
span {
display: block;
font-size: 10px;
}
}
- .specific-tools-group .el-button{
- span{
+
+ .specific-tools-group .el-button {
+ span {
color: #0B89B5;
}
}
@@ -454,7 +498,7 @@
z-index: 999;
padding: 0;
margin: 0;
- margin-right:0.015rem;
+ margin-right: 0.015rem;
width: 0.2725rem;
height: 0.2725rem;
background: @background-color;
@@ -470,8 +514,9 @@
z-index: 1;
.tools-panel-choose {
- border: none;
- box-shadow: 0 0 0.03rem @color-shadow;
+ border: 0.00521rem solid #fff700;
+ box-shadow: 0 0 0.03rem #fff700;
+ color: #fff700;
img {
width: 22px;
@@ -492,16 +537,18 @@
.special-button {
width: 0.1362rem;
height: 0.2725rem;
- background:@background-color4;
- color:@color-tool;
- border:1px solid @color-tool;
+ background: @background-color4;
+ color: @color-tool;
+ border: 1px solid @color-tool;
}
- .special-button:hover{
+
+ .special-button:hover {
color: #00fff6;
}
}
}
}
+
.base-map-inner-panel {
display: flex;
justify-content: center;
--
Gitblit v1.8.0