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/LayerHbss.js |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 97054d7..f93be09 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -1,8 +1,7 @@
 /**
  * 鍖哄煙
  */
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
+import { SERVICE_TYPE } from '../Constants'
 export const LayerHbss = {
   code: 'sewersHbss',
   name: '鐜繚璁炬柦',
@@ -14,6 +13,7 @@
       sname: '绐ㄤ簳',
       checked: false,
       minZoom: 16,
+      type: SERVICE_TYPE.WMS,
       wmsLayers: 'sewer:manhole',
       icon: 'sewers/绐ㄤ簳.png'
     },
@@ -23,7 +23,8 @@
       sname: '闆ㄧ瀛�',
       checked: false,
       minZoom: 16,
-      wmsLayers: 'sewer:raingate',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:raingate',
       // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
       icon: 'sewers/闆ㄧ瀛�.png'
     },
@@ -32,7 +33,8 @@
       name: '闃茬伀鍫�',
       sname: '闃茬伀鍫�',
       minZoom: 16,
-      wfs: WFS_URL + '?TYPENAME=闃茬伀鍫�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:firedike',
       checked: false
     },
     {
@@ -40,15 +42,17 @@
       name: '闆嗘按姹�',
       sname: '闆嗘按姹�',
       minZoom: 16,
-      wfs: WFS_URL + '?TYPENAME=闆嗘按姹�',
+      typeName: 'sewer:collectingbasin',
       checked: false,
+      type: SERVICE_TYPE.WMS,
       icon: 'sewers/闆嗘按姹�.png'
     },
     {
       code: 'jlz',
       name: '鎴祦闂�',
       sname: '鎴祦闂�',
-      wfs: WFS_URL + '?TYPENAME=鎴祦闂�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:collectingbasin',
       checked: false
     },
     {
@@ -56,7 +60,8 @@
       name: '婧㈡祦鍫�',
       sname: '婧㈡祦鍫�',
       minZoom: 16,
-      wfs: WFS_URL + '?TYPENAME=婧㈡祦鍫�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'ewer:overflowweir',
       checked: false
     },
     {
@@ -65,7 +70,8 @@
       sname: '闅旀补姹�',
       minZoom: 16,
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=闅旀补姹�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'ewer:oilseparator',
       icon: 'sewers/闅旀补姹�.png'
     }
   ]

--
Gitblit v1.8.0