From 4df0471b7dff0494625ff09969b1a13b5359a26e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期一, 31 五月 2021 22:41:47 +0800
Subject: [PATCH] 统计表弹框UI优化；增加点击企业名称缩放至企业；二级表展示功能优化。

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

diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index d3de90e..5fd131f 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -16,11 +16,13 @@
     {
       code: 'rainline',
       name: '闆ㄦ按绾�',
-      sname: '绠＄綉',
-      checked: false,
+      sname: '闆ㄦ按',
+      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: {
@@ -28,7 +30,7 @@
         FILL_COLOR: '#0070ff'
       },
       filter: 'mediumtype = \'闆ㄦ按\'',
-      index: 1
+      index: 20
     },
     {
       code: 'accidentline',
@@ -36,10 +38,18 @@
       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
+      index: 20
     },
     {
       code: 'oilline',
@@ -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 = \'鍚补姹℃按\'',
@@ -55,7 +67,7 @@
         COLOR: '#ffaa00',
         FILL_COLOR: '#ffaa00'
       },
-      index: 1
+      index: 20
     },
     {
       code: 'saltline',
@@ -63,10 +75,17 @@
       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 = \'鍚洂姹℃按\'',
-      index: 1
+      styles: {
+        COLOR: '#FF7F7F',
+        FILL_COLOR: '#FF7F7F'
+      },
+      index: 20
     },
     {
       code: 'alkaliline',
@@ -74,10 +93,17 @@
       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,
-      index: 1
+      color: '#E8BEFF',
+      styles: {
+        COLOR: '#E8BEFF',
+        FILL_COLOR: '#E8BEFF'
+      },
+      index: 20
     },
     {
       code: 'sulfurline',
@@ -85,10 +111,17 @@
       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,
-      index: 1
+      color: '',
+      styles: {
+        COLOR: '',
+        FILL_COLOR: ''
+      },
+      index: 20
     },
     {
       code: 'lifeline',
@@ -96,10 +129,17 @@
       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,
-      index: 1
+      color: '#A8A800',
+      styles: {
+        COLOR: '#A8A800',
+        FILL_COLOR: '#A8A800'
+      },
+      index: 20
     },
     {
       code: 'purifyline',
@@ -107,21 +147,35 @@
       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,
-      index: 1
+      color: '#55FF00',
+      styles: {
+        COLOR: '#55FF00',
+        FILL_COLOR: '#55FF00'
+      },
+      index: 20
     },
     {
       code: 'loopline',
       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,
-      index: 1
+      color: '#73FFDF',
+      styles: {
+        COLOR: '#73FFDF',
+        FILL_COLOR: '#73FFDF'
+      },
+      index: 20
     },
     {
       code: 'buildline',
@@ -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',
@@ -137,7 +193,7 @@
         COLOR: '#a8a800',
         FILL_COLOR: '#a8a800'
       },
-      index: 1
+      index: 20
     }
   ]
 }

--
Gitblit v1.8.0