From b92a4b9486907f453463cd3a545a11ac7a629840 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 21 五月 2021 14:39:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/layers/LayerPipeLines.js | 22
src/components/LayerController/logic/EnvironmentRisk.js | 143 ++++++++
src/components/BaseNav/pipeline/AffiliatedFacilities.vue | 3
src/conf/layers/LayerFsss.js | 6
public/assets/riskEnterprise.json | 725 +++++++++++++++++++++++++++++++++++++++++++++
src/conf/layers/LayerHbss.js | 2
src/conf/图层配置说明.md | 8
src/conf/Constants.js | 3
src/conf/layers/LayerArea.js | 1
src/conf/layers/LayerPk.js | 4
src/api/mapApi.js | 3
src/components/panel/topicSearch/SewersSearch.vue | 30 +
12 files changed, 920 insertions(+), 30 deletions(-)
diff --git a/public/assets/riskEnterprise.json b/public/assets/riskEnterprise.json
new file mode 100644
index 0000000..f77ac70
--- /dev/null
+++ b/public/assets/riskEnterprise.json
@@ -0,0 +1,725 @@
+{
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 118.79333,
+ 32.2637
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 19,
+ "OBJECTID": 19,
+ "OID_": 19,
+ "Name": "鎵瓙鐭冲寲鍏徃",
+ "TYPE": "鐐煎寲浼佷笟",
+ "QY_JC": "鎵瓙鐭冲寲",
+ "QY_QC": "涓浗鐭冲寲鎵瓙鐭虫补鍖栧伐鏈夐檺鍏徃",
+ "QY_ID": "30600000",
+ "QY_NUM": 187,
+ "QY_ONELEVEL": 2,
+ "QY_TWOLEVEL": 87,
+ "QY_THREELEVEL": 98,
+ "X": 118.79333,
+ "Y": 32.2637,
+ "ETPRS_ABRV": "鎵瓙",
+ "ETPRS_ZIPC": "210048",
+ "ETPRS_TELE": "025-7782200",
+ "ETPRS_ADDR": "姹熻嫃鐪佸崡浜競澶у巶鏂板崕璺�777鍙�",
+ "THEMEID": 43000000,
+ "UPPERETPRS": 0,
+ "INFO": "涓浗鐭冲寲鎵瓙鐭虫补鍖栧伐鑲′唤鏈夐檺鍏徃鍧愯惤浜庣粡娴庡彂杈剧殑姹熻嫃鐪佸崡浜競锛屾槸鐢辩壒澶у瀷楠ㄥ共浼佷笟鈥斺�斾腑鍥界煶鍖栨壃瀛愮煶娌瑰寲宸ュ叕鍙革紙1998骞�9鏈堟敼鍒朵负鈥滀腑鍥界煶鍖栭泦鍥㈡壃瀛愮煶娌瑰寲宸ユ湁闄愯矗浠诲叕鍙糕�濓紝绠�绉扳�滄壃瀛愭湁闄愯矗浠诲叕鍙糕�濓級浣滀负鐙鍙戣捣浜猴紝浜�1998骞�4鏈堥�氳繃鍚戠ぞ浼氬叕寮�鍙戣3.5浜胯偂A绉嶈偂绁紝",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 113.3648,
+ 29.5395
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 21,
+ "OBJECTID": 21,
+ "OID_": 21,
+ "Name": "闀垮箔鍒嗗叕鍙�",
+ "TYPE": "鐐煎寲浼佷笟",
+ "QY_JC": "闀垮箔鐐煎寲",
+ "QY_QC": "涓浗鐭虫补鍖栧伐鑲′唤鏈夐檺鍏徃闀垮箔鍒嗗叕鍙�",
+ "QY_ID": "31900000",
+ "QY_NUM": 57,
+ "QY_ONELEVEL": 4,
+ "QY_TWOLEVEL": 37,
+ "QY_THREELEVEL": 16,
+ "X": 113.3648,
+ "Y": 29.5395,
+ "ETPRS_ABRV": "闀垮箔",
+ "ETPRS_ZIPC": "414012",
+ "ETPRS_TELE": "0730-8450003",
+ "ETPRS_ADDR": "婀栧崡鐪佸渤闃冲競浜戞邯鍖�",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "0",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 114.442669,
+ 30.659068
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 35,
+ "OBJECTID": 35,
+ "OID_": 35,
+ "Name": "姝︽眽鍒嗗叕鍙�",
+ "TYPE": "鐐煎寲浼佷笟",
+ "QY_JC": "涓煩鐭冲寲",
+ "QY_QC": "涓浗鐭虫补鍖栧伐鑲′唤鏈夐檺鍏徃姝︽眽鍒嗗叕鍙�",
+ "QY_ID": "32300000",
+ "QY_NUM": 58,
+ "QY_ONELEVEL": 1,
+ "QY_TWOLEVEL": 43,
+ "QY_THREELEVEL": 14,
+ "X": 114.442669,
+ "Y": 30.659068,
+ "ETPRS_ABRV": "姝︽眽",
+ "ETPRS_ZIPC": "430082",
+ "ETPRS_TELE": "027-86515662-54501",
+ "ETPRS_ADDR": "婀栧寳鐪佹姹夊競闈掑北鍖洪暱闈掕矾鐗�1鍙�",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "涓浗鐭虫补鍖栧伐鑲′唤鏈夐檺鍏徃姝︽眽鍒嗗叕鍙镐簬2000骞�2鏈堣绔嬶紝涓昏浠庝簨鐭虫补鍔犲伐鍙婇儴鍒嗙煶娌瑰寲宸ヤ骇鍝佺殑鐢熶骇锛岀幇鏈夌敓浜ц缃�28濂椼�傚叕鍙稿師娌逛竴娆″姞宸ヨ兘鍔�850涓囧惃/骞淬�備富瑕佷骇鍝佹湁姹芥补銆佺伅鐢ㄧ叅娌广��3#鍠锋皵寮忚埅绌虹噧鏂欐补銆佽交鏌存补銆佺煶鑴戞补銆佹憾鍓傛补绛�25绉嶄骇鍝併��",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 107.733944,
+ 31.526666
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 36,
+ "OBJECTID": 36,
+ "OID_": 36,
+ "Name": "涓師娌圭敯锛堟櫘鍏夛級",
+ "TYPE": "娌圭敯浼佷笟",
+ "QY_JC": "涓師娌圭敯锛堟櫘鍏夛級",
+ "QY_QC": "",
+ "QY_ID": "32300036",
+ "QY_NUM": 161,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 16,
+ "QY_THREELEVEL": 145,
+ "X": 107.733944,
+ "Y": 31.526666,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 112.687783,
+ 30.451289
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 37,
+ "OBJECTID": 37,
+ "OID_": 37,
+ "Name": "姹熸眽娌圭敯",
+ "TYPE": "娌圭敯浼佷笟",
+ "QY_JC": "姹熸眽娌圭敯",
+ "QY_QC": "",
+ "QY_ID": "32300037",
+ "QY_NUM": 540,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 1,
+ "QY_THREELEVEL": 539,
+ "X": 112.687783,
+ "Y": 30.451289,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 119.53111,
+ 32.45861
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 38,
+ "OBJECTID": 38,
+ "OID_": 38,
+ "Name": "姹熻嫃娌圭敯",
+ "TYPE": "娌圭敯浼佷笟",
+ "QY_JC": "姹熻嫃娌圭敯",
+ "QY_QC": "",
+ "QY_ID": "32300038",
+ "QY_NUM": 449,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 59,
+ "QY_THREELEVEL": 390,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 104.079193,
+ 30.666026
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 39,
+ "OBJECTID": 39,
+ "OID_": 39,
+ "Name": "瑗垮崡娌规皵",
+ "TYPE": "娌圭敯浼佷笟",
+ "QY_JC": "瑗垮崡娌规皵",
+ "QY_QC": "",
+ "QY_ID": "32300039",
+ "QY_NUM": 1131,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 9,
+ "QY_THREELEVEL": 1122,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 113.34333,
+ 29.53667
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 40,
+ "OBJECTID": 40,
+ "OID_": 40,
+ "Name": "鍌寲鍓傚叕鍙�",
+ "TYPE": "涓撲笟鍏徃",
+ "QY_JC": "鍌寲鍓傚叕鍙�",
+ "QY_QC": "",
+ "QY_ID": "32300040",
+ "QY_NUM": 17,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 0,
+ "QY_THREELEVEL": 17,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 121.056878,
+ 30.591937
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 41,
+ "OBJECTID": 41,
+ "OID_": 41,
+ "Name": "涓婃捣鐭冲寲",
+ "TYPE": "鐐煎寲浼佷笟",
+ "QY_JC": "涓婃捣鐭冲寲",
+ "QY_QC": "",
+ "QY_ID": "32300041",
+ "QY_NUM": 113,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 34,
+ "QY_THREELEVEL": 79,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 121.55639,
+ 31.33715
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 42,
+ "OBJECTID": 42,
+ "OID_": 42,
+ "Name": "楂樻ˉ鐭冲寲",
+ "TYPE": "鐐煎寲浼佷笟",
+ "QY_JC": "楂樻ˉ鐭冲寲",
+ "QY_QC": "",
+ "QY_ID": "32300042",
+ "QY_NUM": 96,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 34,
+ "QY_THREELEVEL": 62,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 118.923724,
+ 32.163427
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 43,
+ "OBJECTID": 43,
+ "OID_": 43,
+ "Name": "閲戦櫟鐭冲寲",
+ "TYPE": "鐐煎寲浼佷笟",
+ "QY_JC": "閲戦櫟鐭冲寲",
+ "QY_QC": "",
+ "QY_ID": "32300043",
+ "QY_NUM": 182,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 70,
+ "QY_THREELEVEL": 112,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 113.151436,
+ 29.409209
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 44,
+ "OBJECTID": 44,
+ "OID_": 44,
+ "Name": "宸撮櫟鐭冲寲",
+ "TYPE": "鐐煎寲浼佷笟",
+ "QY_JC": "宸撮櫟鐭冲寲",
+ "QY_QC": "",
+ "QY_ID": "32300044",
+ "QY_NUM": 94,
+ "QY_ONELEVEL": 1,
+ "QY_TWOLEVEL": 59,
+ "QY_THREELEVEL": 34,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 119.142108,
+ 32.260143
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 45,
+ "OBJECTID": 45,
+ "OID_": 45,
+ "Name": "浠緛鍖栫氦",
+ "TYPE": "",
+ "QY_JC": "浠緛鍖栫氦",
+ "QY_QC": "",
+ "QY_ID": "32300045",
+ "QY_NUM": 37,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 10,
+ "QY_THREELEVEL": 27,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 118.774384,
+ 32.224584
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 46,
+ "OBJECTID": 46,
+ "OID_": 46,
+ "Name": "鍗楀寲鍏徃",
+ "TYPE": "",
+ "QY_JC": "鍗楀寲鍏徃",
+ "QY_QC": "",
+ "QY_ID": "32300046",
+ "QY_NUM": 51,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 26,
+ "QY_THREELEVEL": 25,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 117.022,
+ 30.5322
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 47,
+ "OBJECTID": 47,
+ "OID_": 47,
+ "Name": "瀹夊簡鐭冲寲",
+ "TYPE": "",
+ "QY_JC": "瀹夊簡鐭冲寲",
+ "QY_QC": "",
+ "QY_ID": "32300047",
+ "QY_NUM": 100,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 43,
+ "QY_THREELEVEL": 57,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 106.63,
+ 29.45
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 49,
+ "OBJECTID": 49,
+ "OID_": 49,
+ "Name": "宸濈淮鍖栧伐",
+ "TYPE": "",
+ "QY_JC": "宸濈淮鍖栧伐",
+ "QY_QC": "",
+ "QY_ID": "32300049",
+ "QY_NUM": 34,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 23,
+ "QY_THREELEVEL": 11,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 116.066971,
+ 29.740328
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 50,
+ "OBJECTID": 50,
+ "OID_": 50,
+ "Name": "涔濇睙鐭冲寲",
+ "TYPE": "",
+ "QY_JC": "涔濇睙鐭冲寲",
+ "QY_QC": "",
+ "QY_ID": "32300050",
+ "QY_NUM": 72,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 38,
+ "QY_THREELEVEL": 34,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 111.76934,
+ 30.434414
+ ]
+ },
+ "properties": {
+ "OBJECTID_1": 51,
+ "OBJECTID": 51,
+ "OID_": 51,
+ "Name": "婀栧寳鍖栬偉",
+ "TYPE": "",
+ "QY_JC": "婀栧寳鍖栬偉",
+ "QY_QC": "",
+ "QY_ID": "32300051",
+ "QY_NUM": 18,
+ "QY_ONELEVEL": 0,
+ "QY_TWOLEVEL": 13,
+ "QY_THREELEVEL": 5,
+ "X": null,
+ "Y": null,
+ "ETPRS_ABRV": "",
+ "ETPRS_ZIPC": "",
+ "ETPRS_TELE": "",
+ "ETPRS_ADDR": "",
+ "THEMEID": 41000000,
+ "UPPERETPRS": 0,
+ "INFO": "",
+ "DISTRACT": "闀挎睙娌跨嚎",
+ "FLAG": 1,
+ "sort": 0,
+ "sort_1": "",
+ "CHINA_3": 0,
+ "CHINA_9": 0,
+ "on": 1
+ }
+ }
+ ]
+}
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 9d6114c..4cec69b 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -88,5 +88,8 @@
},
getSourcesPoll (data) {
return axios.get(mapUrl.getSourcesPoll, data)
+ },
+ getRiskEnterprise (data) {
+ return axios.get('/assets/riskEnterprise.json', data)
}
}
diff --git a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
index 7b12539..a52abbb 100644
--- a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
+++ b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
@@ -54,6 +54,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
import { LayerFsss } from '@src/conf/layers/LayerFsss'
+import { locate } from '../../helpers/LocateHelper'
// console.log(LayerFsss, 8888888888)
export default {
@@ -120,7 +121,7 @@
},
handleLocation (val, index) {
this.activeNum = index
- window.layerFactory.flyByFeature(val, this.dataType.code)
+ locate(val, this.dataType)
}
}
}
diff --git a/src/components/LayerController/logic/EnvironmentRisk.js b/src/components/LayerController/logic/EnvironmentRisk.js
new file mode 100644
index 0000000..65591ac
--- /dev/null
+++ b/src/components/LayerController/logic/EnvironmentRisk.js
@@ -0,0 +1,143 @@
+/**
+ * 鐜椋庨櫓
+ */
+// const EnvironmentRiskIndex = require('@components/BaseNav/').default
+
+// 璇锋眰鎺ュ彛鏁版嵁
+const mapApi = require('../../../api/mapApi').default
+// 浣跨敤灏佽鏂规硶
+const AnimalService = require('../service/AnimalService').default
+// 寮曞叆echarts鍩烘湰缁勪欢
+const echarts = require('echarts/lib/echarts')
+
+module.exports = function () {
+ /**
+ * 杩斿洖marker瀵硅薄鏁扮粍
+ * @param L leaflet瀵硅薄
+ */
+ this.init = async (layer, L) => {
+ this.animalService = new AnimalService({
+ L: L,
+ layer: layer
+ })
+ const result = await mapApi.getRiskEnterprise()
+ const features = result.features
+ for (var 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
+ }
+ const bgMarker = L.marker([coordinates[1], coordinates[0]], {
+ icon: 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>'
+ })
+ })
+ layer.addLayer(bgMarker)
+ const chartMarker = L.marker([coordinates[1], coordinates[0]], {
+ icon: L.divIcon({
+ className: '',
+ iconAnchor: [30, 60],
+ iconSize: [70, 70],
+ html: '<div id="qy_id_' + qyId + '" style="width: 70px; height: 70px; background-color: transparent; position: relative; border-radius: 50%;"></div>'
+ })
+ })
+ layer.addLayer(chartMarker)
+ chartRender(properties)
+ }
+ }
+
+ /**
+ * tips
+ * @param layer
+ * @returns {string}
+ */
+ this.bindTooltip = (layer) => {
+
+ }
+
+ /**
+ * 鐐瑰嚮寮圭獥
+ * @param e
+ */
+ this.clickListener = (e) => {
+
+ }
+
+ 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
+ const threeLevel = properties.QY_THREELEVEL
+ const o = echarts.init(document.getElementById('qy_id_' + qyId))
+ const option = {
+ tooltip: {
+ trigger: 'item',
+ formatter: function (e) {
+ return '<div style="background-color: #0c5460; padding: 5px;">' +
+ '<div style="color: #63EEF5; font-size: 18px; font-weight: 500; text-align: center">' + qyjc + '</div>' +
+ '<div>涓�绾ч闄╋細<span style="color: red">' + oneLevel + '涓�</span></div>' +
+ '<div>浜岀骇椋庨櫓锛�<span style="color: yellow">' + twoLevel + '涓�</span></div>' +
+ '<div>涓夌骇椋庨櫓锛�<span style="color: lawngreen">' + threeLevel + '涓�</span></div>' +
+ '</div>'
+ }
+ },
+ color: ['red', 'yellow', 'lawngreen'], // 璁剧疆楗煎浘鍚勫潡棰滆壊
+ graphic: [ // 涓虹幆褰㈠浘涓棿娣诲姞鏂囧瓧
+ {
+ type: 'text',
+ left: 'center',
+ top: '35%',
+ style: {
+ text: num,
+ textAlign: 'center',
+ fill: '#000',
+ fontSize: 12
+ }
+ }],
+ series: [{
+ name: qyjc,
+ type: 'pie',
+ radius: ['35%', '65%'],
+ label: {
+ normal: {
+ show: false,
+ position: 'center',
+ formatter: function (t) {
+ return num
+ },
+ textStyle: {
+ fontSize: 12,
+ color: '#000000'
+ }
+ }
+ },
+ data: [{
+ value: oneLevel,
+ name: '涓�绾ч闄�'
+ }, {
+ value: twoLevel,
+ name: '浜岀骇椋庨櫓'
+ }, {
+ value: threeLevel,
+ name: '涓夌骇椋庨櫓'
+ }]
+ }]
+ }
+ o.setOption(option)
+ /* o.on('click', function (params) {
+ map.flyTo(L.latLng([params.data.y, params.data.x]), 15)
+ }) */
+ }
+}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 9f64b2d..69ca571 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -38,10 +38,9 @@
:class="activeNum===index?'hover':''">
<img class="state" :src="getImgSrc()" style="background: none"/>
<div>
- <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}
- {{item.properties.companyname }}</h3>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code }}</h3>
<p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{form.pipelineType}}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.type }}</span>
<el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
style="margin-right: 0.04rem;"
@click="btnAffiliatedFacilities(item,index)">
@@ -112,7 +111,6 @@
list: [],
// 鍥惧眰鎺у埗
items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
- subItems: LayerPipeLines.layers,
// 鍒嗛〉
pageSize: 10,
total: 0,
@@ -132,6 +130,15 @@
this.wfsHelper = new WfsHelper()
},
methods: {
+ subItems () {
+ const layers = LayerPipeLines.layers
+ console.log(layers)
+ const filtered = layers.filter(function (value, index, array) {
+ console.log(value)
+ return value.name !== '娴佸悜'
+ })
+ return filtered
+ },
// tab鍒囨崲
handleClick (tab, event) {
console.log(tab, event)
@@ -164,24 +171,25 @@
// 鎼滅储鍔熻兘
async handleSearch () {
// console.log(this.form.dataType.sname, this.form.keyword)
- // console.log(this.form)
this.list = []
this.wfsHelper.clearFilter()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- this.wfsHelper.setTypeName([this.form.dataType.typeName])
+ this.wfsHelper.setTypeName(['sewer:view_pipeline'])
if (this.form.keyword) {
- this.wfsHelper.addLike('pipename', this.form.keyword)
+ this.wfsHelper.addLike('name', this.form.keyword)
}
- const filter = this.form.dataType.filter
- if (filter) {
- this.wfsHelper.setFilter(filter)
- }
+ this.wfsHelper.addEquals('type', '\'' + this.form.dataType.sname + '\'')
+ // const filter = this.form.dataType.filter
+ // if (filter) {
+ // this.wfsHelper.setFilter(filter)
+ // }
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.total = res.totalFeatures
this.list = res.features
}
+ this.wfsHelper = new WfsHelper()
},
// 鐐瑰嚮鎼滅储鍒扮殑鏁版嵁 瀹炵幇鍔熻兘 = 瀹氫綅 楂樹寒 寮规
handleLocation (val, index) {
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 591870e..3cfb6bf 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -22,7 +22,8 @@
wasteSolidCcd: 'WasteSolid.js',
sewersAreaGs: 'Company.js',
pipesegment: 'PipeLineAnimal.js',
- pollutionSources: 'SourcesPollution.js'
+ pollutionSources: 'SourcesPollution.js',
+ envRiskChart: 'EnvironmentRisk.js'
}
export const STYLES = {
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index f7afbe5..a6b0837 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -32,6 +32,7 @@
type: SERVICE_TYPE.WMS,
checked: false, // 榛樿閫変腑鐘舵��
icon: 'sewers/.png',
+ index: 1,
typeName: 'sewer:unitareaboundary'
}
]
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index e1a6600..caaea37 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -43,7 +43,7 @@
{
code: 'piperack',
name: '绠℃灦(澧�)',
- sname: 'PipeRack',
+ sname: '绠℃灦(澧�)',
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'sewer:piperack',
@@ -53,7 +53,7 @@
{
code: 'pipegallery',
name: '绠″粖(甯�)',
- sname: 'PipeGallery',
+ sname: '绠″粖(甯�)',
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'sewer:pipegallery',
@@ -70,7 +70,7 @@
name: '娴佸悜',
sname: 'ywslx',
type: SERVICE_TYPE.WMS,
- icon: 'sewers/娴佸悜.png',
+ typeName: 'sewer:pipesegment_flow',
checked: false
},
{
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 99be80b..7b19e8e 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -41,7 +41,7 @@
{
code: 'jsc',
name: '闆嗘按姹�',
- sname: '闆嗘按姹�',
+ sname: '闆嗘按姹�(缃�)',
minZoom: 16,
typeName: 'sewer:collectingbasin',
checked: false,
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 113d1a0..5fd131f 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -16,7 +16,7 @@
{
code: 'rainline',
name: '闆ㄦ按绾�',
- sname: '绠＄綉',
+ sname: '闆ㄦ按',
checked: true,
type: SERVICE_TYPE.WMS,
layerGroup: 'sewer:pipeline_group',
@@ -30,7 +30,7 @@
FILL_COLOR: '#0070ff'
},
filter: 'mediumtype = \'闆ㄦ按\'',
- index: 1
+ index: 20
},
{
code: 'accidentline',
@@ -49,7 +49,7 @@
FILL_COLOR: '#E64C00'
},
filter: 'mediumtype = \'浜嬫晠姘碶'',
- index: 1
+ index: 20
},
{
code: 'oilline',
@@ -67,7 +67,7 @@
COLOR: '#ffaa00',
FILL_COLOR: '#ffaa00'
},
- index: 1
+ index: 20
},
{
code: 'saltline',
@@ -85,7 +85,7 @@
COLOR: '#FF7F7F',
FILL_COLOR: '#FF7F7F'
},
- index: 1
+ index: 20
},
{
code: 'alkaliline',
@@ -103,7 +103,7 @@
COLOR: '#E8BEFF',
FILL_COLOR: '#E8BEFF'
},
- index: 1
+ index: 20
},
{
code: 'sulfurline',
@@ -121,7 +121,7 @@
COLOR: '',
FILL_COLOR: ''
},
- index: 1
+ index: 20
},
{
code: 'lifeline',
@@ -139,7 +139,7 @@
COLOR: '#A8A800',
FILL_COLOR: '#A8A800'
},
- index: 1
+ index: 20
},
{
code: 'purifyline',
@@ -157,7 +157,7 @@
COLOR: '#55FF00',
FILL_COLOR: '#55FF00'
},
- index: 1
+ index: 20
},
{
code: 'loopline',
@@ -175,7 +175,7 @@
COLOR: '#73FFDF',
FILL_COLOR: '#73FFDF'
},
- index: 1
+ index: 20
},
{
code: 'buildline',
@@ -193,7 +193,7 @@
COLOR: '#a8a800',
FILL_COLOR: '#a8a800'
},
- index: 1
+ index: 20
}
]
}
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index edcb323..ab105be 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -13,7 +13,7 @@
{
code: 'sewersNpk',
name: '鍐呮帓鍙�',
- sname: '鍐呮帓鍙�',
+ sname: '鍐呮帓',
checked: false,
type: SERVICE_TYPE.WMS,
icon: 'sewers/闆ㄦ按鎺掑彛.png',
@@ -24,7 +24,7 @@
{
code: 'sewersWpk',
name: '澶栨帓鍙�',
- sname: '澶栨帓鍙�',
+ sname: '澶栨帓',
icon: 'sewers/闆ㄦ按鎺掑彛.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
diff --git "a/src/conf/\345\233\276\345\261\202\351\205\215\347\275\256\350\257\264\346\230\216.md" "b/src/conf/\345\233\276\345\261\202\351\205\215\347\275\256\350\257\264\346\230\216.md"
new file mode 100644
index 0000000..a133066
--- /dev/null
+++ "b/src/conf/\345\233\276\345\261\202\351\205\215\347\275\256\350\257\264\346\230\216.md"
@@ -0,0 +1,8 @@
+##閰嶇疆wms
+
+ type: SERVICE_TYPE.WMS, //琛ㄦ槑杩欐槸涓�涓獁ms鏈嶅姟閰嶇疆
+ layerGroup: 'sewer:pipeline_group', //鍥惧眰缁勶紝濡傛灉娌℃湁灏变笉瑕佹椤癸紝涓嶈閰嶇疆绌猴紒锛侊紒
+ typeName: 'sewer:pipeline', //geoserver閰嶇疆鐨勫浘灞傚悕绉�
+ filter: 'mediumtype = \'鍑�鍖栨按\'', //绛夊悓浜巜ms鐨刢ql_filter
+ index: 5 //閰嶇疆鏄剧ず鍦ㄥ湴鍥句笂鐨勫眰绾э紝濡傛灉鏄潰鍒欓厤缃�1>=涓�<20,濡傛灉鏄嚎鐞嗚涓婂彲浠ラ厤缃�>=20锛岀浉鍚宭ayerGroup鐨勫彲浠ラ噸澶嶏紝涓嶅悓鐨勪笉鑳介噸澶嶏紒锛侊紒
+
--
Gitblit v1.8.0