From 3ce565a201a426f92d5d13167164561ffea14671 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 14:18:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/layers/LayerSurroundings.js | 61 ++++++++++++++++++++
src/conf/MapConfig.js | 3
src/conf/layers/LayerArea.js | 6 +-
src/conf/layers/LayerPk.js | 10 ++-
src/conf/layers/LayerEmergencySource.js | 41 +++++++++++++
src/conf/LayerEmergency.js | 14 ++++
6 files changed, 127 insertions(+), 8 deletions(-)
diff --git a/src/conf/LayerEmergency.js b/src/conf/LayerEmergency.js
new file mode 100644
index 0000000..e272e9d
--- /dev/null
+++ b/src/conf/LayerEmergency.js
@@ -0,0 +1,14 @@
+/**
+ * 涓撻
+ */
+import { LayerEmergencySource } from './layers/LayerEmergencySource'
+import { LayerSurroundings } from './layers/LayerSurroundings'
+
+export const LayerEmergency = {
+ code: 'sewersEmergency',
+ name: '搴旀�ュ浘灞�',
+ checked: false,
+ isShow: true,
+ type: 0,
+ layers: [LayerEmergencySource, LayerSurroundings]
+}
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index e125556..9004cc8 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -2,6 +2,7 @@
import TDT from './TDT'
import { LayerTopic } from './LayerTopic'
import { LayerBasin } from './layers/LayerBasin'
+import { LayerEmergency } from './LayerEmergency'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -41,7 +42,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerBasin, LayerTopic]
+ LayerSewersLine: [LayerBasin, LayerTopic, LayerEmergency]
} // 姹￠洦姘村浘灞傞厤缃�
}
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index b16cf81..4788af3 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,7 +1,7 @@
/**
* 鍖哄煙
*/
-import { PIPELINE_WFS } from '../Constants'
+import { SERVICE_TYPE, PIPELINE_WFS } from '../Constants'
const WFS_URL = PIPELINE_WFS
export const LayerArea = {
code: 'sewersArea',
@@ -30,8 +30,8 @@
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
checked: false, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:unitareaboundary'
}
]
}
diff --git a/src/conf/layers/LayerEmergencySource.js b/src/conf/layers/LayerEmergencySource.js
new file mode 100644
index 0000000..bdf018e
--- /dev/null
+++ b/src/conf/layers/LayerEmergencySource.js
@@ -0,0 +1,41 @@
+import { SERVICE_TYPE } from '../Constants'
+
+/**
+ * 搴旀�ヨ祫婧�
+ */
+export const LayerEmergencySource = {
+ code: 'sewersEmergencySource',
+ name: '搴旀�ヨ祫婧�',
+ checked: false,
+ layers: [
+ {
+ code: 'sewersYjWz',
+ name: '搴旀�ョ墿璧�',
+ sname: '搴旀�ョ墿璧�',
+ checked: false,
+ type: SERVICE_TYPE.WMS,
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ typeName: 'sewer:emergencyesources',
+ minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+ },
+ {
+ code: 'sewersYjcl',
+ name: '搴旀�ヨ溅杈�',
+ sname: '搴旀�ヨ溅杈�',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ minZoom: 10
+ },
+ {
+ code: 'sewersYjdw',
+ name: '搴旀�ラ槦浼�',
+ sname: '搴旀�ラ槦浼�',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:maintenanceteam',
+ minZoom: 10
+ }
+ ]
+}
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index 4b3fc8b..b1b95be 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,3 +1,5 @@
+import { SERVICE_TYPE } from '../Constants'
+
/**
* 鎺掑彛
*/
@@ -13,9 +15,9 @@
name: '鍐呮帓鍙�',
sname: '鍐呮帓鍙�',
checked: true,
- type: 0,
+ type: SERVICE_TYPE.WMS,
icon: 'sewers/闆ㄦ按鎺掑彛.png',
- wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'鍐呮帓\'',
+ typeName: 'sewer:dischargeport',
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
{
@@ -24,8 +26,8 @@
sname: '澶栨帓鍙�',
icon: 'sewers/闆ㄦ按鎺掑彛.png',
checked: true, // 榛樿閫変腑鐘舵��
- type: 0,
- wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'澶栨帓\'',
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:dischargeport',
minZoom: 10
}
]
diff --git a/src/conf/layers/LayerSurroundings.js b/src/conf/layers/LayerSurroundings.js
new file mode 100644
index 0000000..a872133
--- /dev/null
+++ b/src/conf/layers/LayerSurroundings.js
@@ -0,0 +1,61 @@
+import { SERVICE_TYPE } from '../Constants'
+
+/**
+ * 鍛ㄨ竟鐜
+ */
+export const LayerSurroundings = {
+ code: 'sewersSurroundings',
+ name: '搴旀�ヨ祫婧�',
+ checked: false,
+ layers: [
+ {
+ code: 'sewersYy',
+ name: '鍖婚櫌',
+ sname: '鍖婚櫌',
+ checked: false,
+ type: SERVICE_TYPE.WMS,
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ typeName: 'sewer:hospital',
+ minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+ },
+ {
+ code: 'sewersXx',
+ name: '瀛︽牎',
+ sname: '瀛︽牎',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ minZoom: 10
+ },
+ {
+ code: 'sewersSt',
+ name: '姘翠綋',
+ sname: '姘翠綋',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:pointhydrology',
+ minZoom: 10
+ },
+ {
+ code: 'sewersZrbhq',
+ name: '鑷劧淇濇姢鍖�',
+ sname: '鑷劧淇濇姢鍖�',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ wfs: 'sewer:pointpreservationzone',
+ minZoom: 10
+ },
+ {
+ code: 'sewersMgmb',
+ name: '鏁忔劅鐩爣',
+ sname: '鏁忔劅鐩爣',
+ icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ checked: false, // 榛樿閫変腑鐘舵��
+ type: SERVICE_TYPE.WMS,
+ wfs: 'sewer:sensitivetarget',
+ minZoom: 10
+ }
+ ]
+}
--
Gitblit v1.8.0