From 94ae577b548d2f4c51f82f57feadde0048a69f9a Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 31 五月 2021 13:35:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue | 65 +++++++-------------------------
1 files changed, 14 insertions(+), 51 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
index ca90d4e..145b040 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationPoint.vue
@@ -1,27 +1,5 @@
<template>
<div class="location-lon-and-lat">
- <!-- <el-row>-->
- <!-- <el-form :model="lonlatpos" label-width="60px">-->
- <!-- <el-col :span="12">-->
- <!-- <el-form-item label="缁忓害:">-->
- <!-- <el-input type="text" v-model="lonlatpos.longPos"></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- <el-col :span="12">-->
- <!-- <el-form-item label="绾害:">-->
- <!-- <el-input type="text" v-model="lonlatpos.latPos"></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- </el-form>-->
- <!-- <el-row>-->
- <!-- <el-col :span="12" style="text-align: center;margin: 5px 0">-->
- <!-- <el-button type="primary" size="small" @click="mapPoints">绮剧‘瀹氫綅</el-button>-->
- <!-- </el-col>-->
- <!-- <el-col :span="12" style="text-align: center;margin: 5px 0">-->
- <!-- <el-button type="primary" size="small" @click="dataPoints">鏁版嵁璇嗗彇</el-button>-->
- <!-- </el-col>-->
- <!-- </el-row>-->
- <!-- </el-row>-->
<el-form :model="lonlatpos" label-width="60px">
<el-row class="pipe-line-search">
<el-col :span="12">
@@ -41,10 +19,10 @@
<el-button type="primary" size="small" @click="mapPoints">绮剧‘瀹氫綅</el-button>
</el-col>
<el-col :span="12" style="text-align: center;margin: 5px 0">
- <el-button type="primary" size="small" @click="dataPoints">鏁版嵁璇嗗彇</el-button>
+ <el-button type="primary" size="small" @click="dataPoints">浣嶇疆鎷惧彇</el-button>
</el-col>
</el-row>
- <el-row class="place-bottom" style="text-align: right;margin: 5px">
+ <el-row style="text-align: right;margin: 5px">
<el-button type="primary" @click="confirm" size="small">纭</el-button>
</el-row>
</div>
@@ -64,7 +42,8 @@
longPos: '',
latPos: ''
},
- marker: null
+ marker: window.L.layerGroup().addTo(window.map),
+ layersGroupArrList: []
}
},
methods: {
@@ -85,13 +64,14 @@
})
})
window.map.addLayer(this.marker)
+ this.layersGroupArrList.push(this.marker)
window.map.off('click')
+ // this.lonlatpos.latPos = ''
+ // this.lonlatpos.longPos = ''
})
},
// 閫氳繃鏁版嵁瀹氫綅
dataPoints () {
- // this.lonlatpos.latPos = ''
- // this.lonlatpos.longPos = ''
if (this.lonlatpos.latPos !== '' && this.lonlatpos.longPos !== '') {
const as = [this.lonlatpos.latPos, this.lonlatpos.longPos]
window.map.setView(as, 17)
@@ -99,19 +79,23 @@
this.marker = window.L.marker(as, {
icon: window.L.icon({
iconUrl: iconUrl,
- iconSize: [30, 40],
- iconAnchor: [15, 20]
+ iconSize: [26, 40],
+ iconAnchor: [13, 20]
})
})
window.map.addLayer(this.marker)
+ this.layersGroupArrList.push(this.marker)
} else {
this.$message('璇疯緭鍏ヨ瘑鍙栫粡绾害')
}
},
// 鐐瑰嚮纭鎸夐挳浜嬩欢
confirm () {
+ for (let i = 0; i < this.layersGroupArrList.length; i++) {
+ window.map.removeLayer(this.layersGroupArrList[i])
+ }
window.mapManager.clearHighlight()
- window.map.removeLayer(this.marker)
+ // window.map.removeLayer(this.marker)
eventBus.$emit('location-setChange', true)
this.lonlatpos.longPos = ''
this.lonlatpos.latPos = ''
@@ -121,25 +105,4 @@
</script>
<style lang="less" scoped>
- .place-box {
- display: flex;
- align-items: center;
- justify-content: space-around;
- }
-
- .place {
- text-align: center;
-
- .place-top {
- display: flex;
- align-items: center;
- justify-content: space-around;
-
- .place-right {
- .el-button {
- margin: 15px;
- }
- }
- }
- }
</style>
--
Gitblit v1.8.0