From 2e0c26ba23e3b8ebdaed0b38e87526cce94bf215 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 19:39:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 78a436b..3457c1d 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -152,26 +152,6 @@
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
this.searchDataDisplay = result.Result.DataInfo
- // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
- for (let i = 0; i < this.searchDataDisplay.length; i++) {
- // 缁忕含搴� 浣嶇疆
- const positionX = this.searchDataDisplay[i].Latitude
- const positionY = this.searchDataDisplay[i].Longitude
-
- // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
- const judgeValue = this.searchDataDisplay[i].StorageQty
- var iconUrl = this.differentTypes(judgeValue)
-
- const marker = this.L.marker([positionX, positionY], {
- // totransferData: this.searchDataDisplay[i],
- icon: this.L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
- })
- })
- this.layer.addLayer(marker)
- }
},
// 涓嶅悓绫诲瀷鍥剧墖灏佽
differentTypes (judgeValue) {
@@ -187,6 +167,26 @@
async setBounced (val) {
const pos = [val.Latitude, val.Longitude]
window.map.flyTo(pos, 11)
+ // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
+ // for (let i = 0; i < this.searchDataDisplay.length; i++) {
+ // 缁忕含搴� 浣嶇疆
+ const positionX = val.Latitude
+ const positionY = val.Longitude
+
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
+ const judgeValue = val.StorageQty
+ var iconUrl = this.differentTypes(judgeValue)
+
+ const marker = this.L.marker([positionX, positionY], {
+ // totransferData: this.searchDataDisplay[i],
+ icon: this.L.icon({
+ iconUrl: iconUrl,
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
+ })
+ })
+ this.layer.addLayer(marker)
+ // }
const t1 = setTimeout(async () => {
const dataValue = {
StoragePlaceId: val.StoragePlaceId
--
Gitblit v1.8.0