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/LayerFsss.js |   56 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 4fb6a1d..b0e4350 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -1,78 +1,90 @@
 /**
  * 鍖哄煙
  */
-import { PIPELINE_WFS } from '../Constants'
-const WFS_URL = PIPELINE_WFS
+import { SERVICE_TYPE } from '../Constants'
+
 export const LayerFsss = {
   code: 'sewersFsss',
   name: '闄勫睘璁炬柦',
   checked: false, // 榛樿閫変腑鐘舵��
   layers: [
-    {
+    /* {
       code: 'pipeSection',
       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=鍥涢��',
-      icon: 'sewers/鍥涢��.png'
+      minZoom: 16,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:fourlink',
+      // wfs: WFS_URL + '?TYPENAME=鍥涢��',
+      icon: 'sewers/鍥涢��.png',
+      index: 3
     },
     {
       code: 'tee',
       name: '涓夐��',
       sname: '涓夐��',
       checked: false,
-      minZoom: 15,
-      wfs: WFS_URL + '?TYPENAME=涓夐��',
-      icon: 'sewers/涓夐��.png'
+      minZoom: 16,
+      typeName: 'sewer:tee',
+      type: SERVICE_TYPE.WMS,
+      // wfs: WFS_URL + '?TYPENAME=涓夐��',
+      icon: 'sewers/涓夐��.png',
+      index: 3
     },
     {
       code: 'piperack',
       name: '绠℃灦(澧�)',
       sname: 'PipeRack',
-      minZoom: 10,
-      wfs: WFS_URL + '?TYPENAME=绠℃灦',
+      minZoom: 16,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:piperack',
       checked: false
     },
     {
       code: 'pipegallery',
       name: '绠″粖(甯�)',
       sname: 'PipeGallery',
-      minZoom: 10,
-      wfs: WFS_URL + '?TYPENAME=绠″粖',
+      minZoom: 16,
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipegallery',
       checked: false
     },
     {
       code: 'pipesegment',
       name: '娴佸悜',
       sname: 'ywslx',
-      url: 'pipesegment',
+      type: SERVICE_TYPE.WMS,
       checked: false
     },
     {
       code: 'valve',
       name: '闃�闂�',
       minZoom: 10,
-      sname: 'valve',
+      sname: '闃�闂�',
       checked: false,
-      wfs: WFS_URL + '?TYPENAME=闃�闂�',
+      type: SERVICE_TYPE.WMS,
+      typeName: '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=寮ご',
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:elbow',
+      // wfs: WFS_URL + '?TYPENAME=寮ご',
       icon: 'sewers/寮ご.png'
     }
   ]

--
Gitblit v1.8.0