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

---
 src/conf/layers/LayerEntEmer.js |   76 +++++++++++++++++++++++---------------
 1 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/conf/layers/LayerEntEmer.js b/src/conf/layers/LayerEntEmer.js
index d63a663..18fa844 100644
--- a/src/conf/layers/LayerEntEmer.js
+++ b/src/conf/layers/LayerEntEmer.js
@@ -1,75 +1,91 @@
 /**
  * 浼佷笟搴旀��
  */
-import { LayerHbss } from './LayerHbss'
-import { LayerFsss } from './LayerFsss'
+// import { LayerHbss } from './LayerHbss'
+// import { LayerFsss } from './LayerFsss'
 
-import { PIPELINE_WFS } from '../Constants'
+import { LayerEvent } from './LayerEvent'
+import { LayerResources } from './LayerResources'
 
-const WFS_URL = PIPELINE_WFS
+import { SERVICE_TYPE } from '../Constants'
 
 export const LayerEntEmer = {
-  code: 'reportEntemeage',
+  code: 'EnterpriseEmergency',
   name: '浼佷笟搴旀��',
   checked: false,
   type: 0,
-  childLayer: [LayerFsss, LayerHbss],
+  childLayer: [LayerEvent, LayerResources],
   layers: [
     {
       code: 'rainline',
       name: '鍩虹鍥惧眰',
-      sname: '绠＄綉',
+      sname: '鍩虹鍥惧眰',
       checked: false,
-      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>',
+      type: SERVICE_TYPE.WMS,
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       icon: 'sewers/闆ㄦ按绾�.png',
       color: '#0070ff',
       minZoom: 13,
       styles: {
         COLOR: '#0070ff',
         FILL_COLOR: '#0070ff'
-      }
+      },
+      filter: 'mediumtype = \'鍩虹鍥惧眰\'',
+      index: 1
     },
     {
       code: 'accidentline',
       name: '鍦ㄧ嚎鐩戞祴',
-      sname: '浜嬫晠姘�',
+      sname: '鍦ㄧ嚎鐩戞祴',
       checked: false,
-      // wmsLayers: 'sewer:pipeline_accident',
-      type: 0,
+      type: SERVICE_TYPE.WMS,
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       minZoom: 13,
-      wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
+      filter: 'mediumtype = \'鍦ㄧ嚎鐩戞祴\'',
+      index: 1
     },
     {
       code: 'oilline',
       name: '搴旀�ヨ祫婧�',
-      sname: '鍚补姹℃按',
+      sname: '搴旀�ヨ祫婧�',
       checked: false,
-      type: 0,
+      type: SERVICE_TYPE.WMS,
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       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=\'鍚补姹℃按\'',
+      filter: 'mediumtype = \'搴旀�ヨ祫婧怽'',
       styles: {
         COLOR: '#ffaa00',
         FILL_COLOR: '#ffaa00'
-      }
+      },
+      index: 1
     },
     {
-      code: 'oil',
+      code: 'saltline',
       name: '鍛ㄨ竟鐜',
-      sname: '鍚补姹℃按',
+      sname: '鍛ㄨ竟鐜',
       checked: false,
-      type: 0,
+      type: SERVICE_TYPE.WMS,
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
       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'
-      }
+      filter: 'mediumtype = \'鍛ㄨ竟鐜\'',
+      index: 1
+    },
+    {
+      code: 'alkaliline',
+      name: '姹℃按绠＄嚎',
+      sname: '姹℃按绠＄嚎',
+      checked: false,
+      type: SERVICE_TYPE.WMS,
+      layerGroup: 'sewer:pipeline_group',
+      typeName: 'sewer:pipeline',
+      filter: 'mediumtype = \'姹℃按绠＄嚎\'',
+      minZoom: 10,
+      index: 1
     }
   ]
 }

--
Gitblit v1.8.0