From 2596ad89b4a57d2129f0a58cbc77d364eeaf412d Mon Sep 17 00:00:00 2001 From: chenyabin <Chenab123!> Date: 星期三, 31 三月 2021 16:57:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop --- src/components/panel/ToolBoxPanel.vue | 384 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 312 insertions(+), 72 deletions(-) diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue index 33c5480..36b950d 100644 --- a/src/components/panel/ToolBoxPanel.vue +++ b/src/components/panel/ToolBoxPanel.vue @@ -1,40 +1,65 @@ <template> <div class="left-top-toolbox-panel"> <div class="specific-tools"> - <el-button @click="changeSelect"> - <img src="@assets/images/map-pages/icon/toolbox/tool.png" alt=""> - <span>宸ュ叿</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=""/> + <span class="span-default">宸ュ叿</span> </el-button> - <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> + <transition name="animationChange"> + <el-row 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 && checked? 'tools-panel-choose':''" + @click.native="changeChoose(index)"> + <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/> + <img :src="item.icon" alt="" v-else/> + <span v-if="active === index && checked">{{ 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 && 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"> + <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> + </el-popover> + <el-button @click="changeSelect" class="special-button"> + <i class="el-icon-d-arrow-left"></i> </el-button> - <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT)"> - <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-right':'el-icon-d-arrow-left'"></i> - </el-button> - </el-row> + </el-row> + </transition> </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 plotChooose from '@assets/images/map-pages/icon/toolbox/Selecd/biaohui.png' +import polygonChooose from '@assets/images/map-pages/icon/toolbox/Selecd/celiang1.png' +import locationChooose from '@assets/images/map-pages/icon/toolbox/Selecd/ditu.png' +import dowloadChooose from '@assets/images/map-pages/icon/toolbox/Selecd/xiazai.png' // 鏍囩粯鐨勫彲閫夋嫨鏁版嵁 import iconRefinery from '@assets/images/map-pages/local.png' @@ -46,21 +71,49 @@ 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' +import lineChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png' +import polygonJChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/liubianxing2mark.png' +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' 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' export default { name: 'ToolBoxPanel', - // components: { BaseNavMenuItem }, data () { return { + isShow: [], + currentBaseMapCode: 'tianditu_img', + basemapList: [], + selectGroup: false, + drawLayer: null, + drawLayerArray: [], + map: null, + active: -1, + checked: false, + checkbutton: -1, + checkedItem: false, + Selecd: -1, + isSelecd: -1, menuList: [ { icon: plot, + iconSelecd: plotChooose, label: '鏍囩粯', index: '1', items: [ @@ -68,42 +121,49 @@ index: '1-1', label: '鐐规爣缁�', icon: marker, - title: '鐐规爣缁�' + title: '鐐规爣缁�', + iconChoose: markerChoose }, { index: '1-2', label: '绾挎爣缁�', icon: line, - title: '绾挎爣缁�' + title: '绾挎爣缁�', + iconChoose: lineChoose }, { index: '1-4', label: '澶氳竟褰�', icon: polygonJ, - title: '澶氳竟褰�' + title: '澶氳竟褰�', + iconChoose: polygonJChoose }, { index: '1-5', label: '鐭╁舰', icon: polygonS, - title: '鐭╁舰' + title: '鐭╁舰', + iconChoose: polygonSChoose }, { index: '1-3', label: '鍦嗗舰', icon: polygonY, - title: '鍦嗗舰' + title: '鍦嗗舰', + iconChoose: polygonYChoose }, { index: '1-4', label: '鍒犻櫎', icon: del, - title: '鍒犻櫎鏍囩粯' + title: '鍒犻櫎鏍囩粯', + iconChoose: delChoose } ] }, { icon: polygon, + iconSelecd: polygonChooose, label: '娴嬮噺', index: '3', items: [ @@ -111,18 +171,28 @@ 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: del, + title: '娓呴櫎娴嬮噺', + iconChoose: delChoose } ] }, { icon: location, + iconSelecd: locationChooose, label: '鍦板浘', index: '2', items: [ @@ -160,42 +230,98 @@ }, { icon: fullscreen, + iconSelecd: dowloadChooose, label: '涓嬭浇', index: '4', items: [ { 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绾靛悜' } ] } - ], - selectGroup: false, - active: 0, - drawLayer: null, - map: null, - L: window.L + ] + } + }, + computed: { + basemapHelper () { + return this.$store.state.map.basemapHelper + } + }, + watch: { + basemapHelper (newVal) { + if (newVal != null) { + this.updateBasemapList() + } } }, methods: { - changeChoose (index) { - this.active = index + updateBasemapList () { + this.basemapList = this.basemapHelper.getBasemapList() }, - choiceItem (itemT) { + changeBasemap (itm) { + this.active = -1 + 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.drawLayer == null) { + this.drawLayer = this.L.layerGroup().addTo(this.map) + } + this.active = index + this.isShow[index] = !this.isShow[index] + if (this.checkbutton === index) { + this.checked = !this.checked + this.Selecd = -1 + } else { + if (this.checkbutton === -1) { + this.checked = !this.checked + } else { + this.checked = true + } + } + this.checkbutton = index + }, + choiceItem (itemT, indexT) { + this.Selecd = indexT + 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({ @@ -206,18 +332,36 @@ }) 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() + this.drawLayerArray.push(this.drawLayer) + this.setLogic() break case '澶氳竟褰�': this.drawLayer = this.map.editTools.startPolygon() + this.drawLayerArray.push(this.drawLayer) + this.setLogic() break case '鐭╁舰': this.drawLayer = this.map.editTools.startRectangle() + this.drawLayerArray.push(this.drawLayer) + this.setLogic() break case '鍦嗗舰': this.drawLayer = this.map.editTools.startCircle() + this.drawLayerArray.push(this.drawLayer) + this.setLogic() + break + case '鍒犻櫎': + for (let i = 0; i < this.drawLayerArray.length; i++) { + this.map.removeLayer(this.drawLayerArray[i]) + } + break + case '娓呴櫎': + Measure.clearMeasure(this.map, this.L) break case '璺濈': Measure.startMeasureLen(this.map, this.L) @@ -228,52 +372,63 @@ 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', 'MyManualPrint') + printer.printMap('CurrentSize', '鍏ㄥ睆') break case 'A4妯悜': var printerX = this.L.easyPrint({ sizeModes: ['Current', 'A4Landscape', 'A4Portrait'], filename: 'map_image', exportOnly: true, - hideControlContainer: true + hideControlContainer: true, + hidden: true }).addTo(this.map) - printerX.printMap('A4Landscape page', 'MyManualPrint') + printerX.printMap('A4Landscape page', '妯悜') break case 'A4绾靛悜': var printerY = this.L.easyPrint({ sizeModes: ['Current', 'A4Landscape', 'A4Portrait'], filename: 'map_image', exportOnly: true, - hideControlContainer: true + hideControlContainer: true, + hidden: true }).addTo(this.map) - printerY.printMap('A4Portrait page', 'MyManualPrint') - break - case '鍒犻櫎': - this.map.removeLayer(this.drawLayer) + printerY.printMap('A4Portrait page', '绾靛悜') break } - this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit) - if (itemT.label === '澶氳竟褰�') { - this.drawLayer.setStyle({ color: 'red', fillColor: '#ffffff', fillOpacity: 0.1, fill: true }) - } - if (itemT.label === '鐭╁舰') { - this.drawLayer.setStyle({ color: 'red', fillColor: '#ffffff', fillOpacity: 0.1, fill: true }) - } + this.active = -1 }, - // 宸︿笂鍔熻兘鎺у埗 + setLogic () { + this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit) + this.drawLayer.setStyle({ + color: 'red' + }) + }, changeSelect () { - this.selectGroup = !this.selectGroup + this.selectGroup = false + this.isShow = !this.isShow + this.active = -1 + }, + changeSelectMouse () { + this.selectGroup = true } } } </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; @@ -284,25 +439,104 @@ display: flex; .el-button { + z-index: 999; padding: 0; margin: 0 0.015rem; width: 45px; height: 45px; - background: @background-color-tools; - border: none; + background: @background-color; + vertical-align: middle !important; + + .base-map-img { + position: absolute; + } + + .base-map-img:hover { + cursor: pointer; + } img { width: 22px; height: 22px; } + .span-default { + display: block; + color: @color-shadow; + font-size: 11px; + } + span { display: block; - color: @color-tool; + color: @color-over; + font-size: 11px; } } + .el-button-choice { + left: 500px; + z-index: 999; + padding: 0; + margin: 0 0.015rem; + width: 45px; + height: 45px; + 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; + + .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; + } + } + } + .tools-panel-choose { border: none; box-shadow: 0 0 0.03rem @color-shadow; @@ -314,14 +548,20 @@ 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: 22px; + height: 45px; + color: @color-over; + } } } } -- Gitblit v1.8.0