From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocation.vue | 117 +++-------------------------------------------------------
1 files changed, 6 insertions(+), 111 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocation.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocation.vue
index 3e8e096..e42ad35 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocation.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocation.vue
@@ -8,139 +8,34 @@
<ReportLocationSection></ReportLocationSection>
</el-tab-pane>
<el-tab-pane label="缁忕含搴﹀畾浣�" name="third">
- <el-row class="place-box">
- <div class="place-left">
- <el-form :model="LongLatPos" label-width="90px">
- <el-form-item label="缁忓害:">
- <el-input v-model="LongLatPos.longPos"></el-input>
- </el-form-item>
- <el-form-item label="绾害:">
- <el-input v-model="LongLatPos.latPos"></el-input>
- </el-form-item>
- </el-form>
- </div>
- <div class="place-right">
- <el-button type="primary" @click="mapPoints">瀹氫綅</el-button>
- </div>
- </el-row>
- <div class="place-bottom" style="text-align: center;margin: 5px">
- <el-button type="primary" @click="confirm">纭</el-button>
- </div>
+ <ReportLocationPoint></ReportLocationPoint>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
-// import eventBus from '../../../../eventBus'
+
// 绠℃瀹氫綅缁勪欢
import ReportLocationSection from './ReportLocationSection'
import ReportLocationSearch from './ReportLocationSearch'
-
-import iconUrl from '../../../../../public/assets/images/map/loc.png'
+import ReportLocationPoint from './ReportLocationPoint'
export default {
name: 'ReportLocation',
components: {
ReportLocationSearch,
- ReportLocationSection
+ ReportLocationSection,
+ ReportLocationPoint
},
data () {
return {
// active tab鍒囨崲
- activeName: 'first',
- // 缁忕含搴﹀畾浣�
- LongLatPos: {
- longPos: '',
- latPos: ''
- }
- }
- },
- // mounted () {
- // // 鎺ユ敹瑙勫畾 姣忔閲嶆柊閫夋嫨瀹氫綅 閮芥寚瀹� 閫夋嫨绗竴涓紑濮�
- // eventBus.$on('tab-change', (obj) => {
- // this.activeName = obj
- // })
- // },
- methods: {
- // 鍦板浘涓婄偣鍑�
- selectPipeLine () {
- window.map.on('click', this.selectClick)
- // window.mapManager.clickDialogSwitch = false
- },
- // 鍦板浘涓婄偣鍑诲洖璋�
- selectClick (e) {
- window.map.off('click', this.selectClick)
- // const point = [e.latlng.lng, e.latlng.lat]
- const pointX = e.latlng.lng
- const pointY = e.latlng.lat
- // let marker = window.L.marker(point,{
- //
- // })
- this.clickLocation = '\'' + pointX + '\'' + pointY + ''
- this.mapPointResult(e)
- },
- mapPointResult (e) {
- console.log(e)
- this.LongLatPos.longPos = e.latlng.lng
- this.LongLatPos.latPos = e.latlng.lat
- const as = [e.latlng.lat, e.latlng.lng]
- // console.log(as)
- const marker = window.L.marker(as, {
- icon: window.L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
- })
- })
- window.map.addLayer(marker)
- },
- // 鑾峰緱鐒︾偣 杩涜瀹氫綅
- focusLocation () {
- this.selectPipeLine()
- },
- // 缁忕含搴﹀畾浣�
- mapPoints () {
- this.selectPipeLine()
- },
- // 鐐瑰嚮纭鎸夐挳浜嬩欢
- confirm () {
- // 閫氳繃瀛愮粍浠跺悜鐖剁粍浠朵紶閫掓暟鎹�
- this.$emit('locationClick', this.LongLatPos)
- this.clickLocation = ''
- this.LongLatPos.longPos = ''
- this.LongLatPos.latPos = ''
+ activeName: 'first'
}
}
}
</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;
- }
- }
- }
-
- .place-bottom {
- .el-button {
- /*margin: 15px;*/
- }
- }
- }
</style>
--
Gitblit v1.8.0