From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/conf/Constants.js |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index d4c087e..1617d8c 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -1,23 +1,32 @@
+
+// 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',
   LINE: 'line',
   POLYGON: 'polygon'
 }
 
-export const PIPELINE_WFS = 'http://xearth.cn:8088/server/ogcserver/PipeLine2/wfs'
+export const SERVICE_TYPE = {
+  WFS: 'wfs',
+  WMS: 'wms'
+}
 
 export const logicMapper = {
   wasteGasPfk: 'WasteGas.js',
   wasteWaterPfk: 'WasteWater.js',
-  wasteSolidCcd: 'SolidWaste.js',
+  wasteSolidCcd: 'WasteSolid.js',
   sewersAreaGs: 'Company.js',
-  pipesegment: 'PipeLineAnimal.js'
+  pipesegment: 'PipeLineAnimal.js',
+  pollutionSources: 'SourcesPollution.js'
 }
 
 export const STYLES = {
   FILL: true,
   WEIGHT: 3,
-  FILL_COLOR: '#73b2ff',
+  FILL_COLOR: '#0070ff',
   COLOR: '#73b2ff',
   FILL_OPACITY: 0.2,
   OPACITY: 1,
@@ -27,12 +36,16 @@
 }
 
 export const props = {
+  code: '缂栧彿',
+  name: '鍚嶇О',
+  pfktype: '鎺掓斁鍙g被鍨�',
+  level: '绾у埆',
+  length: '闀垮害(m)',
+  unitname: '鍗曚綅鍚嶇О',
   pipename: '绠$嚎鍚嶇О',
-  pipecode: '绠$嚎缂栫爜',
   subchaname: '鏀嚎鍚嶇О',
   subchacode: '鏀嚎缂栫爜',
   mediumtype: '杈撻�佷粙璐�',
-  length: '闀垮害(m)',
   startposname: '璧风偣浣嶇疆鍚嶇О',
   endposname: '缁堢偣浣嶇疆鍚嶇О',
   pressureating: '璁捐鍘嬪姏锛圡Pa锛�',
@@ -50,8 +63,6 @@
   pipetrenchtype: '绠℃矡绫诲瀷',
   datecollected: '鎺㈡祴鏃堕棿',
   operationalstatus: '杩愯鐘舵��',
-  acquisitionpeople: '閲囬泦浜�',
-  acquisitiondate: '閲囬泦鏃ユ湡',
   fourtype: '鍥涢�氱被鍨�',
   fourm: '鍥涢�氭潗鏂�'
 }

--
Gitblit v1.8.0