From 3cc3e812218257698771b5e33df8beeb19cdda8d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 17:15:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/LayerController/logic/WasteGas.js |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 59baf56..e9f3aeb 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -7,7 +7,7 @@
 // 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
 // const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
 // const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
-const ImagGreen = '/assets/images/map/exhaust/fq_green.png'
+const ImagGreen = '/assets/images/map/exhaust/fq_green_new.png'
 // const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
 
 const mapApi = require('../../../api/mapApi').default
@@ -29,13 +29,18 @@
       // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
       const ContrLevel = data[i].ContrLevel
       var iconUrl = this.differentTypes(ContrLevel)
-
-      const marker = L.marker.magic([positionX, positionY], {
+      // const marker = L.canvasMarker([positionX, positionY], {
+      //   img: {
+      //     // url: 'assets/images/map/marker-icon.png',
+      //     url: iconUrl,
+      //     size: STYLES.ICON_SIZE
+      //   }
+      const marker = L.marker([positionX, positionY], {
         test: data[i],
         icon: L.icon({
           iconUrl: iconUrl,
-          iconSize: [50, 50],
-          iconAnchor: [25, 25]
+          iconSize: [20, 35],
+          iconAnchor: [10, 20]
         })
       })
       layer.addLayer(marker)

--
Gitblit v1.8.0