From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/layers/LayerWasteGas.js |   50 ++++++++++++++++++++++----------------------------
 1 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/conf/layers/LayerWasteGas.js b/src/conf/layers/LayerWasteGas.js
index 3860e94..c1a9f46 100644
--- a/src/conf/layers/LayerWasteGas.js
+++ b/src/conf/layers/LayerWasteGas.js
@@ -5,47 +5,41 @@
 export const LayerWasteGas = {
   code: 'wasteGas',
   name: '搴熸皵',
-  checked: true,
+  checked: false,
+  type: 0,
   layers: [
     {
-      code: 'wasteGasQy',
-      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: 'wasteGasPfk',
+      name: '鎺掓斁鍙�',
+      sname: '鎺掓斁鍙�', // 琛ㄥ悕
+      checked: false,
+      type: 0,
+      url: 'http://www.baidu.com'
     },
     {
       code: 'wasteGasKrq',
       name: '鍙噧姘�',
       sname: '鍙噧姘�',
-      checked: true, // 榛樿閫変腑鐘舵��
-      url: '',
-      minZoom: 10
+      checked: false,
+      type: 0,
+      url: ''
     },
     {
       code: 'wasteGasYhq',
       name: '鏈夊姘�',
       sname: '鏈夊姘�',
-      checked: true, // 榛樿閫変腑鐘舵��
+      checked: false,
+      type: 0,
+      url: ''
+    },
+    {
+      code: 'wasteGasVocs',
+      name: 'VOCs',
+      sname: 'VOCs',
+      checked: false,
+      type: 0,
       url: '',
-      minZoom: 10
+      legendImage: '../.././assets/images/map/solidwaste/voc.png'
     }
   ]
 }

--
Gitblit v1.8.0