From 93cbeb9dec38530d552de90f7b6e2949ed76ce8b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 16 三月 2021 18:29:41 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork
---
src/components/panel/ToolBoxPanel.vue | 268 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 199 insertions(+), 69 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 7d206e9..27be230 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -5,43 +5,47 @@
<img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
<span>宸ュ叿</span>
</el-button>
- <transition name="animationChange">
- <el-row v-show="selectGroup" class="specific-tools-group">
- <el-popover
- placement="bottom"
- width=""
- trigger="click"
- :popper-class="'tools-panel-content'"
- v-for="(item,index) in menuList" :key="index"
- >
- <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
- @click="changeChoose(index)">
- <img :src="item.icon" alt=""/>
- <span>{{ item.label }}</span>
- </el-button>
- <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)">
- <img :src="itemT.icon" :title="itemT.title"/>
- </el-button>
- </el-popover>
- <el-button @click="changeSelect" class="special-button">
- <i :class="selectGroup === false ? 'el-icon-d-arrow-left':'el-icon-d-arrow-left'"></i>
+ <el-row v-show="selectGroup" class="specific-tools-group">
+ <el-popover
+ placement="bottom"
+ width="100%"
+ trigger="click"
+ :popper-class="'tools-panel-content'"
+ v-for="(item,index) in menuList" :key="index"
+ >
+ <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
+ @click="changeChoose(index)">
+ <img :src="item.icon" alt=""/>
+ <span>{{ item.label }}</span>
</el-button>
- </el-row>
- </transition>
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT)" v-show="item.index!=='2'">
+ <img :src="itemT.icon" :title="itemT.title" v-show="item.index!=='2'"/>
+ </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>
+ </el-popover>
+ <el-button @click="changeSelect" class="special-button">
+ <i :class="selectGroup === false ? 'el-icon-d-arrow-right':'el-icon-d-arrow-left'"></i>
+ </el-button>
+ </el-row>
</div>
</div>
</template>
<script>
-// 鍔熻兘瀵艰埅
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 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'
@@ -50,8 +54,6 @@
import del from '@assets/images/map-pages/icon/toolbox/del.png'
// 閫変腑鐨勫唴瀹瑰浘鐗�
-import markerChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png'
-import lineChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png'
import distanceChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/juliceliangmark.png'
import mmChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/mianjiceliangmark.png'
import delChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.png'
@@ -68,6 +70,9 @@
// components: { BaseNavMenuItem },
data () {
return {
+ isShow: true,
+ currentBaseMapCode: 'tianditu_img',
+ basemapList: [],
menuList: [
{
icon: plot,
@@ -78,15 +83,13 @@
index: '1-1',
label: '鐐规爣缁�',
icon: marker,
- title: '鐐规爣缁�',
- iconChoose: markerChoose
+ title: '鐐规爣缁�'
},
{
index: '1-2',
label: '绾挎爣缁�',
icon: line,
- title: '绾挎爣缁�',
- iconChoose: lineChoose
+ title: '绾挎爣缁�'
},
{
index: '1-4',
@@ -105,12 +108,6 @@
label: '鍦嗗舰',
icon: polygonY,
title: '鍦嗗舰'
- },
- {
- index: '1-4',
- label: '鍒犻櫎',
- icon: del,
- title: '鍒犻櫎鏍囩粯'
}
]
},
@@ -206,43 +203,73 @@
}
],
selectGroup: false,
- active: -1,
drawLayer: null,
Draw: null,
map: null,
- L: window.L
+ L: window.L,
+ active: 0
+ }
+ },
+ computed: {
+ basemapHelper () {
+ return this.$store.state.map.basemapHelper
+ }
+ },
+ watch: {
+ basemapHelper (newVal) {
+ if (newVal != null) {
+ this.updateBasemapList()
+ }
}
},
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()
+ })
+ }
+ })
+ },
changeChoose (index) {
this.active = index
},
- changeSelect () {
- this.selectGroup = !this.selectGroup
- },
choiceItem (itemT) {
+ console.log(itemT.label)
switch (itemT.label) {
case '鐐规爣缁�':
- var myIcon = this.L.icon({
- iconUrl: iconRefinery,
- iconSize: [26, 32],
- iconAnchor: [13, 16],
- popupAnchor: [26, -32]
- })
+ // MakeTation.StartPointAnnotation(this.map, this.L)
this.drawLayer = this.map.editTools.startMarker()
- this.drawLayer.setIcon(myIcon)
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
break
case '绾挎爣缁�':
this.drawLayer = this.map.editTools.startPolyline()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
break
case '澶氳竟褰�':
this.drawLayer = this.map.editTools.startPolygon()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
break
case '鐭╁舰':
this.drawLayer = this.map.editTools.startRectangle()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
break
case '鍦嗗舰':
this.drawLayer = this.map.editTools.startCircle()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
break
case '璺濈':
Measure.startMeasureLen(this.map, this.L)
@@ -281,32 +308,83 @@
}).addTo(this.map)
printerY.printMap('A4Portrait page', 'MyManualPrint')
break
- case '鍒犻櫎':
- this.map.removeLayer(this.drawLayer)
- break
}
- this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
- this.drawLayer.setStyle({
- color: 'red',
- fillColor: '#ffffff',
- fillOpacity: 0.1,
- fill: true
- })
+ },
+ // handleSelect (index) {
+ // console.log(index)
+ // switch (index) {
+ // case '4-1':
+ // // this.map.toggleFullscreen()
+ // var printer = this.L.easyPrint({
+ // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ // filename: 'map_image',
+ // exportOnly: true,
+ // hideControlContainer: true
+ // }).addTo(this.map)
+ // printer.printMap('CurrentSize', 'MyManualPrint')
+ // break
+ // case '4-2':
+ // var printerX = this.L.easyPrint({
+ // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ // filename: 'map_image',
+ // exportOnly: true,
+ // hideControlContainer: true
+ // }).addTo(this.map)
+ // printerX.printMap('A4Landscape page', 'MyManualPrint')
+ // break
+ // case '4-3':
+ // var printerY = this.L.easyPrint({
+ // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ // filename: 'map_image',
+ // exportOnly: true,
+ // hideControlContainer: true
+ // }).addTo(this.map)
+ // printerY.printMap('A4Portrait page', 'MyManualPrint')
+ // break
+ // case '1-2':
+ // this.drawLayer = this.map.editTools.startPolyline()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // Measure.startMeasureLen(this.map, this.L)
+ // break
+ // case '1-3-1':
+ // // alert('鍦嗗舰')
+ // this.drawLayer = this.map.editTools.circleMarker()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // break
+ // case '1-3-2':
+ // this.drawLayer = this.map.editTools.startPolygon()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // break
+ // case '1-1':
+ // MakeTation.StartPointAnnotation(this.map, this.L)
+ // break
+ // case '鍥炬爣鏍囨敞':
+ // this.drawLayer = this.map.editTools.startIcon()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // break
+ // case '鏂囧瓧鏍囨敞':
+ // this.bouncedText = true
+ // MakeTation.startMakeText(this.map, this.L)
+ // break
+ // case '璺濈娴嬮噺':
+ // Measure.startMeasureLen(this.map, this.L)
+ // break
+ // case '闈㈢Н娴嬮噺':
+ // Measure.startMeasureArea(this.map, this.L)
+ // break
+ // }
+ // },
+ // 鏂囧瓧鏍囨敞鎺у埗
+ // 宸︿笂鍔熻兘鎺у埗
+ changeSelect () {
+ this.selectGroup = !this.selectGroup
+ this.isShow = !this.isShow
}
}
}
</script>
<style lang="less" scoped>
-.animationChange-enter-active, .animationChange-leave-active {
- transition: all 0.5s;
-}
-
-.animationChange-enter, .animationChange-leave-to {
- opacity: 0;
- transform: translateX(-100px);
-}
-
.left-top-toolbox-panel {
position: absolute;
left: 0;
@@ -315,7 +393,6 @@
.specific-tools {
display: flex;
-
.el-button {
z-index: 999;
padding: 0;
@@ -324,6 +401,12 @@
height: 45px;
background: @background-color-tools;
border: none;
+ .base-map-img{
+ position: absolute;
+ }
+ .base-map-img:hover{
+ cursor:pointer;
+ }
img {
width: 22px;
@@ -332,11 +415,51 @@
span {
display: block;
+ font-size: 0.012rem;
color: @color-tool;
}
}
.specific-tools-group {
+ z-index: 1;
+ //.tools-panel-content {
+ // width:220px!important;
+ //}
+ .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: 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;
@@ -359,4 +482,11 @@
}
}
}
+.isD-enter-active, .isD-leave-active{
+ transition: all 0.5s;
+}
+.isD-enter, .isD-leave-to{
+ opacity: 0;
+ transform: translateX(-100px);
+}
</style>
--
Gitblit v1.8.0