From 0c7a1e656e6f6488d357ffe9ff95b727e4a9768f Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期二, 16 三月 2021 16:21:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/panel/ToolBoxPanel.vue | 444 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 255 insertions(+), 189 deletions(-) diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue index 1e9cba4..80d3eb4 100644 --- a/src/components/panel/ToolBoxPanel.vue +++ b/src/components/panel/ToolBoxPanel.vue @@ -1,134 +1,242 @@ <template> - <div class="lefttop-toolbox-panel"> - <div class="init-choose" @click="changeSelect()"> - <img src="@/assets/images/map-pages/icon/toolbox/circle.png" alt=""> + <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> + <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-button> + </el-row> + </transition> </div> - <div class="el-select-dropdown" v-show='selectGroup'> - <el-dropdown @command="handleCommand" trigger="click" v-for="(item,i) in imgLists" :key="i" :value="total"> - <transition name="fade"> - <img :src="item.title" :title="item.alt"/> - </transition> - <el-dropdown-menu> - <el-dropdown-item v-for="(ite,index) in item.items" :key="index" :command='ite.headings'> - <span>{{ ite.headings }}</span> - </el-dropdown-item> - </el-dropdown-menu> - </el-dropdown> - </div> - <!-- // 寮规--> - <TextBounced v-show="this.bouncedText" @changeBounced="gitBounced"></TextBounced> </div> </template> <script> -import circle from '@/assets/images/map-pages/icon/toolbox/circle.png' -import fullscreen from '@/assets/images/map-pages/icon/toolbox/fullscreen.png' -import legend from '@/assets/images/map-pages/icon/toolbox/legend.png' -import location from '@/assets/images/map-pages/icon/toolbox/location.png' -import polygon from '@/assets/images/map-pages/icon/toolbox/polygon.png' -import square from '@/assets/images/map-pages/icon/toolbox/square.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 '@/components/plugin/leaflet-measure-path/leaflet-measure-path.css' +// 鏍囩粯鐨勫彲閫夋嫨鏁版嵁 +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 markerChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png' +import lineChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png' + +// 娴嬮噺 +import distance from '@assets/images/map-pages/icon/toolbox/juli.png' +import mm from '@assets/images/map-pages/icon/toolbox/M2.png' + +// 娴嬮噺鐨勬柟娉� import Measure from '@/components/plugin/MeaSure' - -import MakeTation from '@components/plugin/MakeTation' - -import TextBounced from '@components/panel/bounced/TextBounced' export default { name: 'ToolBoxPanel', - components: { TextBounced }, + // components: { BaseNavMenuItem }, data () { return { - isPanelVisible: false, - total: 0, - activeTools: {}, - imgLists: [ + menuList: [ { - title: circle, - alt: '鏍囩粯', + icon: plot, + label: '鏍囩粯', + index: '1', items: [ - { headings: '绾挎爣缁�' }, - { headings: '闈㈡爣缁�' }, - { headings: '绠ご鏍囩粯' } + { + index: '1-1', + label: '鐐规爣缁�', + icon: marker, + title: '鐐规爣缁�', + iconChoose: markerChoose + }, + { + index: '1-2', + label: '绾挎爣缁�', + icon: line, + title: '绾挎爣缁�', + iconChoose: lineChoose + }, + { + index: '1-4', + label: '澶氳竟褰�', + icon: polygonJ, + title: '澶氳竟褰�' + }, + { + index: '1-5', + label: '鐭╁舰', + icon: polygonS, + title: '鐭╁舰' + }, + { + index: '1-3', + label: '鍦嗗舰', + icon: polygonY, + title: '鍦嗗舰' + }, + { + index: '1-4', + label: '鍒犻櫎', + icon: del, + title: '鍒犻櫎鏍囩粯' + } ] }, { - title: square, - alt: '鏍囨敞', + icon: polygon, + label: '娴嬮噺', + index: '3', items: [ - { headings: '鐐规爣娉�' }, - { headings: '绾挎爣娉�' }, - { headings: '闈㈡爣娉�' }, - { headings: '鏂囧瓧鏍囨敞' }, - { headings: '鍥炬爣鏍囨敞' } + { + index: '3-1', + label: '璺濈', + icon: distance, + title: '璺濈娴嬮噺' + }, + { + index: '3-2', + label: '闈㈢Н', + icon: mm, + title: '闈㈢Н娴嬮噺' + } ] }, { - title: legend, - alt: '娴嬮噺', + icon: location, + label: '鍦板浘', + index: '2', items: [ - { headings: '璺濈娴嬮噺' }, - { headings: '闈㈢Н娴嬮噺' } + { + label: '褰卞儚鍥�', + index: '2-1', + items: [ + { + index: '2-1-1', + label: '褰卞儚妯欐敞' + } + ] + }, + { + label: '鐭㈤噺鍥�', + index: '2-2', + items: [ + { + index: '2-2-1', + label: '鐭㈤噺妯欐敞' + } + ] + }, + { + label: '鍦板舰鍥�', + index: '2-3', + items: [ + { + index: '2-3-1', + label: '鍦板舰妯欐敞' + } + ] + } ] }, { - title: location, - alt: '鍒囨崲搴曞浘', + icon: fullscreen, + label: '涓嬭浇', + index: '4', items: [ - { headings: '褰卞儚鍥�' }, - { headings: '鐭㈤噺鍥�' }, - { headings: '鍦板舰鍥�' } - ] - }, - { - title: polygon, - alt: '绠$綉', - items: [ - { headings: '杩為�氭�у垎鏋�' }, - { headings: '鐖嗙鍒嗘瀽' }, - { headings: '娴佸悜鍒嗘瀽' }, - { headings: '妯柇闈㈠垎鏋�' } - ] - }, - { - title: fullscreen, - alt: '涓嬭浇', - items: [ - { headings: '鍏ㄥ睆' }, - { headings: 'A4妯悜' }, - { headings: 'A4绾靛悜' } + { + index: '4-1', + label: '鍏ㄥ睆', + icon: '', + title: '鍏ㄥ睆' + }, + { + index: '4-2', + label: 'A4妯悜', + icon: '', + title: 'A4妯悜' + }, + { + index: '4-3', + label: 'A4绾靛悜', + icon: '', + title: 'A4绾靛悜' + } ] } ], - form: { - regionType: '', - enterprise: '' - }, selectGroup: false, + active: -1, drawLayer: null, map: null, - L: window.L, - // 鎺у埗宸ュ叿鏍� 鏂囧瓧鏍囨敞 鐨勫脊妗嗘槸鍚︽樉绀� - bouncedText: false + L: window.L } }, methods: { - gitBounced (params) { - this.bouncedText = params + changeChoose (index) { + this.active = index }, changeSelect () { this.selectGroup = !this.selectGroup }, - handleClose (done) { - console.log(done) - }, - handleClick (tab, event) { - console.log(tab, event) - }, - handleCommand (command) { - console.log(command) - switch (command) { + choiceItem (itemT) { + switch (itemT.label) { + case '鐐规爣缁�': + var myIcon = this.L.icon({ + iconUrl: iconRefinery, + iconSize: [26, 32], + iconAnchor: [13, 16], + popupAnchor: [26, -32] + }) + this.drawLayer = this.map.editTools.startMarker() + this.drawLayer.setIcon(myIcon) + break + case '绾挎爣缁�': + this.drawLayer = this.map.editTools.startPolyline() + break + case '澶氳竟褰�': + this.drawLayer = this.map.editTools.startPolygon() + break + case '鐭╁舰': + this.drawLayer = this.map.editTools.startRectangle() + break + case '鍦嗗舰': + this.drawLayer = this.map.editTools.startCircle() + break + case '璺濈': + Measure.startMeasureLen(this.map, this.L) + break + case '闈㈢Н': + Measure.startMeasureArea(this.map, this.L) + break case '鍏ㄥ睆': // this.map.toggleFullscreen() var printer = this.L.easyPrint({ @@ -157,124 +265,82 @@ }).addTo(this.map) printerY.printMap('A4Portrait page', 'MyManualPrint') 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.startPolylineArrow() - this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit) - break - case '鐐规爣娉�': - this.drawLayer = this.map.editTools.startMarker() - this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit) - 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) + case '鍒犻櫎': + this.map.removeLayer(this.drawLayer) break } - }, - loadData () { - + 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 + }) } - }, - mounted () { - this.loadData() - }, - created () { - } } </script> -<style lang="less"> -.lefttop-toolbox-panel { +<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: 5px; - top: 5px; + left: 0; + top: 15px; z-index: 999; - display: flex; - .init-choose { - //margin: 15px 5px; - background: #305B62; - //margin-top: 15px; - width: 35px; - height: 38px; - border-radius: 50%; - border: 2px skyblue solid; + .specific-tools { display: flex; - align-items: center; - justify-content: center; - z-index: 999; - } - .el-select-dropdown { - position: absolute; - z-index: 1; - width: 250px; - height: 35px; - display: flex; - align-items: center; - justify-content: space-evenly; - background: #305B62; - border-radius: 15px; - padding-inline: 10px; - padding-inline-start: 30px; + .el-button { + z-index: 999; + padding: 0; + margin: 0 0.015rem; + width: 45px; + height: 45px; + background: @background-color-tools; + border: none; - .el-dropdow { - width: 20%; - } - - @keyframes bounce-in { - 0% { - transform: scale(0); - opacity: 0.3; + img { + width: 22px; + height: 22px; } - 100% { - transform: scale(1); - opacity: 1; + + span { + display: block; + color: @color-tool; } } - .fade-enter-active { - transform-origin: left center; - animation: bounce-in .2s; + .specific-tools-group { + .tools-panel-choose { + border: none; + box-shadow: 0 0 0.03rem @color-shadow; + + img { + width: 22px; + height: 22px; + } + + span { + display: block; + } + } } - .fade-leave-active { - transform-origin: left; - animation: bounce-in .2s reverse; + .special-button { + width: 22.5px; + height: 45px; + color: @color-over; } } - - .el-select-dropdown:last-child { - margin-left: 10px; - } - - .el-dropdown-link { - cursor: pointer; - color: #409EFF; - } - - .el-icon-arrow-down { - font-size: 12px; - } - } </style> -- Gitblit v1.8.0