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

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

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

--
Gitblit v1.8.0