From acf1cadd6e2af1f288192e02e5b8303841d85c4b Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期三, 17 三月 2021 14:47:06 +0800 Subject: [PATCH] 功能弹出事件更改 --- src/components/panel/ToolBoxPanel.vue | 226 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 177 insertions(+), 49 deletions(-) diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue index e3d5d7d..2fdb720 100644 --- a/src/components/panel/ToolBoxPanel.vue +++ b/src/components/panel/ToolBoxPanel.vue @@ -1,22 +1,19 @@ <template> <div class="left-top-toolbox-panel"> <div class="specific-tools"> - <el-button @click="changeSelect" v-show="selectGroup"> - <img src="@assets/images/map-pages/icon/toolbox/tool.png" alt=""> - <span>宸ュ叿</span> - </el-button> - <el-button @click="changeSelect" v-show="!selectGroup"> - <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt=""> - <a>宸ュ叿</a> + <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> <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" + :width="item.index === '2'?230 : 150" > <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''" @click="changeChoose(index)"> @@ -24,13 +21,23 @@ <img :src="item.icon" alt="" v-else/> <span>{{ item.label }}</span> </el-button> - <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"> + <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/> </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-left':'el-icon-d-arrow-left'"></i> + <i class="el-icon-d-arrow-left"></i> </el-button> </el-row> </transition> @@ -68,6 +75,8 @@ import polygonSChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/rectmark.png' import polygonYChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/circlemark.png' import delChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.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 distance from '@assets/images/map-pages/icon/toolbox/juli.png' @@ -80,12 +89,14 @@ name: 'ToolBoxPanel', data () { return { + isShow: true, + currentBaseMapCode: 'tianditu_img', + basemapList: [], selectGroup: false, - active: -1, - Selecd: -1, drawLayer: null, map: null, - L: window.L, + active: -1, + Selecd: -1, menuList: [ { icon: plot, @@ -147,19 +158,22 @@ index: '3-1', label: '璺濈', icon: distance, - title: '璺濈娴嬮噺' + title: '璺濈娴嬮噺', + iconChoose: distanceChoose }, { index: '3-2', label: '闈㈢Н', icon: mm, - title: '闈㈢Н娴嬮噺' + title: '闈㈢Н娴嬮噺', + iconChoose: mmChoose }, { index: '3-3', - label: '鍒犻櫎', - icon: '', - title: '鍒犻櫎' + label: '娓呴櫎', + icon: del, + title: '娓呴櫎娴嬮噺', + iconChoose: delChoose } ] }, @@ -230,15 +244,48 @@ ] } }, + 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) { + if (this.active === index) { + console.log('鍙栨秷褰撳墠閫変腑鐘舵��') + } this.active = index if (this.drawLayer == null) { this.drawLayer = this.L.layerGroup().addTo(this.map) } - }, - changeSelect () { - this.selectGroup = !this.selectGroup }, choiceItem (itemT, indexT) { this.Selecd = indexT @@ -250,10 +297,10 @@ iconAnchor: [13, 16], popupAnchor: [26, -32] }) - var drawLayer = this.map.editTools.startMarker() - drawLayer.setIcon(myIcon) - this.drawLayer.addLayer(drawLayer) - this.setLogic(drawLayer) + var drawLayerMarker = this.map.editTools.startMarker() + drawLayerMarker.setIcon(myIcon) + this.drawLayer.addLayer(drawLayerMarker) + this.setLogic(drawLayerMarker) break case '绾挎爣缁�': var drawLayerLine = this.map.editTools.startPolyline() @@ -275,6 +322,12 @@ this.drawLayer.addLayer(drawLayerPolygonY) this.setLogic(drawLayerPolygonY) break + case '鍒犻櫎': + this.drawLayer.clearLayers() + break + case '娓呴櫎': + Measure.clearMeasure(this.map, this.L) + break case '璺濈': Measure.startMeasureLen(this.map, this.L) break @@ -289,7 +342,7 @@ exportOnly: true, hideControlContainer: true }).addTo(this.map) - printer.printMap('CurrentSize', 'MyManualPrint') + printer.printMap('CurrentSize', '鍏ㄥ睆') break case 'A4妯悜': var printerX = this.L.easyPrint({ @@ -298,7 +351,7 @@ exportOnly: true, hideControlContainer: true }).addTo(this.map) - printerX.printMap('A4Landscape page', 'MyManualPrint') + printerX.printMap('A4Landscape page', '妯悜') break case 'A4绾靛悜': var printerY = this.L.easyPrint({ @@ -307,22 +360,22 @@ exportOnly: true, hideControlContainer: true }).addTo(this.map) - printerY.printMap('A4Portrait page', 'MyManualPrint') - break - case '鍒犻櫎': - // this.map.removeLayer(this.drawLayer) - this.drawLayer.clearLayers() + printerY.printMap('A4Portrait page', '绾靛悜') break } }, setLogic (layer) { layer.on('dblclick', this.L.DomEvent.stop).on('dblclick', layer.toggleEdit) layer.setStyle({ - color: 'red', - fillColor: '#ffffff', - fillOpacity: 0.1, - fill: true + color: 'yellow' }) + }, + changeSelect () { + this.selectGroup = false + this.isShow = !this.isShow + }, + changeSelectMouse () { + this.selectGroup = true } } } @@ -353,26 +406,100 @@ margin: 0 0.015rem; width: 45px; height: 45px; - background: @background-color-tools; - border: none; + background: @background-color; + //border: 1px solid @color-shadow; + vertical-align: middle !important; + + .base-map-img { + position: absolute; + } + + .base-map-img:hover { + cursor: pointer; + } img { width: 22px; height: 22px; } - span { - display: block; - color: @color-tool; - } - - a { + .span-default { display: block; color: @color-shadow; } + + span { + display: block; + color: @color-over; + } + } + + .el-button-choice { + z-index: 999; + padding: 0; + margin: 0 0.015rem; + width: 45px; + height: 45px; + background: @background-color; + border: 1px 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: @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; + } + } + } + .tools-panel-choose { border: none; box-shadow: 0 0 0.03rem @color-shadow; @@ -384,14 +511,15 @@ span { display: block; + color: @color-shadow; } } - } - .special-button { - width: 22.5px; - height: 45px; - color: @color-over; + .special-button { + width: 22px; + height: 45px; + color: @color-over; + } } } } -- Gitblit v1.8.0