From 2c7b4e1ab35be5f3cd7ef4eb2cb87d8269417fea Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 14 五月 2021 09:47:44 +0800
Subject: [PATCH] 更换内网
---
src/components/LayerController/service/WmsLayerService.js | 6 +-
src/conf/Constants.js | 7 ++-
src/conf/layers/LayerAirQuality.js | 7 ---
src/conf/layers/LayerPlate.js | 30 +++-----------
src/conf/layers/LayerArea.js | 14 +-----
src/conf/layers/LayerEnvRisk.js | 8 ----
src/conf/layers/LayerSoilGroundWater.js | 22 ++--------
src/conf/layers/LayerBasin.js | 18 ++-------
8 files changed, 27 insertions(+), 85 deletions(-)
diff --git a/src/components/LayerController/service/WmsLayerService.js b/src/components/LayerController/service/WmsLayerService.js
index a20dad6..076340e 100644
--- a/src/components/LayerController/service/WmsLayerService.js
+++ b/src/components/LayerController/service/WmsLayerService.js
@@ -1,5 +1,5 @@
import AjaxUtils from '../../../utils/AjaxUtils'
-import { PIPELINE_WMS } from '../../../conf/Constants'
+import { WMS_URL } from '../../../conf/Constants'
import Popup from '@views/popup/Popup'
import WmsLayerList from '../dataset/WmsLayerList'
@@ -80,7 +80,7 @@
if (filter.length > 0) {
params.cql_filter = filter
}
- this.wmsLayer = this.L.tileLayer.wms(PIPELINE_WMS, params).addTo(this.map)
+ this.wmsLayer = this.L.tileLayer.wms(WMS_URL, params).addTo(this.map)
}
clickListener () {
@@ -102,7 +102,7 @@
Y: Math.round(point.y),
BBOX: this.map.getBounds().toBBoxString()
}, this.params)
- AjaxUtils.get4JsonDataByUrl(PIPELINE_WMS, params, (res) => {
+ AjaxUtils.get4JsonDataByUrl(WMS_URL, params, (res) => {
const features = res.data.features
/**
* {
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 4b29334..1617d8c 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -1,6 +1,7 @@
-export const WFS_URL = 'http://xearth.cn:6240/geoserver/sewer/ows?service=WFS'
-export const PIPELINE_WFS = 'http://xearth.cn:8088/server/ogcserver/PipeLine2/wfs'
-export const PIPELINE_WMS = 'http://xearth.cn:6240/geoserver/sewer/wms'
+
+// export const PIPELINE_WMS = 'http://xearth.cn:6240/geoserver/sewer/wms'
+export const WMS_URL = 'http://10.238.235.179:6240/geoserver/sewer/wms'
+export const WFS_URL = 'http://10.238.235.179:6240/geoserver/sewer/ows?service=WFS'
export const GEOM_TYPE = {
POINT: 'point',
diff --git a/src/conf/layers/LayerAirQuality.js b/src/conf/layers/LayerAirQuality.js
index 2004562..5ffb69d 100644
--- a/src/conf/layers/LayerAirQuality.js
+++ b/src/conf/layers/LayerAirQuality.js
@@ -1,21 +1,16 @@
/**
* 鍖哄煙
*/
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
export const LayerAirQuality = {
code: 'sewersAirQuality',
name: '绌烘皵璐ㄩ噺',
checked: false,
- type: 0,
layers: [
{
code: 'airQualityStation',
name: '鐩戞祴绔�',
sname: '鐩戞祴绔�', // 琛ㄥ悕
- checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- url: WFS_URL + '?TYPENAME=鍏徃'
+ checked: false
}
]
}
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index 4788af3..355e0e8 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,8 +1,6 @@
/**
* 鍖哄煙
*/
-import { SERVICE_TYPE, PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
export const LayerArea = {
code: 'sewersArea',
name: '鍖哄煙淇℃伅',
@@ -13,25 +11,19 @@
code: 'sewersAreaGs',
name: '鍏徃',
sname: '鍏徃', // 琛ㄥ悕
- checked: true, // 榛樿閫変腑鐘舵��
- type: 0,
- url: WFS_URL + '?TYPENAME=鍏徃'
+ checked: true
},
{
code: 'sewersAreaMt',
name: '鐮佸ご',
sname: '鐮佸ご',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=鐮佸ご'
+ checked: false
},
{
code: 'sewersAreaZz',
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
- checked: false, // 榛樿閫変腑鐘舵��
- type: SERVICE_TYPE.WMS,
- typeName: 'sewer:unitareaboundary'
+ checked: false
}
]
}
diff --git a/src/conf/layers/LayerBasin.js b/src/conf/layers/LayerBasin.js
index 0c56d92..807c670 100644
--- a/src/conf/layers/LayerBasin.js
+++ b/src/conf/layers/LayerBasin.js
@@ -1,8 +1,6 @@
/**
* 娴佸煙
*/
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
export const LayerBasin = {
code: 'sewersBasin',
name: '鍖哄煙鍥惧眰',
@@ -14,33 +12,25 @@
code: 'basinCj',
name: '闀挎睙娴佸煙',
sname: '闀挎睙娴佸煙', // 琛ㄥ悕
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- url: WFS_URL + '?TYPENAME=鍏徃'
+ checked: true
},
{
code: 'basinHh',
name: '榛勬渤娴佸煙',
sname: '榛勬渤娴佸煙',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=鐮佸ご'
+ checked: true
},
{
code: 'basinBh',
name: '娓ゆ捣娴佸煙',
sname: '娓ゆ捣娴佸煙',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ checked: true
},
{
code: 'basinQt',
name: '鍏朵粬',
sname: '鍏朵粬',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ checked: true
}
]
}
diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index 712ac55..aeb0937 100644
--- a/src/conf/layers/LayerEnvRisk.js
+++ b/src/conf/layers/LayerEnvRisk.js
@@ -1,8 +1,6 @@
/**
* 鐜椋庨櫓
*/
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
export const LayerEnvRisk = {
code: 'sewersEnvRisk',
name: '鐜椋庨櫓',
@@ -14,8 +12,6 @@
name: '椋庨櫓缁熻鍥�',
sname: '椋庨櫓缁熻鍥�', // 琛ㄥ悕
checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- url: WFS_URL + '?TYPENAME=鍏徃',
color: ''
},
{
@@ -23,8 +19,6 @@
name: '鐗╄祫搴�',
sname: '鐗╄祫搴�',
checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=鐮佸ご',
color: ''
},
{
@@ -32,8 +26,6 @@
name: '閲嶅ぇ椋庨櫓',
sname: '閲嶅ぇ椋庨櫓',
checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
minZoom: 10,
color: 'red'
},
diff --git a/src/conf/layers/LayerPlate.js b/src/conf/layers/LayerPlate.js
index eb3b404..4b66a64 100644
--- a/src/conf/layers/LayerPlate.js
+++ b/src/conf/layers/LayerPlate.js
@@ -1,8 +1,6 @@
/**
* 鏉垮潡
*/
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
export const LayerPlate = {
code: 'sewersPlate',
name: '鏉垮潡鍥惧眰',
@@ -14,57 +12,43 @@
code: 'plateYt',
name: '娌圭敯',
sname: '娌圭敯', // 琛ㄥ悕
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- url: WFS_URL + '?TYPENAME=鍏徃'
+ checked: true
},
{
code: 'plateLh',
name: '鐐煎寲',
sname: '鐐煎寲',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=鐮佸ご'
+ checked: true
},
{
code: 'plateXs',
name: '閿�鍞�',
sname: '閿�鍞�',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ checked: true
},
{
code: 'plateHg',
name: '鍖栧伐',
sname: '鍖栧伐',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ checked: true
},
{
code: 'plateZy',
name: '涓撲笟鍏徃',
sname: '涓撲笟鍏徃绉戠爺鏈烘瀯',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ checked: true
},
{
code: 'plateKyjg',
name: '绉戠爺鏈烘瀯',
sname: '绉戠爺鏈烘瀯',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ checked: true
},
{
code: 'plateGcdw',
name: '宸ョ▼鍗曚綅',
sname: '宸ョ▼鍗曚綅',
- checked: true, // 榛樿閫変腑鐘舵��
- type: 2,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ checked: true
}
]
}
diff --git a/src/conf/layers/LayerSoilGroundWater.js b/src/conf/layers/LayerSoilGroundWater.js
index 4177d22..6917a67 100644
--- a/src/conf/layers/LayerSoilGroundWater.js
+++ b/src/conf/layers/LayerSoilGroundWater.js
@@ -1,8 +1,6 @@
/**
* 鍦熷￥鍙婂湴涓嬫按
*/
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
export const LayerSoilGroundWater = {
code: 'sewersSoilGroundWater',
name: '鍦熷￥鍙婂湴涓嬫按',
@@ -13,43 +11,33 @@
code: 'soil',
name: '鍦熷￥',
sname: '鍦熷￥', // 琛ㄥ悕
- checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- url: WFS_URL + '?TYPENAME=鍏徃'
+ checked: false
},
{
code: 'groundWater',
name: '鍦颁笅姘�',
sname: '鍦颁笅姘�',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=鐮佸ご'
+ checked: false
},
{
code: 'firstRiskBlock',
name: '涓�绾ч闄╁湴鍧�',
sname: '涓�绾ч闄╁湴鍧�',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
+ checked: false,
color: 'red'
},
{
code: 'secondRiskBlock',
name: '浜岀骇椋庨櫓鍦板潡',
sname: '浜岀骇椋庨櫓鍦板潡',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
+ checked: false,
color: 'yellow'
},
{
code: 'threeRiskBlock',
name: '涓夌骇椋庨櫓鍦板潡',
sname: '涓夌骇椋庨櫓鍦板潡',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
+ checked: false,
color: 'green'
}
]
--
Gitblit v1.8.0