From c5ff93f67775f4a2bc0ffabd6c24cb46e5226df0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 07 Jul 2023 16:01:11 +0800
Subject: [PATCH] 电子沙盘调整---警戒线样式选择
---
src/components/imagesSelect/index.vue | 4 ++--
public/images/jjx3.png | 0
src/views/activity/components/polygonPlot.vue | 19 ++++++++++++++-----
src/components/warningSelect/index.vue | 2 +-
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/public/images/jjx.png b/public/images/jjx3.png
similarity index 100%
rename from public/images/jjx.png
rename to public/images/jjx3.png
Binary files differ
diff --git a/src/components/imagesSelect/index.vue b/src/components/imagesSelect/index.vue
index f03ae61..5b81780 100644
--- a/src/components/imagesSelect/index.vue
+++ b/src/components/imagesSelect/index.vue
@@ -56,7 +56,7 @@
},
curImgClick (item) {
- this.$emit('curClick', item.url)
+ this.$emit('curClick', item.url, 1)
}
},
}
@@ -78,7 +78,7 @@
background: $el-dialog-bg-color;
border-radius: 10px;
- & > div {
+ &>div {
padding: 6px;
margin: 10px;
width: 50px;
diff --git a/src/components/warningSelect/index.vue b/src/components/warningSelect/index.vue
index 75d87d1..3116912 100644
--- a/src/components/warningSelect/index.vue
+++ b/src/components/warningSelect/index.vue
@@ -74,7 +74,7 @@
},
curImgClick (item) {
- this.$emit('curClick', item.url)
+ this.$emit('curClick', item.url, 2)
}
},
}
diff --git a/src/views/activity/components/polygonPlot.vue b/src/views/activity/components/polygonPlot.vue
index 58831e3..79d3c3b 100644
--- a/src/views/activity/components/polygonPlot.vue
+++ b/src/views/activity/components/polygonPlot.vue
@@ -105,7 +105,7 @@
<div class="select-image" style="position: relative; display: flex; align-items: center;">
<el-button style="margin-top: 0; position: relative; background: transparent; border-color: #fff;"
@click="imagesListShow = !imagesListShow">
- <img :src="curImgUrl" alt
+ <img :src="warningImgUrl" alt
style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index: 999; width: 20px; height: 20px;" />
</el-button>
<Warning-select v-show="imagesListShow" @curClick="curClick"></Warning-select>
@@ -217,12 +217,17 @@
imagesListShow: false,
restPlotType: 6,
restSelectBox: false,
- curImgUrl: '/img/icon/custom.png'
+ curImgUrl: '/img/icon/custom.png',
+ warningImgUrl: '/images/jjx3.png'
}
},
methods: {
- curClick (item) {
- this.curImgUrl = item
+ curClick (item, type) {
+ if (type == 1) {
+ this.curImgUrl = item
+ } else {
+ this.warningImgUrl = item
+ }
this.imagesListShow = false
},
@@ -400,6 +405,8 @@
let positionStr = ''
let iconUrl = {}
+
+
if (this.restSelectBox) {
positionStr = polygonPlotData + ',' + polygonPlotData
} else {
@@ -407,7 +414,9 @@
positionStr = polygonPlotData
} else if (this.plotSaveType == 5) {
positionStr = polygonPlotData
- if (this.polygonAreaType == 2) iconUrl = { iconUrl: this.curImgUrl }
+ if (this.polygonAreaType == 2) {
+ iconUrl = { iconUrl: this.warningImgUrl }
+ }
} else if (this.plotSaveType == 6 || this.plotSaveType == 7 || this.plotSaveType == 8) {
positionStr = polygonPlotData + ',' + polygonPlotData
} else if (this.plotSaveType == 10) {
--
Gitblit v1.9.3