From bbce81a396e22743b1fbf0c54fed05ab79c99e72 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期六, 29 五月 2021 16:28:51 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/ToolBoxPanel.vue | 439 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 252 insertions(+), 187 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 8db22bb..d4f0d28 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,59 +1,46 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <el-button class="el-button-choice" @click="changeSelect" v-show="selectGroup">
- <img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
- <span>宸ュ叿</span>
- </el-button>
- <el-button class="el-button-choice" @click="changeSelect" v-show="!selectGroup">
- <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="">
- <a>宸ュ叿</a>
- </el-button>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="宸ュ叿" placement="left">
+ <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"
- trigger="click"
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
- >
- <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
- @click="changeChoose(index)">
- <img :src="item.iconSelecd" alt="" v-if="active === index && checked === true"/>
- <img :src="item.icon" alt="" v-else/>
- <span>{{ item.label }}</span>
+ v-model="isShow[index]">
+ <el-button slot="reference" class="el-button" :class="active === index? 'tools-panel-choose':''"
+ @click.native="changeChoose(index)">
+ <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 && checked === true"/>
- <img :src="itemT.icon" :title="itemT.title" 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="!isShow&&item.index==='2'">
- <div v-for="item in 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)"/>
- <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">
+ <!-- <el-button @click="changeSelect" class="special-button">
<i class="el-icon-d-arrow-left"></i>
- </el-button>
- </el-row>
+ </el-button> -->
+ </div>
</transition>
</div>
</div>
</template>
<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'
@@ -64,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'
@@ -82,24 +69,44 @@
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 Measure from '@/components/plugin/MeaSure'
+//
+import bus from '@/eventBus'
+
export default {
name: 'ToolBoxPanel',
+ components: {
+ LcBaseMap
+ },
data () {
return {
+ isShow: [],
+ // currentBaseMapCode: 'tianditu_img',
+ // basemapList: [],
+ selectGroup: false,
+ drawLayer: null,
+ drawLayerArray: [],
+ map: null,
+ active: -1,
checked: false,
- checkbuuton: -1,
- isShow: true,
- currentBaseMapCode: 'tianditu_img',
- basemapList: [],
+ checkbutton: -1,
+ checkedItem: false,
+ Selecd: -1,
+ isSelecd: -1,
+ toolActive: -1,
menuList: [
{
- icon: plot,
+ icon: 'iconjuliceliang', // plot,
iconSelecd: plotChooose,
label: '鏍囩粯',
index: '1',
@@ -107,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',
@@ -157,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',
@@ -186,6 +202,7 @@
{
label: '褰卞儚鍥�',
index: '2-1',
+ active: 0,
items: [
{
index: '2-1-1',
@@ -196,6 +213,7 @@
{
label: '鐭㈤噺鍥�',
index: '2-2',
+ active: 0,
items: [
{
index: '2-2-1',
@@ -206,6 +224,7 @@
{
label: '鍦板舰鍥�',
index: '2-3',
+ active: 0,
items: [
{
index: '2-3-1',
@@ -216,7 +235,7 @@
]
},
{
- icon: fullscreen,
+ icon: 'icondownload', // fullscreen,
iconSelecd: dowloadChooose,
label: '涓嬭浇',
index: '4',
@@ -224,85 +243,78 @@
{
index: '4-1',
label: '鍏ㄥ睆',
- icon: '',
+ icon: 'icontianchongxing-', // FullScreen,
+ active: 0,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
- icon: '',
+ icon: 'iconsaoma', // cross,
+ active: 0,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
- icon: '',
+ icon: 'iconsaoma zongs', // vertical,
+ active: 0,
title: 'A4绾靛悜'
}
]
}
- ],
- selectGroup: false,
- drawLayer: null,
- drawLayerArray: [],
- map: null,
- // L: window.L,
- active: -1,
- Selecd: -1
+ ]
}
},
- computed: {
- basemapHelper () {
- return this.$store.state.map.basemapHelper
- }
- },
- watch: {
- basemapHelper (newVal) {
- if (newVal != null) {
- this.updateBasemapList()
+ 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: {
- updateBasemapList () {
- this.basemapList = this.basemapHelper.getBasemapList()
- },
- changeBasemap (itm) {
- const code = itm.code
- this.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)
- } else {
- this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
- }
-
- this.basemapHelper.getBasemapList().forEach((item) => {
- item.layer.bringToBack()
- })
- }
- })
+ init (map) {
+ this.map = map
+ this.toolBoxPanelVisible = true
},
changeChoose (index) {
- this.active = index
if (this.drawLayer == null) {
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
- if (this.checkbuuton === index) {
- this.checked = !this.checked
- } else {
- if (this.checkbuuton === -1) {
- this.checked = !this.checked
- } else {
- this.checked = true
+ this.active = index
+ this.toolActive = -1
+ // console.log(this.basemapList)
+ for (let i = 0; i < this.isShow.length; i++) {
+ if (i !== index) {
+ this.isShow[i] = false
}
}
- this.checkbuuton = index
+ // debugger
+ this.isShow[index] = !this.isShow[index]
+ this.isShow[index] ? (this.active = index) : (this.active = '')
},
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 {
+ if (this.isSelecd === -1) {
+ this.checkedItem = !this.checkedItem
+ } else {
+ this.checkedItem = true
+ }
+ }
+ this.isSelecd = indexT
switch (itemT.label) {
case '鐐规爣缁�':
var myIcon = this.L.icon({
@@ -314,6 +326,7 @@
this.drawLayer = this.map.editTools.startMarker()
this.drawLayer.setIcon(myIcon)
this.drawLayerArray.push(this.drawLayer)
+ this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
break
case '绾挎爣缁�':
this.drawLayer = this.map.editTools.startPolyline()
@@ -352,10 +365,9 @@
case '鍏ㄥ睆':
// this.map.toggleFullscreen()
var printer = this.L.easyPrint({
- sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printer.printMap('CurrentSize', '鍏ㄥ睆')
break
@@ -364,7 +376,8 @@
sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printerX.printMap('A4Landscape page', '妯悜')
break
@@ -373,11 +386,13 @@
sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printerY.printMap('A4Portrait page', '绾靛悜')
break
}
+ this.active = -1
},
setLogic () {
this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
@@ -386,15 +401,37 @@
})
},
changeSelect () {
+ this.selectGroup = false
+ },
+ changeSelectMouse () {
this.selectGroup = !this.selectGroup
- this.isShow = !this.isShow
- this.checked = false
+ if (this.selectGroup) {
+ this.isShow = []
+ } else {
+ 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;
}
@@ -406,21 +443,25 @@
.left-top-toolbox-panel {
position: absolute;
- left: 0;
- top: 15px;
+ left: 0.14583rem;
+ top: 0.11979rem;
z-index: 999;
.specific-tools {
display: flex;
+ overflow: hidden;
.el-button {
z-index: 999;
padding: 0;
margin: 0 0.015rem;
- width: 45px;
- height: 45px;
- background: @background-color-tools;
- border: none;
+ 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;
@@ -435,81 +476,47 @@
height: 22px;
}
- span {
+ .span-default {
display: block;
- color: @color-tool;
+ font-size: 10px;
}
- a {
+ span {
display: block;
- color: @color-shadow;
+ font-size: 10px;
+ }
+ }
+
+ .specific-tools-group .el-button {
+ span {
+ color: #0B89B5;
}
}
.el-button-choice {
+ left: 500px;
z-index: 999;
padding: 0;
- margin: 0 0.015rem;
- width: 45px;
- height: 45px;
- background: @background-color-tools;
- border: 1px solid @color-shadow;
+ margin: 0;
+ margin-right: 0.015rem;
+ width: 0.2725rem;
+ height: 0.2725rem;
+ background: @background-color;
+ border: 0.00521rem solid @color-shadow;
+ }
+
+ .active-button {
+ border: 0.00521rem solid #fff700;
+ box-shadow: 0 0 0.03rem #fff700;
}
.specific-tools-group {
z-index: 1;
- //.tools-panel-content {
- // width:220px!important;
- //}
- .base-map-inner-panel {
- //width: 230px!important;
- display: flex;
- justify-content: center;
- align-items: center;
-
- .base-map-img {
- position: absolute;
- }
-
- .base-map-img-Tool:hover {
- cursor: pointer;
- }
-
- .base-map-anno-Tool {
- position: absolute;
- margin-left: 2px;
- background-color: rgba(0, 0, 0, .5);
- color: white;
-
- .el-checkbox__label {
- padding-left: 5px !important;
- }
- }
-
- .basemap-layer-item {
- display: flex;
- width: 50px;
- height: 50px;
- margin: 10px;
- border: 2px solid white;
-
- input {
- position: relative;
- left: 0;
- top: -53px;
- }
-
- .basemap-layer-item-name {
- position: relative;
- left: 0;
- top: -53px;
- }
- }
- }
.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;
@@ -518,15 +525,73 @@
span {
display: block;
+ color: @color-shadow;
+ }
+
+ .default-span {
+ display: block;
+ color: @color-over;
}
}
- }
- .special-button {
- width: 22.5px;
- height: 45px;
- color: @color-over;
+ .special-button {
+ width: 0.1362rem;
+ height: 0.2725rem;
+ background: @background-color4;
+ color: @color-tool;
+ border: 1px solid @color-tool;
+ }
+
+ .special-button:hover {
+ color: #00fff6;
+ }
}
}
}
+
+.base-map-inner-panel {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .base-map-img {
+ position: absolute;
+ }
+
+ .base-map-img-Tool:hover {
+ cursor: pointer;
+ }
+
+ .base-map-anno-Tool {
+ position: absolute;
+ margin-left: 2px;
+ background-color: rgba(0, 0, 0, .5);
+ color: @color-over;
+
+ .el-checkbox__label {
+ padding-left: 5px !important;
+ }
+ }
+
+ .basemap-layer-item {
+ display: flex;
+ width: 50px;
+ height: 50px;
+ margin: 10px;
+ border: 2px solid white;
+
+ input {
+ position: relative;
+ left: 0;
+ top: -53px;
+ }
+
+ .basemap-layer-item-name {
+ position: relative;
+ left: 0;
+ top: -53px;
+ }
+ }
+}
+
</style>
--
Gitblit v1.8.0