From cd80929f0ae8882a98cfe3936b2a96bded1c12d8 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 18:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/conf/layers/LayerWasteGas.js |   30 +++++++++++-------------------
 1 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/conf/layers/LayerWasteGas.js b/src/conf/layers/LayerWasteGas.js
index 3860e94..a516977 100644
--- a/src/conf/layers/LayerWasteGas.js
+++ b/src/conf/layers/LayerWasteGas.js
@@ -8,28 +8,12 @@
   checked: true,
   layers: [
     {
-      code: 'wasteGasQy',
-      name: '浼佷笟',
-      sname: '浼佷笟', // 琛ㄥ悕
+      code: 'wasteGasPfk',
+      name: '鎺掓斁鍙�',
+      sname: '鎺掓斁鍙�', // 琛ㄥ悕
       checked: true, // 榛樿閫変腑鐘舵��
       url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
       minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
-    },
-    {
-      code: 'wasteGasJcd',
-      name: '鐩戞祴鐐�',
-      sname: '鐩戞祴鐐�',
-      checked: true, // 榛樿閫変腑鐘舵��
-      url: 'http://www.baidu2.com',
-      minZoom: 10
-    },
-    {
-      code: 'wasteGasVocs',
-      name: 'VOCs',
-      sname: 'VOCs',
-      checked: true, // 榛樿閫変腑鐘舵��
-      url: '',
-      minZoom: 10
     },
     {
       code: 'wasteGasKrq',
@@ -46,6 +30,14 @@
       checked: true, // 榛樿閫変腑鐘舵��
       url: '',
       minZoom: 10
+    },
+    {
+      code: 'wasteGasVocs',
+      name: 'VOCs',
+      sname: 'VOCs',
+      checked: true, // 榛樿閫変腑鐘舵��
+      url: '',
+      minZoom: 10
     }
   ]
 }

--
Gitblit v1.8.0