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/LayerFsss.js |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 6cc183a..d46732e 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -1,8 +1,8 @@
 /**
  * 鍖哄煙
  */
-import { PIPELINE_WFS, SERVICE_TYPE } from '../Constants'
-const WFS_URL = PIPELINE_WFS
+import { SERVICE_TYPE } from '../Constants'
+
 export const LayerFsss = {
   code: 'sewersFsss',
   name: '闄勫睘璁炬柦',
@@ -25,8 +25,7 @@
       type: SERVICE_TYPE.WMS,
       typeName: 'sewer:fourlink',
       // wfs: WFS_URL + '?TYPENAME=鍥涢��',
-      icon: 'sewers/鍥涢��.png',
-      index: 3
+      icon: 'sewers/鍥涢��.png'
     },
     {
       code: 'tee',
@@ -37,25 +36,31 @@
       typeName: 'sewer:tee',
       type: SERVICE_TYPE.WMS,
       // wfs: WFS_URL + '?TYPENAME=涓夐��',
-      icon: 'sewers/涓夐��.png',
-      index: 3
+      icon: 'sewers/涓夐��.png'
     },
     {
       code: 'piperack',
       name: '绠℃灦(澧�)',
-      sname: 'PipeRack',
+      sname: '绠℃灦(澧�)',
       minZoom: 16,
       type: SERVICE_TYPE.WMS,
-      typeName: WFS_URL + '?TYPENAME=绠℃灦',
+      typeName: 'sewer:piperack',
+      icon: 'sewers/绠℃灦(澧�).png',
       checked: false
     },
     {
       code: 'pipegallery',
       name: '绠″粖(甯�)',
-      sname: 'PipeGallery',
+      sname: '绠″粖(甯�)',
       minZoom: 16,
       type: SERVICE_TYPE.WMS,
-      typeName: '?TYPENAME=绠″粖',
+      typeName: 'sewer:pipegallery',
+      icon: 'sewers/绠″粖.png',
+      color: '#828282',
+      styles: {
+        COLOR: '#828282',
+        FILL_COLOR: '#828282'
+      },
       checked: false
     },
     {
@@ -63,6 +68,7 @@
       name: '娴佸悜',
       sname: 'ywslx',
       type: SERVICE_TYPE.WMS,
+      typeName: 'sewer:pipesegment_flow',
       checked: false
     },
     {

--
Gitblit v1.8.0