From 4fef038c7e4ba6a82b77e9679f58e2f9d8c0711b Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 18:54:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/layers/LayerFsss.js |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 4fb6a1d..86cc169 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -13,16 +13,17 @@
       name: '绠℃',
       sname: '绠℃',
       checked: false,
-      minZoom: 15,
-      wfs: WFS_URL + '?TYPENAME=绠℃'
+      wmsLayers: 'sewer:pipesegment'
+      // wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipesegment&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=orgname=\'宸撮櫟鐭冲寲\''
     },
     {
       code: 'fourlink',
       name: '鍥涢��',
       sname: '鍥涢��',
       checked: true,
-      minZoom: 15,
-      wfs: WFS_URL + '?TYPENAME=鍥涢��',
+      minZoom: 16,
+      wmsLayers: 'sewer:fourlink',
+      // wfs: WFS_URL + '?TYPENAME=鍥涢��',
       icon: 'sewers/鍥涢��.png'
     },
     {
@@ -30,15 +31,16 @@
       name: '涓夐��',
       sname: '涓夐��',
       checked: false,
-      minZoom: 15,
-      wfs: WFS_URL + '?TYPENAME=涓夐��',
+      minZoom: 16,
+      wmsLayers: 'sewer:tee',
+      // wfs: WFS_URL + '?TYPENAME=涓夐��',
       icon: 'sewers/涓夐��.png'
     },
     {
       code: 'piperack',
       name: '绠℃灦(澧�)',
       sname: 'PipeRack',
-      minZoom: 10,
+      minZoom: 16,
       wfs: WFS_URL + '?TYPENAME=绠℃灦',
       checked: false
     },
@@ -46,7 +48,7 @@
       code: 'pipegallery',
       name: '绠″粖(甯�)',
       sname: 'PipeGallery',
-      minZoom: 10,
+      minZoom: 16,
       wfs: WFS_URL + '?TYPENAME=绠″粖',
       checked: false
     },
@@ -54,25 +56,26 @@
       code: 'pipesegment',
       name: '娴佸悜',
       sname: 'ywslx',
-      url: 'pipesegment',
       checked: false
     },
     {
       code: 'valve',
       name: '闃�闂�',
       minZoom: 10,
-      sname: 'valve',
+      sname: '闃�闂�',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=闃�闂�',
+      wmsLayers: 'sewer:valve',
+      // wfs: WFS_URL + '?TYPENAME=闃�闂�',
       icon: 'sewers/闃�闂�.png'
     },
     {
       code: 'elbow',
       name: '寮ご',
-      sname: 'Elbow',
-      minZoom: 10,
+      sname: '寮ご',
+      minZoom: 16,
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=寮ご',
+      wmsLayers: 'sewer:elbow',
+      // wfs: WFS_URL + '?TYPENAME=寮ご',
       icon: 'sewers/寮ご.png'
     }
   ]

--
Gitblit v1.8.0