From 593f6ccd3aec8045a26b4b330f2b034df05bfd9f Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 28 五月 2021 09:27:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/layers/LayerPk.js |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index 3750c1f..ab105be 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,3 +1,5 @@
+import { SERVICE_TYPE } from '../Constants'
+
 /**
  * 鎺掑彛
  */
@@ -5,24 +7,29 @@
   code: 'sewersDischargeport',
   name: '鎺掓斁鍙�',
   icon: 'sewers/闆ㄦ按鎺掑彛.png',
-  checked: true,
+  checked: false,
+  type: 0,
   layers: [
     {
       code: 'sewersNpk',
       name: '鍐呮帓鍙�',
-      sname: '鍐呮帓鍙�',
-      checked: true,
+      sname: '鍐呮帓',
+      checked: false,
+      type: SERVICE_TYPE.WMS,
       icon: 'sewers/闆ㄦ按鎺掑彛.png',
-      wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'鍐呮帓\'',
+      typeName: 'sewer:dischargeport',
+      filter: 'pfktype = \'鍐呮帓\'',
       minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
     },
     {
       code: 'sewersWpk',
       name: '澶栨帓鍙�',
-      sname: '澶栨帓鍙�',
+      sname: '澶栨帓',
       icon: 'sewers/闆ㄦ按鎺掑彛.png',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'澶栨帓\'',
+      checked: false, // 榛樿閫変腑鐘舵��
+      type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:dischargeport',
+      filter: 'pfktype = \'澶栨帓\'',
       minZoom: 10
     }
   ]

--
Gitblit v1.8.0