From 5759640f419b0088eeb98b0dfd394d9b25febe0d Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 28 五月 2021 20:21:43 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
public/assets/environmentRisk.json | 0
src/components/LayerController/logic/EnvironmentRisk.js | 64 +++++-------
src/components/LayerController/logic/RiskSource.js | 98 +++++++++++++++++++
public/assets/environmentRiskPoint.json | 91 ++++++++++++++++++
src/api/mapApi.js | 7 +
src/components/LayerController/service/LayerFactory.js | 2
public/assets/images/map/environmentRisk/risk_sandybrown.png | 0
src/components/LayerController/modules/LcServiceLayer.vue | 2
public/assets/images/map/environmentRisk/risk_yellow.png | 0
public/assets/images/map/environmentRisk/risk_green.png | 0
src/conf/Constants.js | 6 +
src/conf/layers/LayerEnvRisk.js | 26 +++--
public/assets/images/map/environmentRisk/risk_red.png | 0
13 files changed, 243 insertions(+), 53 deletions(-)
diff --git a/public/assets/riskEnterprise.json b/public/assets/environmentRisk.json
similarity index 100%
rename from public/assets/riskEnterprise.json
rename to public/assets/environmentRisk.json
diff --git a/public/assets/environmentRiskPoint.json b/public/assets/environmentRiskPoint.json
new file mode 100644
index 0000000..a8da368
--- /dev/null
+++ b/public/assets/environmentRiskPoint.json
@@ -0,0 +1,91 @@
+[
+ [
+ {
+ "no": 1,
+ "company": "鎵瓙鐭冲寲",
+ "plate": "鐐兼补鏉垮潡",
+ "unitname": "鑺崇儍鍘傘�佺偧娌瑰巶",
+ "riskname": "纭洖鏀惰缃ぇ閲忛吀鎬ф皵绱ф�ユ帓鏀剧幆澧冮闄�",
+ "depiction": "R/Q鎻忚堪锛�115.48銆俓nM鍊兼弿杩帮細30鍒嗐��1. 姘у寲宸ヨ壓锛� 10锛�2.1# 纭洖鏀惰缃洦姘寸郴缁熼槻鎺ф帾鏂戒笉瀹屽杽锛� 10 鍒嗭紱3. 纭洖鏀惰缃瘨鎬ф皵浣撳缃澶囦笉瀹屽杽锛� 10 鍒嗐�� E鐣屽畾鍥犵礌锛� E1銆� 鐜椋庨櫓婧愬懆杈�5km鑼冨洿鍐呭眳浣忓尯銆� 鍖荤枟鍗敓鏈烘瀯銆� 鏂囧寲鏁欒偛鏈烘瀯銆� 绉戠爺鍗曚綅銆� 琛屾斂鏈哄叧銆� 浼佷簨涓氬崟浣嶃�� 鍟嗗満銆� 鍏洯绛変汉鍙ｆ�绘暟5涓囦汉浠ヤ笂锛� 鎴�0 .5 km鑼冨洿鍐呯ぞ浼氫汉鍙ｆ�绘暟澶т簬1000浜恒�� ",
+ "after": "R4(115.48)M1(10)E1",
+ "Longitude": 118.7936111111,
+ "Latitude": 32.2583305556,
+ "iconType": 1
+ },
+ {
+ "no": 2,
+ "company": "鎵瓙鐭冲寲",
+ "plate": "鍖栧伐鏉垮潡",
+ "unitname": "姘村巶",
+ "riskname": "鍑�涓�姹℃按澶勭悊瑁呯疆瓒呮爣鎺掓斁椋庨櫓",
+ "depiction": "1.鐜椋庨櫓鐗╄川鏁伴噺涓庝复鐣岄噺姣斿�艰瘎浼癨n鐜椋庨櫓鐗╄川涓猴細COD澶т簬10000mg/L鐨勫簾娑诧紝鎬婚噺250t锛屼复鐣屽��10t锛孯=25锛岃涓篟3銆� 2. 鐜椋庨櫓鎺у埗姘村钩M璇勪及锛� 1锛� 璁惧璐ㄩ噺绠＄悊璇勪及锛� 瀛樺湪璁惧瓒呮湡浣跨敤鎴栭檷绛夌骇浣跨敤锛� M鍊艰10锛涳紙 2锛� 鐜椋庨櫓鐩戞祴棰勮鎺柦璇勪及锛� 鐜鐩戞祴鍥犲瓙涓嶅畬鍠勶紝 M鍊艰5锛涳紙 3锛� 鐜椋庨櫓闃叉帶鎺柦鏈夋晥鎬ц瘎浼帮細 鐜椋庨櫓婧愬叿澶囨湁鏁堢殑鎵嬪姩绱ф�ュ叧鏂帾鏂斤紝 M鍊艰3锛� 浜嬫晠姘村偍瀛樿兘鍔涗笉澶燂紝 M鍊艰10锛� 姹囨�籑 = 28锛� 15鈮� M < 30锛� 鐜椋庨櫓鎺у埗姘村钩涓篗2绫汇�� 3. 鐜椋庨櫓鍙椾綋鏁忔劅鎬璇勪及 1# 鎺掑彛澶勪簬闀挎睙姘翠綋锛� 涓嬫父10km鑼冨洿鍐呮湁楗敤姘存按婧愪繚鎶ゅ尯鐗规畩鐢熸�佺郴缁熺瓑澶氱被鐜椋庨櫓鍙椾綋锛� 鍙椾綋椋庨櫓绫诲瀷E1銆� ",
+ "after": "R3(25)M1(10)E1",
+ "Longitude": 118.8174111111,
+ "Latitude": 32.2429611111,
+ "iconType": 1
+ }
+ ],[
+ {
+ "no": 1,
+ "company": "闀垮箔鐐煎寲",
+ "plate": "鍖栧伐鏉垮潡",
+ "unitname": "鍖栧伐閮�",
+ "riskname": "鐜哀涓欑兎鑱斿悎瑁呯疆",
+ "depiction": "R鎻忚堪锛�90.4585 M鍊兼弿杩帮細25 1銆佹秹鍙婃槗鐕冩槗鐖嗙墿璐� 10 2銆佷竴鑸敓浜у畨鍏ㄤ簨鏁呴殣鎮ｆ湭瀹屾垚鏁存敼(鐜哀涓欑兎锛堢敳B绫绘恫浣擄級鐨勮杞︽湭閲囩敤娑蹭笅瑁呭嵏杞﹂工绠″凡鍦ㄨ璁★紱鐢查唶鍔犳阿鍙嶅簲鍣ㄦ棤瀹夊叏璁炬柦椤圭洰姝ｅ湪璁捐锛涘弻姘ф按瑁呯疆钀冨彇濉旂揣鎬ユ帓鏀句笉褰撻」鐩凡鍦ㄨ璁★紱鐜哀涓欑兎鍙嶅簲鍣ㄧ揣鎬ユ帓鏀鹃闄╁凡鍒跺畾棰勬銆�) 10 3銆佹墍鍦ㄥ巶鍖烘竻鍑�闆ㄦ按閫氳繃鑷祦鏂瑰紡鎺掑嚭鍘傜晫 5 E鐣屽畾鍥犵礌锛氭帓姘磋繘鍏ュ彈绾虫渤娴佹渶澶ф祦閫熸椂锛�24灏忔椂娴佺粡鑼冨洿鍐呮秹璺ㄥ浗鐣屾垨鐪佺晫鐨凟1",
+ "after": "R3(90)M2(25)E1",
+ "Longitude": 113.36571,
+ "Latitude": 29.54677,
+ "iconType": 2
+ },
+ {
+ "no": 2,
+ "company": "闀垮箔鐐煎寲",
+ "plate": "鍖栧伐鏉垮潡",
+ "unitname": "娓彛閮�",
+ "riskname": "鐮佸ご锛�0708#娌瑰搧锛�",
+ "depiction": "R/Q鎻忚堪锛歈鍊硷細29.18 M鍊兼弿杩帮細M鍊硷細30 1銆佹湭鎸夎瀹氭垨鏀垮簻瑕佹眰璁剧疆鐜椋庨櫓鐗╄川娉勬紡鐩戞祴棰勮鎺柦锛�5锛� 2绱ф�ュ垏鏂榾涓烘墜鍔ㄦ搷浣滄柟寮忥紝5锛� 3銆佷綔涓氬尯姹℃按鏀堕泦鎺柦涓嶅畬鍠勶紝10锛� 4銆侀┏浣嶈嚦闄嗗湴绠￠亾鎮┖锛屽紩妗ラ槻娉勬紡鎺柦涓嶅畬鍠勶紝10銆� E鐣屽畾鍥犵礌锛氱爜澶翠綅浜庨暱姹熸部宀革紝24灏忔椂娴佺粡鑼冨洿璺ㄧ渷锛堣嚦婀栧寳锛�",
+ "after": "Q3(29)M3(30)E1",
+ "Longitude": 113.2917,
+ "Latitude": 29.60036,
+ "iconType": 2
+ }
+ ],[
+ {
+ "no": 1,
+ "company": "闀垮箔鐐煎寲",
+ "plate": "鍖栧伐鏉垮潡",
+ "unitname": "娓彛閮�",
+ "riskname": "鐮佸ご锛�0506#娌瑰搧锛�",
+ "depiction": "R/Q鎻忚堪锛歈鍊硷細19.71 M鍊兼弿杩帮細M鍊硷細30 1銆佹湭鎸夎瀹氭垨鏀垮簻瑕佹眰璁剧疆鐜椋庨櫓鐗╄川娉勬紡鐩戞祴棰勮鎺柦锛�5锛� 2绱ф�ュ垏鏂榾涓烘墜鍔ㄦ搷浣滄柟寮忥紝5锛� 3銆佷綔涓氬尯姹℃按鏀堕泦鎺柦涓嶅畬鍠勶紝10锛� 4銆侀┏浣嶈嚦闄嗗湴绠￠亾鎮┖锛屽紩妗ラ槻娉勬紡鎺柦涓嶅畬鍠勶紝10銆� E鐣屽畾鍥犵礌锛氱爜澶翠綅浜庨暱姹熸部宀革紝24灏忔椂娴佺粡鑼冨洿璺ㄧ渷锛堣嚦婀栧寳锛�",
+ "after": "Q3(19)M3(30)E1",
+ "Longitude": 113.27935,
+ "Latitude": 29.59832,
+ "iconType": 3
+ },
+ {
+ "no": 2,
+ "company": "闀垮箔鐐煎寲",
+ "plate": "鍖栧伐鏉垮潡",
+ "unitname": "娓彛閮�",
+ "riskname": "鐮佸ご锛�0506#鍖栧鍝侊級",
+ "depiction": "R/Q鎻忚堪锛�2.108銆侻鍊兼弿杩帮細30鍒嗐��1.鏈寜瑙勫畾鎴栨斂搴滆姹傝缃幆澧冮闄╃墿璐ㄦ硠婕忕洃娴嬮璀︽帾鏂斤紝5鍒嗭紱2.绱ф�ュ垏鏂榾涓烘墜鍔ㄦ搷浣滄柟寮忥紝5鍒嗭紱3.浣滀笟鍖烘薄姘存敹闆嗘帾鏂戒笉瀹屽杽锛�10鍒嗭紱4.椹充綅鑷抽檰鍦扮閬撴偓绌猴紝寮曟ˉ闃叉硠婕忔帾鏂戒笉瀹屽杽锛�10鍒嗐�侲鐣屽畾鍥犵礌锛氱爜澶翠綅浜庨暱姹熸部宀革紝24灏忔椂娴佺粡鑼冨洿璺ㄧ渷锛堣嚦婀栧寳锛夈��",
+ "after": "R3(2.1)M3(30)E2",
+ "Longitude": 113.28155,
+ "Latitude": 29.59842,
+ "iconType": 3
+ }
+ ],[
+ {
+ "no": 1,
+ "company": "涓煩鐭冲寲",
+ "plate": "鐐兼补鏉垮潡",
+ "unitname": "鐐兼补浜岄儴",
+ "riskname": "1#鍌寲瑁傚寲瑁呯疆",
+ "depiction": "R鍊硷細1#鍌寲鎵挎媴涓煶鍖栨姹夊垎鍏徃閲嶈川娌瑰姞宸ヤ换鍔★紝璇勭骇涓篟3銆侻鍊硷細瑁呯疆娑夊強鍗遍櫓宸ヨ壓锛岃瑙ｏ紙瑁傚寲锛夊伐鑹猴紝楂樻俯锛屽伐鑹烘俯搴︹墺300鈩冿紝10鍒嗭紱闆ㄦ按鎺掓斁鍙ｉ潪鎻愬崌鎺掓斁锛�5鍒嗭細璇勪负M2銆侲鍊硷細鐜鍙椾綋涓洪暱姹燂紝涓嬫父10km闃抽�荤數鍘傚彇姘村彛锛涘垽涓篍1銆�",
+ "after": "R3M2E1",
+ "Longitude": 114.44016,
+ "Latitude": 30.65305,
+ "iconType": 4
+ }
+ ]
+]
diff --git a/public/assets/images/map/environmentRisk/risk_green.png b/public/assets/images/map/environmentRisk/risk_green.png
new file mode 100644
index 0000000..b315c3a
--- /dev/null
+++ b/public/assets/images/map/environmentRisk/risk_green.png
Binary files differ
diff --git a/public/assets/images/map/environmentRisk/risk_red.png b/public/assets/images/map/environmentRisk/risk_red.png
new file mode 100644
index 0000000..30d9e9e
--- /dev/null
+++ b/public/assets/images/map/environmentRisk/risk_red.png
Binary files differ
diff --git a/public/assets/images/map/environmentRisk/risk_sandybrown.png b/public/assets/images/map/environmentRisk/risk_sandybrown.png
new file mode 100644
index 0000000..ac16400
--- /dev/null
+++ b/public/assets/images/map/environmentRisk/risk_sandybrown.png
Binary files differ
diff --git a/public/assets/images/map/environmentRisk/risk_yellow.png b/public/assets/images/map/environmentRisk/risk_yellow.png
new file mode 100644
index 0000000..1104396
--- /dev/null
+++ b/public/assets/images/map/environmentRisk/risk_yellow.png
Binary files differ
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 1d73ab5..ae65d02 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -90,8 +90,11 @@
getSourcesPoll (data) {
return axios.get(mapUrl.getSourcesPoll, data)
},
- getRiskEnterprise (data) {
- return axios.get('/assets/riskEnterprise.json', data)
+ getEnvironmentRisk (data) {
+ return axios.get('/assets/environmentRisk.json', data)
+ },
+ getEnvironmentRiskPoint (data) {
+ return axios.get('/assets/environmentRiskPoint.json', data)
},
getPollutionSourceStatistics (data) {
return axios.get('/assets/pollutionSource.json', data)
diff --git a/src/components/LayerController/logic/EnvironmentRisk.js b/src/components/LayerController/logic/EnvironmentRisk.js
index e7478e7..ae50da3 100644
--- a/src/components/LayerController/logic/EnvironmentRisk.js
+++ b/src/components/LayerController/logic/EnvironmentRisk.js
@@ -1,8 +1,6 @@
/**
- * 鐜椋庨櫓
+ * 鐜椋庨櫓缁熻鍥�
*/
-// const EnvironmentRiskIndex = require('@components/base-page/').default
-
// 璇锋眰鎺ュ彛鏁版嵁
const mapApi = require('../../../api/mapApi').default
// 浣跨敤灏佽鏂规硶
@@ -11,46 +9,53 @@
const echarts = require('echarts/lib/echarts')
module.exports = function () {
- // 瀛樻斁鐜舰鍥剧殑鏁扮粍
- let riskLayerGroup = []
+ let animalService = null
+ // 鐜舰缁熻鍥炬暟缁�
+ let riskLayerGroup = null
+
/**
- * 杩斿洖marker瀵硅薄鏁扮粍
+ * 鍒濆鍖栧浘灞傛暟缁�
* @param L leaflet瀵硅薄
*/
this.init = async (layer, L) => {
- this.animalService = new AnimalService({
+ animalService = new AnimalService({
L: L,
layer: layer
})
- layer.addLayer(riskLayerGroup)
}
+ /**
+ * 鍔犺浇鍥惧眰
+ * @returns {Promise<void>}
+ */
this.start = async () => {
- riskLayerGroup = window.layerFactory.L.featureGroup().addTo(window.layerFactory.map)
- const result = await mapApi.getRiskEnterprise()
+ if (riskLayerGroup) { // 鍥惧眰鍏ㄩ�夋椂锛屾竻鐞嗗浘灞傛暟缁勫苟閲嶆柊鍔犺浇
+ riskLayerGroup.remove()
+ riskLayerGroup = null
+ }
+ riskLayerGroup = animalService.L.featureGroup().addTo(animalService.layer)
+ const result = await mapApi.getEnvironmentRisk()
const features = result.features
- for (var i = 0; i < features.length; i++) {
+ for (let i = 0; i < features.length; i++) {
const feature = features[i]
const geometry = feature.geometry
const properties = feature.properties
const qyId = properties.QY_ID
- // const qyJc = properties.QY_JC
const distract = properties.DISTRACT
const coordinates = geometry.coordinates
if (distract !== '闀挎睙娌跨嚎') {
continue
}
- window.layerFactory.L.marker([coordinates[1], coordinates[0]], {
- icon: this.animalService.L.divIcon({
+ animalService.L.marker([coordinates[1], coordinates[0]], {
+ icon: animalService.L.divIcon({
className: '',
iconAnchor: [15, 45],
iconSize: [40, 40],
html: '<div style="width: 40px; height: 40px; background-color: rgba(255,255,255,1); position: relative; border-radius: 50%;"></div>'
})
}).addTo(riskLayerGroup)
- // this.animalService.layer.addLayer(bgMarker)
- window.layerFactory.L.marker([coordinates[1], coordinates[0]], {
- icon: this.animalService.L.divIcon({
+ animalService.L.marker([coordinates[1], coordinates[0]], {
+ icon: animalService.L.divIcon({
className: '',
iconAnchor: [30, 60],
iconSize: [70, 70],
@@ -61,35 +66,23 @@
}
}
+ /**
+ * 娓呴櫎鍥惧眰
+ */
this.destory = () => {
if (riskLayerGroup) {
riskLayerGroup.remove()
+ riskLayerGroup = null
}
}
/**
- * tips
- * @param layer
- * @returns {string}
- */
- this.bindTooltip = (layer) => {
- }
-
- /**
- * 鐐瑰嚮寮圭獥
- * @param e
- */
- this.clickListener = (e) => {
- }
-
- /**
- * 鐜舰楗煎浘
+ * Echarts鐜舰楗煎浘
* @param properties
*/
function chartRender (properties) {
const qyId = properties.QY_ID
const qyjc = properties.QY_JC
- // const qyQc = properties.QY_QC
const num = properties.QY_NUM
const oneLevel = properties.QY_ONELEVEL
const twoLevel = properties.QY_TWOLEVEL
@@ -150,8 +143,5 @@
}]
}
o.setOption(option)
- /* o.on('click', function (params) {
- map.flyTo(L.latLng([params.data.y, params.data.x]), 15)
- }) */
}
}
diff --git a/src/components/LayerController/logic/RiskSource.js b/src/components/LayerController/logic/RiskSource.js
new file mode 100644
index 0000000..2f1f882
--- /dev/null
+++ b/src/components/LayerController/logic/RiskSource.js
@@ -0,0 +1,98 @@
+/**
+ * 鐜椋庨櫓婧�
+ */
+// 淇℃伅缁勪欢
+const RiskSourceIndex = require('../../../components/base-page/WasteSolid/WasteSolidIndex.vue').default
+const riskRed = '/assets/images/map/environmentRisk/risk_red.png'
+const riskSandybrown = '/assets/images/map/environmentRisk/risk_sandybrown.png'
+const riskYellow = '/assets/images/map/environmentRisk/risk_yellow.png'
+const riskGreen = '/assets/images/map/environmentRisk/risk_green.png'
+// 鍏叡鏂规硶 panTo() 寮曠敤
+const { setPanTo } = require('../../../utils/utils')
+// 璇锋眰鎺ュ彛鏁版嵁
+const mapApi = require('../../../api/mapApi').default
+// 浣跨敤灏佽鏂规硶
+const AnimalService = require('../service/AnimalService').default
+
+module.exports = function () {
+ /**
+ * 鍒濆鍖栧苟鍔犺浇鍥惧眰
+ * @param L leaflet瀵硅薄
+ */
+ this.init = async (layer, L, config) => {
+ this.animalService = new AnimalService({
+ L: L,
+ layer: layer
+ })
+ const result = await mapApi.getEnvironmentRiskPoint() // 鏁版嵁
+ const data = result[config.level] // 姝ゅ绾у埆瀵瑰簲data鏁扮粍涓嬫爣锛屼綔涓哄弬鏁板彇鏁版爣璇�
+ for (let i = 0; i < data.length; i++) {
+ const postion = [data[i].Latitude, data[i].Longitude] // 鍧愭爣
+ const iconUrl = this.riskIconUrl(data[i].iconType) // 椋庨櫓婧愬浘鏍�
+ const marker = L.marker(postion, {
+ totransferData: data[i],
+ icon: L.icon({
+ iconUrl: iconUrl,
+ iconSize: [20, 20],
+ iconAnchor: [10, 10]
+ })
+ })
+ layer.addLayer(marker)
+ }
+ }
+
+ /**
+ * 鎻愮ず绐�
+ * @param layer
+ * @returns {string}
+ */
+ this.bindTooltip = (layer) => {
+ return layer.options.totransferData.riskname
+ }
+
+ /**
+ * 淇℃伅寮圭獥
+ * @param e
+ */
+ this.clickListener = (e) => {
+ // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
+ this.animalService.pulseEffect(e.latlng)
+ /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
+ setPanTo(e.latlng, 200)
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
+ window.$layer.open({
+ content: {
+ comp: RiskSourceIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+ }
+ },
+ title: title // 鏍囬
+ })
+ }
+
+ // 鍥炬爣閰嶇疆
+ this.riskIconUrl = (t) => {
+ let iconUrl = null
+ switch (t) {
+ case 1:
+ iconUrl = riskRed
+ break
+ case 2:
+ iconUrl = riskSandybrown
+ break
+ case 3:
+ iconUrl = riskYellow
+ break
+ case 4:
+ iconUrl = riskGreen
+ break
+ default:
+ iconUrl = riskGreen
+ break
+ }
+ return iconUrl
+ }
+}
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index ef7dc4d..acb38a6 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -106,7 +106,7 @@
item1.type = 1 // 鍗婇��
}
if (item1.name === '浼佷笟搴旀��') {
- console.log(item1)
+ // console.log(item1)
bus.$emit('changeSearchBar', item1)
}
// console.log(item1.layers.length, item1.istrue, item1.isfalse, item1.type)
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index c586a1c..f7230ba 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -132,7 +132,7 @@
layer.addTo(this.map)
}
} else {
- logic && logic.init(this.addLayer(config), this.L)
+ logic && logic.init(this.addLayer(config), this.L, config)
}
logic && logic.start && logic.start()
this.wmsLayerService && this.wmsLayerService.add(config)
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 5f41f64..20c3f29 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -23,7 +23,11 @@
sewersAreaGs: 'Company.js',
pipesegment: 'PipeLineAnimal.js',
pollutionSources: 'SourcesPollution.js',
- envRiskChart: 'EnvironmentRisk.js'
+ envRiskChart: 'EnvironmentRisk.js', // 椋庨櫓缁熻鍥�
+ envRiskMajor: 'RiskSource.js', // 閲嶅ぇ椋庨櫓婧�
+ envRiskFirst: 'RiskSource.js', // 涓�绾ч闄╂簮
+ envRiskSecond: 'RiskSource.js', // 浜岀骇椋庨櫓婧�
+ envRiskThird: 'RiskSource.js' // 涓夌骇椋庨櫓婧�
}
export const STYLES = {
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