From 4fef038c7e4ba6a82b77e9679f58e2f9d8c0711b Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 18:54:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/layers/LayerPipeLines.js |   89 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index d579631..bb746d9 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -11,46 +11,76 @@
   code: 'sewersPipeLines',
   name: '绠＄嚎',
   checked: false,
+  type: 0,
   childLayer: [LayerFsss, LayerHbss],
   layers: [
     {
       code: 'rainline',
       name: '闆ㄦ按绾�',
-      sname: '闆ㄦ按绾�',
+      sname: '绠＄綉',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=绠＄綉',
-      minZoom: 10
+      type: 0,
+      wmsLayers: 'sewer:pipeline_rain',
+      // wfs: WFS_URL + '?TYPENAME=绠＄綉&FILTER=<Filter xmlns="http://www.opengis.net/ogc"><PropertyIsEqualTo><PropertyName>mediumtype</PropertyName><Literal>闆ㄦ按绠＄嚎</Literal></PropertyIsEqualTo></Filter>',
+      icon: 'sewers/闆ㄦ按绾�.png',
+      color: '#0070ff',
+      minZoom: 13,
+      styles: {
+        COLOR: '#0070ff',
+        FILL_COLOR: '#0070ff'
+      }
     },
     {
       code: 'accidentline',
-      name: '浜嬫晠姘寸嚎',
+      name: '浜嬫晠姘�',
       sname: '浜嬫晠姘�',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�',
-      minZoom: 10
+      // wmsLayers: 'sewer:pipeline_accident',
+      type: 0,
+      minZoom: 13,
+      wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
     },
     {
       code: 'oilline',
-      name: '鍚补姹℃按绾�',
+      name: '鍚补姹℃按',
       sname: '鍚补姹℃按',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=鍚补姹℃按',
-      minZoom: 10
+      type: 0,
+      minZoom: 13,
+      color: '#ffaa00',
+      wmsLayers: 'sewer:pipeline_sewer',
+      // wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
+      styles: {
+        COLOR: '#ffaa00',
+        FILL_COLOR: '#ffaa00'
+      }
     },
     {
       code: 'saltline',
-      name: '鍚洂姹℃按绾�',
+      name: '鍚洂姹℃按',
       sname: '鍚洂姹℃按',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按',
-      minZoom: 10
+      type: 0,
+      minZoom: 13,
+      wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按'
     },
     {
       code: 'alkaliline',
-      name: '鍚⒈姹℃按绾�',
+      name: '鍚⒈姹℃按',
       sname: '鍚⒈姹℃按',
       checked: false,
+      type: 0,
       wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
+      minZoom: 10
+    },
+    {
+      code: 'sulfurline',
+      name: '鍚～姹℃按',
+      sname: '鍚～姹℃按',
+      checked: false,
+      type: 0,
+      wmsLayers: 'sewer:pipeline_sulfur',
+      // wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
       minZoom: 10
     },
     {
@@ -58,24 +88,41 @@
       name: '鐢熸椿姹℃按',
       sname: '鐢熸椿姹℃按',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按',
-      minZoom: 10
+      type: 0,
+      minZoom: 13,
+      wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按'
     },
     {
       code: 'purifyline',
-      name: '鍑�鍖栨按绾�',
+      name: '鍑�鍖栨按',
       sname: '鍑�鍖栨按',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按',
-      minZoom: 10
+      type: 0,
+      minZoom: 13,
+      wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按'
     },
     {
       code: 'loopline',
-      name: '寰幆姘寸嚎',
+      name: '寰幆姘�',
       sname: '寰幆姘�',
+      type: 0,
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=寰幆姘�',
-      minZoom: 10
+      minZoom: 13,
+      wfs: WFS_URL + '?TYPENAME=寰幆姘�'
+    },
+    {
+      code: 'buildline',
+      name: '鐢熶骇姹℃按',
+      sname: '鐢熶骇姹℃按',
+      checked: false,
+      type: 0,
+      minZoom: 13,
+      color: '#a8a800',
+      wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鐢熶骇姹℃按\'',
+      styles: {
+        COLOR: '#a8a800',
+        FILL_COLOR: '#a8a800'
+      }
     }
   ]
 }

--
Gitblit v1.8.0