From 628a103286887e42b5916a483fcbcf8d08963b64 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 16 三月 2021 15:54:04 +0800
Subject: [PATCH] 修改选中效果
---
src/assets/images/map-pages/icon/toolbox/biaohuimark/juliceliangmark.png | 0
src/assets/images/map-pages/icon/toolbox/biaohuimark/rectmark.png | 0
src/assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png | 0
src/assets/images/map-pages/icon/toolbox/biaohuimark/liubianxing2mark.png | 0
src/components/panel/ToolBoxPanel.vue | 72 ++++++++++++++++++++++-------------
src/assets/images/map-pages/icon/toolbox/biaohuimark/circlemark.png | 0
src/assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.png | 0
src/assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png | 0
src/assets/images/map-pages/icon/toolbox/biaohuimark/mianjiceliangmark.png | 0
9 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/circlemark.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/circlemark.png
new file mode 100644
index 0000000..d73f362
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/circlemark.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png
new file mode 100644
index 0000000..8e8525e
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/juliceliangmark.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/juliceliangmark.png
new file mode 100644
index 0000000..7d2c1e1
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/juliceliangmark.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png
new file mode 100644
index 0000000..dd28323
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/liubianxing2mark.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/liubianxing2mark.png
new file mode 100644
index 0000000..923cfe9
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/liubianxing2mark.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/mianjiceliangmark.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/mianjiceliangmark.png
new file mode 100644
index 0000000..e813f50
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/mianjiceliangmark.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/rectmark.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/rectmark.png
new file mode 100644
index 0000000..5248070
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/rectmark.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.png b/src/assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.png
new file mode 100644
index 0000000..689c53e
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.png
Binary files differ
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 9090fd0..80d3eb4 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -5,32 +5,35 @@
<img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
<span>宸ュ叿</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
+ 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-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'
@@ -45,6 +48,10 @@
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'
@@ -68,13 +75,15 @@
index: '1-1',
label: '鐐规爣缁�',
icon: marker,
- title: '鐐规爣缁�'
+ title: '鐐规爣缁�',
+ iconChoose: markerChoose
},
{
index: '1-2',
label: '绾挎爣缁�',
icon: line,
- title: '绾挎爣缁�'
+ title: '绾挎爣缁�',
+ iconChoose: lineChoose
},
{
index: '1-4',
@@ -185,7 +194,7 @@
}
],
selectGroup: false,
- active: 0,
+ active: -1,
drawLayer: null,
map: null,
L: window.L
@@ -194,6 +203,9 @@
methods: {
changeChoose (index) {
this.active = index
+ },
+ changeSelect () {
+ this.selectGroup = !this.selectGroup
},
choiceItem (itemT) {
switch (itemT.label) {
@@ -264,16 +276,21 @@
fillOpacity: 0.1,
fill: true
})
- },
- // 宸︿笂鍔熻兘鎺у埗
- changeSelect () {
- this.selectGroup = !this.selectGroup
}
}
}
</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,6 +301,7 @@
display: flex;
.el-button {
+ z-index: 999;
padding: 0;
margin: 0 0.015rem;
width: 45px;
--
Gitblit v1.8.0