From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/conf/layers/LayerEnvRisk.js |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index aeb0937..1ca0e15 100644
--- a/src/conf/layers/LayerEnvRisk.js
+++ b/src/conf/layers/LayerEnvRisk.js
@@ -14,20 +14,21 @@
       checked: false, // 榛樿閫変腑鐘舵��
       color: ''
     },
-    {
-      code: 'envRiskMaterial',
-      name: '鐗╄祫搴�',
-      sname: '鐗╄祫搴�',
-      checked: false, // 榛樿閫変腑鐘舵��
-      color: ''
-    },
+    // {
+    //   code: 'envRiskMaterial',
+    //   name: '鐗╄祫搴�',
+    //   sname: '鐗╄祫搴�',
+    //   checked: false, // 榛樿閫変腑鐘舵��
+    //   color: ''
+    // },
     {
       code: 'envRiskMajor',
       name: '閲嶅ぇ椋庨櫓',
       sname: '閲嶅ぇ椋庨櫓',
       checked: false, // 榛樿閫変腑鐘舵��
       minZoom: 10,
-      color: 'red'
+      color: 'red',
+      level: 0
     },
     {
       code: 'envRiskFirst',
@@ -36,7 +37,8 @@
       checked: false, // 榛樿閫変腑鐘舵��
       type: 0,
       minZoom: 10,
-      color: 'sandybrown'
+      color: 'sandybrown',
+      level: 1
     },
     {
       code: 'envRiskSecond',
@@ -45,7 +47,8 @@
       checked: false,
       type: 0,
       minZoom: 10,
-      color: 'yellow'
+      color: 'yellow',
+      level: 2
     },
     {
       code: 'envRiskThird',
@@ -54,7 +57,8 @@
       checked: false,
       type: 0,
       minZoom: 10,
-      color: 'green'
+      color: 'green',
+      level: 3
     }
   ]
 }

--
Gitblit v1.8.0