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

---
 src/conf/layers/LayerEntEmer.js |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/conf/layers/LayerEntEmer.js b/src/conf/layers/LayerEntEmer.js
index 283e161..d63a663 100644
--- a/src/conf/layers/LayerEntEmer.js
+++ b/src/conf/layers/LayerEntEmer.js
@@ -1,23 +1,24 @@
 /**
- * 浼佷笟棰勮
+ * 浼佷笟搴旀��
  */
 import { LayerHbss } from './LayerHbss'
 import { LayerFsss } from './LayerFsss'
 
 import { PIPELINE_WFS } from '../Constants'
+
 const WFS_URL = PIPELINE_WFS
 
 export const LayerEntEmer = {
   code: 'reportEntemeage',
-  name: '浼佷笟棰勮',
+  name: '浼佷笟搴旀��',
   checked: false,
   type: 0,
   childLayer: [LayerFsss, LayerHbss],
   layers: [
     {
       code: 'rainline',
-      name: '浜嬪墠闃舵',
-      sname: '鍏ㄩ儴璧勬簮',
+      name: '鍩虹鍥惧眰',
+      sname: '绠$綉',
       checked: false,
       type: 0,
       wmsLayers: 'sewer:pipeline_rain',
@@ -32,7 +33,7 @@
     },
     {
       code: 'accidentline',
-      name: '搴旀�ョ墿璧勫湪',
+      name: '鍦ㄧ嚎鐩戞祴',
       sname: '浜嬫晠姘�',
       checked: false,
       // wmsLayers: 'sewer:pipeline_accident',
@@ -42,7 +43,7 @@
     },
     {
       code: 'oilline',
-      name: '搴旀�ヨ溅杈�',
+      name: '搴旀�ヨ祫婧�',
       sname: '鍚补姹℃按',
       checked: false,
       type: 0,
@@ -56,13 +57,19 @@
       }
     },
     {
-      code: 'saltline',
-      name: '搴旀�ラ槦浼�',
-      sname: '鍚洂姹℃按',
+      code: 'oil',
+      name: '鍛ㄨ竟鐜',
+      sname: '鍚补姹℃按',
       checked: false,
       type: 0,
       minZoom: 13,
-      wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按'
+      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'
+      }
     }
   ]
 }

--
Gitblit v1.8.0