From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/layers/LayerEnvRisk.js | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index aeb0937..983fe54 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'
+ // minZoom: 10,
+ color: 'red',
+ level: 0
},
{
code: 'envRiskFirst',
@@ -35,8 +36,9 @@
sname: '涓�绾ч闄�',
checked: false, // 榛樿閫変腑鐘舵��
type: 0,
- minZoom: 10,
- color: 'sandybrown'
+ // minZoom: 10,
+ color: 'sandybrown',
+ level: 1
},
{
code: 'envRiskSecond',
@@ -44,8 +46,9 @@
sname: '浜岀骇椋庨櫓',
checked: false,
type: 0,
- minZoom: 10,
- color: 'yellow'
+ // minZoom: 10,
+ color: 'yellow',
+ level: 2
},
{
code: 'envRiskThird',
@@ -53,8 +56,9 @@
sname: '涓夌骇椋庨櫓',
checked: false,
type: 0,
- minZoom: 10,
- color: 'green'
+ // minZoom: 10,
+ color: 'green',
+ level: 3
}
]
}
--
Gitblit v1.8.0