From cb85033879c74f34925a303402c1ad3e4a8646f2 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 10 五月 2021 17:03:54 +0800
Subject: [PATCH] 搜索更换为geoserver wfs,图层顺序，弹窗定位等

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

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

--
Gitblit v1.8.0