From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/layers/LayerPipeLines.js |   78 +++++++++++++++++++++++++++++++++-----
 1 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index d3de90e..113d1a0 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -17,10 +17,12 @@
       code: 'rainline',
       name: '闆ㄦ按绾�',
       sname: '绠$綉',
-      checked: false,
+      checked: true,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       icon: 'sewers/闆ㄦ按绾�.png',
+      legendImage: '../.././assets/images/map/sewers/闆ㄦ按绾�.png',
       color: '#0070ff',
       minZoom: 13,
       styles: {
@@ -36,8 +38,16 @@
       sname: '浜嬫晠姘�',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/浜嬫晠姘�.png',
       minZoom: 13,
+      // color: 'rgb(230, 76, 0)',
+      color: '#E64C00',
+      styles: {
+        COLOR: '#E64C00',
+        FILL_COLOR: '#E64C00'
+      },
       filter: 'mediumtype = \'浜嬫晠姘碶'',
       index: 1
     },
@@ -47,7 +57,9 @@
       sname: '鍚补姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/鍚补姹℃按.png',
       minZoom: 13,
       color: '#ffaa00',
       filter: 'mediumtype = \'鍚补姹℃按\'',
@@ -63,9 +75,16 @@
       sname: '鍚洂姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/鍚洂姹℃按.png',
       minZoom: 13,
+      color: '#FF7F7F',
       filter: 'mediumtype = \'鍚洂姹℃按\'',
+      styles: {
+        COLOR: '#FF7F7F',
+        FILL_COLOR: '#FF7F7F'
+      },
       index: 1
     },
     {
@@ -74,9 +93,16 @@
       sname: '鍚⒈姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/鍚⒈姹℃按.png',
       filter: 'mediumtype = \'鍚⒈姹℃按\'',
       minZoom: 10,
+      color: '#E8BEFF',
+      styles: {
+        COLOR: '#E8BEFF',
+        FILL_COLOR: '#E8BEFF'
+      },
       index: 1
     },
     {
@@ -85,9 +111,16 @@
       sname: '鍚~姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/鍚~姹℃按.png',
       filter: 'mediumtype = \'鍚~姹℃按\'',
       minZoom: 10,
+      color: '',
+      styles: {
+        COLOR: '',
+        FILL_COLOR: ''
+      },
       index: 1
     },
     {
@@ -96,9 +129,16 @@
       sname: '鐢熸椿姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/鐢熸椿姹℃按.png',
       filter: 'mediumtype = \'鐢熸椿姹℃按\'',
       minZoom: 13,
+      color: '#A8A800',
+      styles: {
+        COLOR: '#A8A800',
+        FILL_COLOR: '#A8A800'
+      },
       index: 1
     },
     {
@@ -107,9 +147,16 @@
       sname: '鍑�鍖栨按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/鍑�鍖栨按.png',
       filter: 'mediumtype = \'鍑�鍖栨按\'',
       minZoom: 13,
+      color: '#55FF00',
+      styles: {
+        COLOR: '#55FF00',
+        FILL_COLOR: '#55FF00'
+      },
       index: 1
     },
     {
@@ -117,10 +164,17 @@
       name: '寰幆姘�',
       sname: '寰幆姘�',
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/寰幆姘�.png',
       filter: 'mediumtype = \'寰幆姘碶'',
       checked: false,
       minZoom: 13,
+      color: '#73FFDF',
+      styles: {
+        COLOR: '#73FFDF',
+        FILL_COLOR: '#73FFDF'
+      },
       index: 1
     },
     {
@@ -129,7 +183,9 @@
       sname: '鐢熶骇姹℃按',
       checked: false,
       type: SERVICE_TYPE.WMS,
-      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      icon: 'sewers/鐢熶骇姹℃按.png',
       filter: 'mediumtype = \'鐢熶骇姹℃按\'',
       minZoom: 13,
       color: '#a8a800',

--
Gitblit v1.8.0