From 4e4770fafafb63a593293c234fd23db78faefaae Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期二, 11 五月 2021 10:49:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/layers/LayerPipeLines.js |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 8dea07c..d3de90e 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -19,7 +19,7 @@
       sname: '绠$綉',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       icon: 'sewers/闆ㄦ按绾�.png',
       color: '#0070ff',
       minZoom: 13,
@@ -36,7 +36,7 @@
       sname: '浜嬫晠姘�',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       minZoom: 13,
       filter: 'mediumtype = \'浜嬫晠姘碶'',
       index: 1
@@ -47,10 +47,10 @@
       sname: '鍚补姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       minZoom: 13,
       color: '#ffaa00',
-      filter: 'mediumtype = \'鍚补\'',
+      filter: 'mediumtype = \'鍚补姹℃按\'',
       styles: {
         COLOR: '#ffaa00',
         FILL_COLOR: '#ffaa00'
@@ -63,9 +63,9 @@
       sname: '鍚洂姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       minZoom: 13,
-      filter: 'mediumtype = \'鍚洂\'',
+      filter: 'mediumtype = \'鍚洂姹℃按\'',
       index: 1
     },
     {
@@ -74,8 +74,8 @@
       sname: '鍚⒈姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
-      filter: 'mediumtype = \'鍚⒈\'',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'鍚⒈姹℃按\'',
       minZoom: 10,
       index: 1
     },
@@ -85,8 +85,8 @@
       sname: '鍚~姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
-      filter: 'mediumtype = \'鍚~\'',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      filter: 'mediumtype = \'鍚~姹℃按\'',
       minZoom: 10,
       index: 1
     },
@@ -96,7 +96,7 @@
       sname: '鐢熸椿姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       filter: 'mediumtype = \'鐢熸椿姹℃按\'',
       minZoom: 13,
       index: 1
@@ -107,7 +107,7 @@
       sname: '鍑�鍖栨按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       filter: 'mediumtype = \'鍑�鍖栨按\'',
       minZoom: 13,
       index: 1
@@ -117,7 +117,7 @@
       name: '寰幆姘�',
       sname: '寰幆姘�',
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       filter: 'mediumtype = \'寰幆姘碶'',
       checked: false,
       minZoom: 13,
@@ -129,7 +129,7 @@
       sname: '鐢熶骇姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline',
+      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
       filter: 'mediumtype = \'鐢熶骇姹℃按\'',
       minZoom: 13,
       color: '#a8a800',

--
Gitblit v1.8.0