From 3da1818bf94543c9f48191df52f76e1ac92bf542 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 15 四月 2021 16:46:54 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/ToolBoxPanel.vue | 102 +++++++++++++++++++++++++--------------------------
1 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 585dba3..b9b89f9 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -3,7 +3,7 @@
<div class="specific-tools">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="宸ュ叿" placement="left">
<el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @click.enter.native="changeSelectMouse">
- <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
+ <i class="icon iconfont icongongju"></i>
<!--<span class="span-default">宸ュ叿</span>-->
</el-button>
</el-tooltip>
@@ -17,28 +17,16 @@
:width="item.index === '2'?230 : 150"
v-model="isShow[index]"
>
- <el-button slot="reference" class="el-button"
- :class="active === index? 'tools-panel-choose':''"
- @click.native="changeChoose(index)">
- <img :src="item.iconSelecd" alt="" v-if="active === index"/>
- <img :src="item.icon" alt="" v-else/>
- <!--<span v-if="active === index">{{ item.label }}</span>
- <span v-else class="default-span">{{ item.label }}</span>-->
+ <el-button slot="reference" class="el-button" :class="active === index? 'tools-panel-choose':''" @click.native="changeChoose(index)">
+ <!-- <img :src="item.iconSelecd" alt="" v-if="active === index"/>
+ <img :src="item.icon" alt="" v-else/> -->
+ <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 && checkedItem" alt=""/>
- <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
+ <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/> -->
+ <i :class="'icon iconfont '+itemT.icon"></i>
</el-button>
-<!-- <div class="base-map-inner-panel" v-show="item.index==='2'">-->
-<!-- <div v-for="item in basemapHelper.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>-->
<lc-base-map v-show="item.index==='2'"></lc-base-map>
</el-popover>
<!-- <el-button @click="changeSelect" class="special-button">
@@ -53,10 +41,10 @@
<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'
@@ -67,12 +55,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'
@@ -85,13 +73,13 @@
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 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'
@@ -121,7 +109,7 @@
isSelecd: -1,
menuList: [
{
- icon: plot,
+ icon: 'iconjuliceliang', // plot,
iconSelecd: plotChooose,
label: '鏍囩粯',
index: '1',
@@ -129,49 +117,49 @@
{
index: '1-1',
label: '鐐规爣缁�',
- icon: marker,
+ icon: 'iconlocation-full', // marker,
title: '鐐规爣缁�',
iconChoose: markerChoose
},
{
index: '1-2',
label: '绾挎爣缁�',
- icon: line,
+ icon: 'iconline', // line,
title: '绾挎爣缁�',
iconChoose: lineChoose
},
{
index: '1-4',
label: '澶氳竟褰�',
- icon: polygonJ,
+ icon: 'iconliubianxing1', // polygonJ,
title: '澶氳竟褰�',
iconChoose: polygonJChoose
},
{
index: '1-5',
label: '鐭╁舰',
- icon: polygonS,
+ icon: 'iconcheckbox-full', // polygonS,
title: '鐭╁舰',
iconChoose: polygonSChoose
},
{
index: '1-3',
label: '鍦嗗舰',
- icon: polygonY,
+ icon: 'iconyuan', // polygonY,
title: '鍦嗗舰',
iconChoose: polygonYChoose
},
{
index: '1-4',
label: '鍒犻櫎',
- icon: del,
+ icon: 'icondelete-fill', // del,
title: '鍒犻櫎鏍囩粯',
iconChoose: delChoose
}
]
},
{
- icon: polygon,
+ icon: 'iconcelianggongju', // polygon,
iconSelecd: polygonChooose,
label: '娴嬮噺',
index: '3',
@@ -179,28 +167,28 @@
{
index: '3-1',
label: '璺濈',
- icon: distance,
+ icon: 'iconjuliceliang', // distance,
title: '璺濈娴嬮噺',
iconChoose: distanceChoose
},
{
index: '3-2',
label: '闈㈢Н',
- icon: mm,
+ icon: 'iconmianjiceliang', // mm,
title: '闈㈢Н娴嬮噺',
iconChoose: mmChoose
},
{
index: '3-3',
label: '娓呴櫎',
- icon: del,
+ icon: 'icondelete-fill', // del,
title: '娓呴櫎娴嬮噺',
iconChoose: delChoose
}
]
},
{
- icon: location,
+ icon: 'iconditu1', // location,
iconSelecd: locationChooose,
label: '鍦板浘',
index: '2',
@@ -238,7 +226,7 @@
]
},
{
- icon: fullscreen,
+ icon: 'icondownload', // fullscreen,
iconSelecd: dowloadChooose,
label: '涓嬭浇',
index: '4',
@@ -246,19 +234,19 @@
{
index: '4-1',
label: '鍏ㄥ睆',
- icon: FullScreen,
+ icon: 'icontianchongxing-', // FullScreen,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
- icon: cross,
+ icon: 'iconsaoma', // cross,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
- icon: vertical,
+ icon: 'iconsaoma zongs', // vertical,
title: 'A4绾靛悜'
}
]
@@ -416,6 +404,15 @@
</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;
}
@@ -442,6 +439,7 @@
height: 0.2725rem;
background: @background-color;
vertical-align: middle !important;
+ font-size: 20px;
.base-map-img {
position: absolute;
}
--
Gitblit v1.8.0