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/LayerHbss.js |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 5fdeca9..99be80b 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: '鐜繚璁炬柦',
@@ -12,9 +11,10 @@
       code: 'yj',
       name: '绐ㄤ簳',
       sname: '绐ㄤ簳',
-      checked: true,
+      checked: false,
       minZoom: 16,
-      wfs: WFS_URL + '?TYPENAME=绐ㄤ簳',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:manhole',
       icon: 'sewers/绐ㄤ簳.png'
     },
     {
@@ -23,7 +23,9 @@
       sname: '闆ㄧ瀛�',
       checked: false,
       minZoom: 16,
-      wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:raingate',
+      // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
       icon: 'sewers/闆ㄧ瀛�.png'
     },
     {
@@ -31,7 +33,9 @@
       name: '闃茬伀鍫�',
       sname: '闃茬伀鍫�',
       minZoom: 16,
-      wfs: WFS_URL + '?TYPENAME=闃茬伀鍫�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:firedike',
+      icon: 'sewers/闃茬伀鍫�.png',
       checked: false
     },
     {
@@ -39,15 +43,18 @@
       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:chokevalve',
+      icon: 'sewers/.png',
       checked: false
     },
     {
@@ -55,7 +62,9 @@
       name: '婧㈡祦鍫�',
       sname: '婧㈡祦鍫�',
       minZoom: 16,
-      wfs: WFS_URL + '?TYPENAME=婧㈡祦鍫�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:overflowweir',
+      icon: 'sewers/.png',
       checked: false
     },
     {
@@ -64,7 +73,8 @@
       sname: '闅旀补姹�',
       minZoom: 16,
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=闅旀补姹�',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:oilseparator',
       icon: 'sewers/闅旀补姹�.png'
     }
   ]

--
Gitblit v1.8.0