From 71c663091d05b11c41f78d8e75cb8b3db63b9cbc Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期六, 29 五月 2021 16:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/RiskSource.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/LayerController/logic/RiskSource.js b/src/components/LayerController/logic/RiskSource.js
index 2f1f882..6384554 100644
--- a/src/components/LayerController/logic/RiskSource.js
+++ b/src/components/LayerController/logic/RiskSource.js
@@ -2,7 +2,7 @@
* 鐜椋庨櫓婧�
*/
// 淇℃伅缁勪欢
-const RiskSourceIndex = require('../../../components/base-page/WasteSolid/WasteSolidIndex.vue').default
+const RiskSourceIndex = require('../../base-page/RiskSource/RiskSourceIndex.vue').default
const riskRed = '/assets/images/map/environmentRisk/risk_red.png'
const riskSandybrown = '/assets/images/map/environmentRisk/risk_sandybrown.png'
const riskYellow = '/assets/images/map/environmentRisk/risk_yellow.png'
@@ -28,7 +28,7 @@
const data = result[config.level] // 姝ゅ绾у埆瀵瑰簲data鏁扮粍涓嬫爣锛屼綔涓哄弬鏁板彇鏁版爣璇�
for (let i = 0; i < data.length; i++) {
const postion = [data[i].Latitude, data[i].Longitude] // 鍧愭爣
- const iconUrl = this.riskIconUrl(data[i].iconType) // 椋庨櫓婧愬浘鏍�
+ const iconUrl = this.riskIconUrl(data[i].riskLevel) // 椋庨櫓婧愬浘鏍�
const marker = L.marker(postion, {
totransferData: data[i],
icon: L.icon({
@@ -55,9 +55,9 @@
* @param e
*/
this.clickListener = (e) => {
- // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
+ // 鑴夊啿鏁堟灉
this.animalService.pulseEffect(e.latlng)
- /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
+ // 淇℃伅寮圭獥骞崇Щ
setPanTo(e.latlng, 200)
// 寮规鏍囬
const title = e.layer.options.totransferData.Name
@@ -66,7 +66,7 @@
comp: RiskSourceIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
- storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+ riskSourceId: e.layer.options.totransferData.no
}
},
title: title // 鏍囬
--
Gitblit v1.8.0