From d838248f54e3bcacf9c2a54f7dc692525af3c051 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 10:04:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/layers/LayerPipeLines.js | 4
/dev/null | 523 ----------------------------------------------------
src/conf/layers/LayerFsss.js | 4
src/conf/layers/LayerHbss.js | 4
src/conf/layers/LayerAirQuality.js | 4
src/conf/MapConfig.js | 5
src/conf/layers/LayerArea.js | 4
src/conf/layers/LayerEnvRisk.js | 4
src/conf/layers/LayerPk.js | 4
src/conf/layers/LayerSoilGroundWater.js | 4
src/components/helpers/WfsHelper.js | 2
src/conf/layers/LayerBasin.js | 4
12 files changed, 22 insertions(+), 544 deletions(-)
diff --git a/src/components/helpers/WfsHelper.js b/src/components/helpers/WfsHelper.js
index 9cac21f..b9cd594 100644
--- a/src/components/helpers/WfsHelper.js
+++ b/src/components/helpers/WfsHelper.js
@@ -5,7 +5,7 @@
function WfsHelper () {
this.filters = []
this.typeNames = []
- this.url = MapConfig.BLUEMAP_HOST + '/server/ogcserver/PipeLine/wfs'
+ this.url = MapConfig.PIPELINE_WFS
this.params = {
REQUEST: 'getfeature',
OUTPUTFORMAT: 'JSON',
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index b05cd61..59e35d6 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -11,7 +11,7 @@
// service涓绘満閰嶇疆
// const APP_GIS_HOST = 'http://xearth.cn:6299'
const APP_GIS_HOST = 'http://xearth.cn:8088'
-
+const PIPELINE_WFS = APP_GIS_HOST + '/server/ogcserver/PipeLine2/wfs'
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -80,7 +80,8 @@
mapOptions,
mapConfig,
TokenConfig,
- BLUEMAP_HOST
+ BLUEMAP_HOST,
+ PIPELINE_WFS
// mapTokenArray
// MagicMaker
}
diff --git a/src/conf/layers/LayerAirQuality.js b/src/conf/layers/LayerAirQuality.js
index 738548e..f2436ba 100644
--- a/src/conf/layers/LayerAirQuality.js
+++ b/src/conf/layers/LayerAirQuality.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerAirQuality = {
code: 'sewersAirQuality',
name: '绌烘皵璐ㄩ噺',
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index 6ba6c53..43af0c1 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerArea = {
code: 'sewersArea',
name: '鍖哄煙淇℃伅',
diff --git a/src/conf/layers/LayerBasin.js b/src/conf/layers/LayerBasin.js
index 6e8a0cc..6d66dbc 100644
--- a/src/conf/layers/LayerBasin.js
+++ b/src/conf/layers/LayerBasin.js
@@ -1,8 +1,8 @@
/**
* 娴佸煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerBasin = {
code: 'sewersBasin',
name: '鍖哄煙鍥惧眰',
diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index eef22d8..b893dd5 100644
--- a/src/conf/layers/LayerEnvRisk.js
+++ b/src/conf/layers/LayerEnvRisk.js
@@ -1,8 +1,8 @@
/**
* 鐜椋庨櫓
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerEnvRisk = {
code: 'sewersEnvRisk',
name: '鐜椋庨櫓',
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 03212d8..3d82df3 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerFsss = {
code: 'sewersFsss',
name: '闄勫睘璁炬柦',
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 769f155..4a6bca0 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerHbss = {
code: 'sewersHbss',
name: '鐜繚璁炬柦',
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 524a533..8287599 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -4,8 +4,8 @@
import { LayerHbss } from './LayerHbss'
import { LayerFsss } from './LayerFsss'
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerPipeLines = {
code: 'sewersPipeLines',
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index 62bbee9..1975cf8 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,8 +1,8 @@
/**
* 鎺掑彛
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerPk = {
code: 'sewersPk',
name: '鎺掑彛',
diff --git a/src/conf/layers/LayerSewers.js b/src/conf/layers/LayerSewers.js
deleted file mode 100644
index c382c2d..0000000
--- a/src/conf/layers/LayerSewers.js
+++ /dev/null
@@ -1,523 +0,0 @@
-/**
- * todo 鍑嗗鍒犻櫎姝ゆ枃浠讹紒锛侊紒锛�
- * @type {string}
- */
-
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-export const LayerSewersPoint = [
- {
- code: 'sewersFsss',
- name: '闄勫睘璁炬柦',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'fourlink',
- name: '鍥涢��',
- sname: '鍥涢��',
- checked: true,
- minZoom: 10,
- icon: 'sewers/鍥涢��.png'
- },
- {
- code: 'tee',
- name: '涓夐��',
- sname: '涓夐��',
- checked: false,
- minZoom: 10,
- icon: 'sewers/涓夐��.png'
- },
- {
- code: 'piperack',
- name: '绠℃灦(澧�)',
- sname: 'PipeRack',
- minZoom: 10,
- checked: false
- },
- {
- code: 'pipegallery',
- name: '绠″粖(甯�)',
- sname: 'PipeGallery',
- minZoom: 10,
- checked: false
- },
- {
- code: 'pipesegment',
- name: '娴佸悜',
- sname: 'ywslx',
- checked: false
- },
- {
- code: 'pipeline',
- name: '绠＄綉',
- minZoom: 10,
- sname: 'pipeline',
- checked: false
- },
- {
- code: 'valve',
- name: '闃�闂�',
- minZoom: 10,
- sname: 'valve',
- checked: false,
- icon: 'sewers/闃�闂�.png'
- },
- {
- code: 'elbow',
- name: '寮ご',
- sname: 'Elbow',
- minZoom: 10,
- checked: false,
- icon: 'sewers/寮ご.png'
- }
- ]
- },
- {
- code: 'sewersHbss',
- name: '鐜繚璁炬柦',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'manhole',
- name: '绐ㄤ簳',
- minZoom: 10,
- sname: '绐ㄤ簳',
- checked: false,
- icon: 'sewers/绐ㄤ簳.png'
- },
- {
- code: 'firedike',
- name: '闃茬伀鍫�',
- sname: '闃茬伀鍫�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'raingate',
- name: '闆ㄧ瀛�',
- sname: '闆ㄧ瀛�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/闆ㄧ瀛�.png'
- },
- {
- code: 'overflowweir',
- name: '婧㈡祦鍫�',
- sname: '婧㈡祦鍫�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'chokevalve',
- name: '鎴祦闂�',
- sname: '鎴祦闂�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'collectingbasin',
- name: '闆嗘按姹�(缃�)',
- sname: '闆嗘按姹�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/闆嗘按姹�.png'
- },
- {
- code: 'oilseparator',
- name: '闅旀补姹�',
- sname: '闅旀补姹�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/闅旀补姹�.png'
- }
- ]
- },
- {
- code: 'sewersPk',
- name: '鎺掑彛',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'dischargeport',
- name: '鎺掓斁鍙�',
- minZoom: 10,
- sname: '鎺掓斁鍙�',
- checked: false
- }
- ]
- },
- {
- code: 'sewersQyxx',
- name: '鍖哄煙淇℃伅',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'thirdpartypipe',
- name: '绗笁鏂圭閬�',
- minZoom: 10,
- sname: '绗笁鏂圭閬�',
- checked: false
- },
- {
- code: 'firefightingunit',
- name: '娑堥槻鍗曚綅',
- sname: '娑堥槻鍗曚綅',
- minZoom: 10,
- checked: false,
- icon: 'sewers/娑堥槻鍗曚綅.png'
- },
- {
- code: 'emergencyesources',
- name: '搴旀�ョ墿璧�',
- sname: '搴旀�ョ墿璧�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'emergencyres',
- name: '绀句細涓撲笟搴旀�ユ晳鎻撮槦浼�',
- sname: '涓撲笟搴旀�ユ晳鎻�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
- },
- {
- code: 'maintenanceteam',
- name: '缁存姠淇槦浼�',
- sname: '缁存姠淇槦浼�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
- },
- {
- code: 'hospital',
- name: '鍖婚櫌',
- sname: '鍖婚櫌',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鍖婚櫌.png'
- },
- {
- code: 'pointpreservationzone',
- name: '鑷劧淇濇姢鍖�',
- sname: '鑷劧淇濇姢鍖�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鑷劧淇濇姢鍖�.png'
- },
- {
- code: 'pointhydrology',
- name: '姘翠綋',
- sname: '姘翠綋',
- checked: false,
- minZoom: 10,
- icon: 'sewers/姘翠綋.png'
- },
- {
- code: 'sensitivetarget',
- name: '鏁忔劅鐩爣',
- sname: '鏁忔劅鐩爣',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鏁忔劅鐩爣.png'
- },
- {
- code: 'envmonunit',
- name: '鐜鐩戞祴鍗曚綅',
- sname: '鐜鐩戞祴鍗曚綅',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鐜鐩戞祴鍗曚綅.png'
- },
- {
- code: 'pointcontaminants',
- name: '鐩戞祴鐐规薄鏌撶墿鎸囨爣淇℃伅',
- sname: '姹℃煋鐗╂寚鏍�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'dischargeportaround',
- name: '鎺掓斁鍙ｅ懆杈圭幆澧冩晱鎰熶俊鎭�',
- sname: '鎺掓斁鍙ｅ懆杈圭幆澧�',
- minZoom: 10,
- checked: false,
- iconN: 'sewers/鎺掓斁鍙ｅ懆杈规晱鎰熶俊鎭�.png'
- },
- {
- code: 'pump',
- name: '娉�',
- sname: '娉�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/娉�.png'
- },
- {
- code: 'liquidlevelmeter',
- name: '娑蹭綅璁�',
- sname: '娑蹭綅璁�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/娑蹭綅璁�.png'
- },
- {
- code: 'flowmeter',
- name: '娴侀噺璁�',
- sname: '娴侀噺璁�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/娴侀噺璁�.png'
- },
- {
- code: 'video',
- name: '瑙嗛鐩戞帶閰嶇疆',
- sname: '瑙嗛鐩戞帶',
- minZoom: 10,
- checked: false
- },
- {
- code: 'onlinemonitoring',
- name: '鍦ㄧ嚎鐩戞祴璁惧閰嶇疆',
- sname: '鍦ㄧ嚎鐩戞祴',
- minZoom: 10,
- checked: false
- },
- {
- code: 'combustiblegas',
- name: '鍙噧姘斾綋鎶ヨ璁惧閰嶇疆',
- sname: '鍙噧姘斾綋鎶ヨ',
- minZoom: 10,
- checked: false
- },
- {
- code: 'hydrogensulfide',
- name: 'H2S娴撳害鎶ヨ璁惧閰嶇疆',
- sname: 'H2S娴撳害鎶ヨ',
- minZoom: 10,
- checked: false
- },
- {
- code: 'controlpoint',
- name: '绠＄嚎鐐�',
- sname: '绠＄嚎鐐�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/绠＄嚎鐐�.png'
- },
- {
- code: 'pipesegment',
- name: '绠℃',
- sname: '绠℃',
- minZoom: 10,
- checked: false
- }
- ]
- }
-]
-
-export const PipelineTypeOptions = [{
- value: '1',
- label: '绠＄嚎鏈綋',
- options: [{
- value: '1',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍏ㄩ儴绠＄嚎'
- }, {
- value: '2',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鐢熸椿姹℃按绠＄嚎'
- }, {
- value: '3',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍚洂绠＄嚎'
- }, {
- value: '4',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '闆ㄦ按绠＄嚎'
- }, {
- value: '5',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍚补绠＄嚎'
- }, {
- value: '6',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '浜嬫晠姘寸绾�'
- }, {
- value: '7',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍚⒈绠＄嚎'
- }, {
- value: '8',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '寰幆姘寸绾�'
- }, {
- value: '9',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍑�鍖栨按绠＄嚎'
- }],
- labelList: [{ label: '杈撻�佷粙璐�', key: 'mediumtype' }, { label: '闀垮害(m)', key: 'length' }]
-}, {
- value: '2',
- label: '鎺掑彛淇℃伅',
- options: [{
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴鎺掑彛'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '鍐呮帓鍙�'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '澶栨帓鍙�'
- }],
- labelList: []
-}, {
- value: '3',
- label: '闄勫睘璁炬柦',
- options: [
- {
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴璁炬柦'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '闃�闂�'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '绠″粖'
- }, {
- value: '4',
- layerName: '',
- key: '',
- label: '绠℃灦'
- }, {
- value: '5',
- layerName: '',
- key: '',
- label: '涓夐��'
- }, {
- value: '6',
- layerName: '',
- key: '',
- label: '鍥涢��'
- }, {
- value: '7',
- layerName: '',
- key: '',
- label: '寮ご'
- }],
- labelList: []
-}, {
- value: '4',
- label: '鐜繚璁炬柦',
- options: [
- {
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴璁炬柦'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '闆ㄧ瀛�'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '闃茬伀鍫�'
- }, {
- value: '4',
- layerName: '',
- key: '',
- label: '闆嗘按姹�'
- }, {
- value: '5',
- layerName: '',
- key: '',
- label: '鏀堕泦缃�'
- }, {
- value: '6',
- layerName: '',
- key: '',
- label: '鎴祦闂�'
- }, {
- value: '7',
- layerName: '',
- key: '',
- label: '婧㈡祦鍫�'
- }, {
- value: '8',
- layerName: '',
- key: '',
- label: '闅旀补姹�'
- }, {
- value: '9',
- layerName: '',
- key: '',
- label: '娉�'
- }],
- labelList: []
-}, {
- value: '5',
- label: '鍛ㄨ竟鐜',
- options: [{
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴鍛ㄨ竟鐜'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '鍖婚櫌'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '鏅尯'
- }, {
- value: '4',
- layerName: '',
- key: '',
- label: '鑷劧淇濇姢鍖�'
- }, {
- value: '5',
- layerName: '',
- key: '',
- label: '娑堥槻'
- }, {
- value: '6',
- layerName: '',
- key: '',
- label: '姘翠綋'
- }
- ],
- labelList: []
-}]
diff --git a/src/conf/layers/LayerSoilGroundWater.js b/src/conf/layers/LayerSoilGroundWater.js
index b75b78d..d8cf89f 100644
--- a/src/conf/layers/LayerSoilGroundWater.js
+++ b/src/conf/layers/LayerSoilGroundWater.js
@@ -1,8 +1,8 @@
/**
* 鍦熷￥鍙婂湴涓嬫按
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import MapConfig from '../../conf/MapConfig'
+const WFS_URL = MapConfig.PIPELINE_WFS
export const LayerSoilGroundWater = {
code: 'sewersSoilGroundWater',
name: '鍦熷￥鍙婂湴涓嬫按',
--
Gitblit v1.8.0