From 6ab6b11a0ba0bc20c099b9f7b73e9d03fe7d5b8e Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 29 三月 2021 18:13:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/flueGas/flueGas.js | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/components/flueGas/flueGas.js b/src/components/BaseNav/flueGas/flueGas.js
similarity index 94%
rename from src/components/flueGas/flueGas.js
rename to src/components/BaseNav/flueGas/flueGas.js
index 6ea7391..0ab51b2 100644
--- a/src/components/flueGas/flueGas.js
+++ b/src/components/BaseNav/flueGas/flueGas.js
@@ -1,6 +1,6 @@
import { FlueGas } from '@/api/request'
-import defaultImg from '@components/flueGas/green_airquality_2.png'
-import Setting from '@components/flueGas/green_airquality_3.png'
+import defaultImg from '@assets/images/map-pages/basenav/flugas/green_airquality_2.png'
+import Setting from '@assets/images/map-pages/basenav/flugas/green_airquality_3.png'
// 鍥剧墖
class AddGasHelper {
@@ -73,9 +73,10 @@
// 鐐瑰嚮 浜嬩欢
marker.on('click', (e) => {
try {
- console.log(e)
+ // console.log(e)
this.EffectOfPulse(e.target.getLatLng())
this.FlueGasPopup.setData(data[i])
+ // this.FlueGasPopup.setData(data[i])
return this.FlueGasPopup.$el
} catch (error) {
console.log(error)
@@ -117,7 +118,7 @@
// 鑴夊啿鏁堟灉璁剧疆瀹炵幇
EffectOfPulse (position, markers, layerGroup) {
// // 鍖哄垎鐩存帴鎵ц 鍜屽垽鏂墽琛岀殑涓嶅悓鍖哄埆
- let differentColor = ''
+ var differentColor = ''
if (markers) {
differentColor = '#ff0000'
} else {
--
Gitblit v1.8.0