From 05f6eb0aaa7914289b60e87ee7fdc2aa357b36cb Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 18:07:49 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/LayerController/logic/WasteGas.js                          |   16 ++-
 src/conf/layers/LayerWasteWater.js                                        |   20 +--
 src/conf/LayerTopic.js                                                    |    5 
 src/conf/layers/LayerPollutionSources.js                                  |   26 +++++
 src/conf/layers/LayerWasteGas.js                                          |   30 ++---
 src/components/LayerController/modules/LcServiceLayerFilter.vue           |   31 +++--
 src/components/LayerController/logic/Company.js                           |    6 
 src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue |   10 +-
 src/components/BaseNav/PublicBounced/PublicBounced.vue                    |    5 
 src/conf/layers/LayerSewers.js                                            |  102 --------------------
 src/conf/layers/LayerWasteSolid.js                                        |   16 --
 src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue            |    3 
 src/conf/Constants.js                                                     |    6 
 src/conf/MapConfig.js                                                     |    3 
 src/components/LayerController/logic/WasteWater.js                        |    8 
 src/components/LayerController/logic/SolidWaste.js                        |    6 
 16 files changed, 107 insertions(+), 186 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index 5ef6f57..b402878 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -11,6 +11,7 @@
           <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
           <el-dialog  :visible.sync="dialogVisible"
                       :append-to-body="true"
+                      :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
                       width="68%"
                       center
                       v-dialogDrag
@@ -232,7 +233,7 @@
     .form-echrts{
       width: 100%;
       height: 100%;
-      border: 1px solid #396d83;
+      border-top: 1px solid #396d83;
       //margin: 10px 10px 10px 10px;
       .el-dialog-div{
         //height: 50vh!important;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index d3c4ce7..5da2a6f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -37,13 +37,13 @@
     }
   },
   mounted () {
-    console.log('value')
-    if (this.$attrs.getWasteGasDetails) {
+    console.log(this.$attrs.value)
+    if (this.$attrs.value === 'feiqi') {
       this.tableData = this.$attrs.getWasteGasDetails
-      console.log(this.$attrs.getWasteGasDetails)
-    } else if (this.$attrs.getWasteWaterMonitoringDetails) {
+      // console.log(this.$attrs.getWasteGasDetails)
+    } else if (this.$attrs.value === 'feishui') {
       this.tableData = this.$attrs.getWasteWaterMonitoringDetails
-      console.log(this.$attrs.getWasteWaterMonitoringDetails)
+      // console.log(this.$attrs.getWasteWaterMonitoringDetails)
     }
   }
 }
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8e57e7d..051b3c4 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -12,7 +12,10 @@
           <public-table v-if="value === 'gufei'"
                         :displayContentTable="displayContentTable"></public-table>
           <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
-                        :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
+                        :value="value"
+                        :getWasteWaterMonitoring="getWasteWaterMonitoring"
+                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails
+"></public-chart>
         </div>
       </div>
       <div class="public-bounced-content-right">
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 8fda8d0..ae08aa5 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -28,11 +28,11 @@
       const positionY = data[i].Longitude
 
       var iconUrl = companyImg
-      const marker = L.marker.magic([positionX, positionY], {
+      const marker = L.marker([positionX, positionY], {
         icon: L.icon({
           iconUrl: iconUrl,
-          iconSize: [50, 50],
-          iconAnchor: [25, 25]
+          iconSize: [30, 30],
+          iconAnchor: [13, 5]
         }),
         test: data[i]
       })
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index ffbedfa..ea995ac 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -39,8 +39,8 @@
         totransferData: getSolidWasteData[i],
         icon: L.icon({
           iconUrl: iconUrl,
-          iconSize: [50, 50],
-          iconAnchor: [25, 25]
+          iconSize: [20, 20],
+          iconAnchor: [10, 10]
         })
       })
       layer.addLayer(marker)
@@ -88,7 +88,7 @@
     // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
     instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
     /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
-    this.setPanTo(e.latlng, 200)
+    this.setPanTo(e.latlng, 80)
   }
 
   // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index a83e948..2ac1651 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -20,6 +20,7 @@
   this.init = async (layer, L) => {
     this.animalService = new AnimalService({ L: L, layer: layer })
     const res = await mapApi.getWasteGas()
+    // console.log(res)
     const data = res.Result.DataInfo || {}
     // console.log(data)
     for (let i = 0; i < data.length; i++) {
@@ -29,13 +30,18 @@
       // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
       const ContrLevel = data[i].ContrLevel
       var iconUrl = this.differentTypes(ContrLevel)
-
-      const marker = L.marker.magic([positionX, positionY], {
+      // const marker = L.canvasMarker([positionX, positionY], {
+      //   img: {
+      //     // url: 'assets/images/map/marker-icon.png',
+      //     url: iconUrl,
+      //     size: STYLES.ICON_SIZE
+      //   }
+      const marker = L.marker([positionX, positionY], {
         test: data[i],
         icon: L.icon({
           iconUrl: iconUrl,
-          iconSize: [50, 50],
-          iconAnchor: [25, 25]
+          iconSize: [20, 20],
+          iconAnchor: [10, 10]
         })
       })
       layer.addLayer(marker)
@@ -61,7 +67,7 @@
     // console.log(e.layer.options.test)
     instance.$mount()
     document.body.appendChild(instance.$el)
-    this.setPanTo(e.latlng, 240)
+    this.setPanTo(e.latlng, 80)
   }
   // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
   this.differentTypes = (ContrLevel) => {
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index b6bbf06..c3bccaf 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -33,12 +33,12 @@
       // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
       const testValue = data[i].ContrLevel
       const iconUrl = this.differentTypes(testValue)
-      const marker = L.marker.magic([positionX, positionY], {
+      const marker = L.marker([positionX, positionY], {
         test: data[i],
         icon: L.icon({
           iconUrl: iconUrl,
-          iconSize: [50, 50],
-          iconAnchor: [25, 25]
+          iconSize: [20, 20],
+          iconAnchor: [10, 10]
         })
       })
       layer.addLayer(marker)
@@ -64,7 +64,7 @@
     // console.log(e.layer.options.test)
     instance.$mount()
     document.body.appendChild(instance.$el)
-    this.setPanTo(e.latlng, 240)
+    this.setPanTo(e.latlng, 80)
   }
 
   // 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 60e229f..f390c9f 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -5,7 +5,7 @@
                 <div class="title"><input type="checkbox" :value="item.code" :checked="item.checked"
                                           @change="swAllSubFilter(item)">{{item.name}}
                 </div>
-                <el-scrollbar style="height:100%">
+                <!--  <el-scrollbar style="height:100%"> -->
                     <div class="content">
                         <div v-for="filter in item.layers" :key="filter.code">
                             <input type="checkbox" :value="filter.code" :checked="filter.checked"
@@ -13,7 +13,7 @@
                                 :title="filter.name">{{filter.name}}</label>
                         </div>
                     </div>
-                </el-scrollbar>
+                <!--  </el-scrollbar> -->
             </div>
         </div>
     </div>
@@ -50,18 +50,20 @@
     },
     // todo 杩橀渶瑕佷紭鍖栵紝鍦ㄦ湁澶氫釜闇�瑕佸瓙鍥惧眰鐙珛寮圭獥鎯呭喌涓嬫棤鏁�
     toggle (serviceLayers) {
-      for (var i = 0; i < serviceLayers.length; i++) {
-        var serviceLayer = serviceLayers[i]
-        var childLayer = serviceLayer.childLayer
-        if (childLayer) {
-          if (this.checkChecked(serviceLayer.layers)) {
-            this.layers = childLayer
+      if (serviceLayers) {
+        for (var i = 0; i < serviceLayers.length; i++) {
+          var serviceLayer = serviceLayers[i]
+          var childLayer = serviceLayer.childLayer
+          if (childLayer) {
+            if (this.checkChecked(serviceLayer.layers)) {
+              this.layers = childLayer
+            } else {
+              this.layers = []
+            }
+            break
           } else {
-            this.layers = []
+            this.toggle(serviceLayer.layers)
           }
-          break
-        } else {
-          this.toggle(serviceLayer.layers)
         }
       }
     },
@@ -102,7 +104,7 @@
         color: #90c8e0;
         font-size: 13px;
         position: absolute;
-        left: 256px;
+        left: 1.82167rem;
         z-index: 1000;
         top: 50px;
         .filter-group {
@@ -110,7 +112,7 @@
             flex-flow: row;
 
             .filter-item {
-                width: 120px;
+                width: 0.6rem;
                 height: 100%;
                 margin-right: 5px;
 
@@ -124,6 +126,7 @@
                     background-color: rgba(44, 62, 80, 0.6);
                     border: 1px solid #10488c;
                     max-height: 200px;
+                    padding-bottom: 5px;
                     //overflow-y: hidden;
                 }
 
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 98f7fa1..6784be5 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -5,9 +5,9 @@
 }
 
 export const logicMapper = {
-  wasteGasJcd: 'WasteGas.js',
-  wasteWaterJcd: 'WasteWater.js',
-  solidWasteJcd: 'SolidWaste.js',
+  wasteGasPfk: 'WasteGas.js',
+  wasteWaterPfk: 'WasteWater.js',
+  wasteSolidCcd: 'SolidWaste.js',
   sewersAreaGs: 'Company.js'
 }
 
diff --git a/src/conf/LayerTopic.js b/src/conf/LayerTopic.js
index 66197d9..1e1fe7d 100644
--- a/src/conf/LayerTopic.js
+++ b/src/conf/LayerTopic.js
@@ -1,5 +1,5 @@
 /**
- * 鍖哄煙
+ * 涓撻
  */
 import { LayerWasteWater } from './layers/LayerWasteWater'
 import { LayerWasteGas } from './layers/LayerWasteGas'
@@ -7,10 +7,11 @@
 import { LayerAirQuality } from './layers/LayerAirQuality'
 import { LayerEnvRisk } from './layers/LayerEnvRisk'
 import { LayerSoilGroundWater } from './layers/LayerSoilGroundWater'
+import { LayerPollutionSources } from './layers/LayerPollutionSources'
 
 export const LayerTopic = {
   code: 'sewersTopic',
   name: '涓撻鍥惧眰',
   checked: true,
-  layers: [LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater]
+  layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater]
 }
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 8f95cd8..4dff288 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -3,6 +3,7 @@
 import { LayerSewersPoint } from './layers/LayerSewers'
 import { LayerTopic } from './LayerTopic'
 import { LayerPipeLine } from './LayerPipeLine'
+import { LayerBasin } from './layers/LayerBasin'
 
 const curWwwPath = window.document.location.href
 const pathname = window.document.location.pathname
@@ -42,7 +43,7 @@
   IntranetBaseMaps: TDT.intranet,
   InternetBaseMaps: TDT.internet,
   Layers: {
-    LayerSewersLine: [LayerPipeLine, LayerTopic],
+    LayerSewersLine: [LayerBasin, LayerTopic, LayerPipeLine],
     layerSewersPoint: LayerSewersPoint
   } // 姹¢洦姘村浘灞傞厤缃�
 }
diff --git a/src/conf/layers/LayerPollutionSources.js b/src/conf/layers/LayerPollutionSources.js
new file mode 100644
index 0000000..324b69e
--- /dev/null
+++ b/src/conf/layers/LayerPollutionSources.js
@@ -0,0 +1,26 @@
+/**
+ * 姹℃煋婧�
+ * @type {string}
+ */
+export const LayerPollutionSources = {
+  code: 'pollutionSources',
+  name: '姹℃煋婧�',
+  checked: true,
+  layers: [
+    {
+      code: 'pollutionSourcesSczz',
+      name: '鐢熶骇瑁呯疆',
+      sname: '鐢熶骇瑁呯疆', // 琛ㄥ悕
+      checked: true, // 榛樿閫変腑鐘舵��
+      url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
+      minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+    },
+    {
+      code: 'pollutionSourcesZlss',
+      name: '娌荤悊璁炬柦',
+      sname: '娌荤悊璁炬柦', // 琛ㄥ悕
+      checked: true, // 榛樿閫変腑鐘舵��
+      url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
+      minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+    }]
+}
diff --git a/src/conf/layers/LayerSewers.js b/src/conf/layers/LayerSewers.js
index 433b67d..39e71a5 100644
--- a/src/conf/layers/LayerSewers.js
+++ b/src/conf/layers/LayerSewers.js
@@ -1,106 +1,4 @@
 const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
-// const APP_GIS_HOST_2 = 'http://localhost:3000'
-// const APP_GIS_HOST_2 = 'http://192.168.31.226:8088'
-export const LayerSewersLine = {
-  code: 'pipeline',
-  name: '绠$綉鏁版嵁',
-  type: 'geojson',
-  checked: true,
-  layers: [
-    {
-      code: 'rainline',
-      name: '闆ㄦ按绾�',
-      sname: '绠$綉', // 琛ㄥ悕
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=绠$綉',
-      minZoom: 10, // 鍦ㄦ寚瀹氱骇鍒樉绀�
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'oilline',
-      name: '鍚补姹℃按绾�',
-      sname: '鍚补姹℃按',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=鍚补姹℃按',
-      minZoom: 10,
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'saltline',
-      name: '鍚洂姹℃按绾�',
-      sname: '鍚洂姹℃按',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按',
-      minZoom: 10,
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'alkaliline',
-      name: '鍚⒈姹℃按绾�',
-      sname: '鍚⒈姹℃按',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
-      minZoom: 10,
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'outlet',
-      name: '鎺掑彛',
-      sname: '鎺掑彛',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=鎺掑彛',
-      minZoom: 10,
-      childLayer: 'pk' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'accidentline',
-      name: '浜嬫晠姘寸嚎',
-      sname: '浜嬫晠姘�',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�',
-      minZoom: 10,
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'loopline',
-      name: '寰幆姘寸嚎',
-      sname: '寰幆姘�',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=寰幆姘�',
-      minZoom: 10,
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'purifyline',
-      name: '鍑�鍖栨按绾�',
-      sname: '鍑�鍖栨按',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按',
-      minZoom: 10,
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'lifeline',
-      name: '鐢熸椿姹℃按',
-      sname: '鐢熸椿姹℃按',
-      checked: true, // 榛樿閫変腑鐘舵��
-      wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按',
-      minZoom: 10,
-      childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
-    },
-    {
-      code: 'areainfo',
-      name: '鍖哄煙淇℃伅',
-      sname: '鍖哄煙淇℃伅',
-      checked: true, // 榛樿閫変腑鐘舵��
-      filter: {},
-      minZoom: 10,
-      childLayer: 'qyxx' // 鍏宠仈PointLayers
-    }
-  ]
-}
-
 export const LayerSewersPoint = [
   {
     code: 'sewersFsss',
diff --git a/src/conf/layers/LayerWasteGas.js b/src/conf/layers/LayerWasteGas.js
index 3860e94..a516977 100644
--- a/src/conf/layers/LayerWasteGas.js
+++ b/src/conf/layers/LayerWasteGas.js
@@ -8,28 +8,12 @@
   checked: true,
   layers: [
     {
-      code: 'wasteGasQy',
-      name: '浼佷笟',
-      sname: '浼佷笟', // 琛ㄥ悕
+      code: 'wasteGasPfk',
+      name: '鎺掓斁鍙�',
+      sname: '鎺掓斁鍙�', // 琛ㄥ悕
       checked: true, // 榛樿閫変腑鐘舵��
       url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
       minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
-    },
-    {
-      code: 'wasteGasJcd',
-      name: '鐩戞祴鐐�',
-      sname: '鐩戞祴鐐�',
-      checked: true, // 榛樿閫変腑鐘舵��
-      url: 'http://www.baidu2.com',
-      minZoom: 10
-    },
-    {
-      code: 'wasteGasVocs',
-      name: 'VOCs',
-      sname: 'VOCs',
-      checked: true, // 榛樿閫変腑鐘舵��
-      url: '',
-      minZoom: 10
     },
     {
       code: 'wasteGasKrq',
@@ -46,6 +30,14 @@
       checked: true, // 榛樿閫変腑鐘舵��
       url: '',
       minZoom: 10
+    },
+    {
+      code: 'wasteGasVocs',
+      name: 'VOCs',
+      sname: 'VOCs',
+      checked: true, // 榛樿閫変腑鐘舵��
+      url: '',
+      minZoom: 10
     }
   ]
 }
diff --git a/src/conf/layers/LayerWasteSolid.js b/src/conf/layers/LayerWasteSolid.js
index 1610672..f75e58e 100644
--- a/src/conf/layers/LayerWasteSolid.js
+++ b/src/conf/layers/LayerWasteSolid.js
@@ -4,22 +4,14 @@
  */
 
 export const LayerWasteSolid = {
-  code: 'solidWaste',
+  code: 'wasteSolid',
   name: '鍥哄簾',
   checked: true,
   layers: [
     {
-      code: 'solidWasteQy',
-      name: '浼佷笟',
-      sname: '浼佷笟', // 琛ㄥ悕
-      checked: true, // 榛樿閫変腑鐘舵��
-      url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
-      minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
-    },
-    {
-      code: 'solidWasteJcd',
-      name: '鐩戞祴鐐�',
-      sname: '鐩戞祴鐐�',
+      code: 'wasteSolidCcd',
+      name: '璐瓨鐐�',
+      sname: '璐瓨鐐�',
       checked: true, // 榛樿閫変腑鐘舵��
       url: 'http://www.baidu2.com',
       minZoom: 10
diff --git a/src/conf/layers/LayerWasteWater.js b/src/conf/layers/LayerWasteWater.js
index c7d6a65..13ffea0 100644
--- a/src/conf/layers/LayerWasteWater.js
+++ b/src/conf/layers/LayerWasteWater.js
@@ -8,30 +8,28 @@
   checked: true,
   layers: [
     {
-      code: 'wasteWaterqy',
-      name: '浼佷笟',
-      sname: '浼佷笟', // 琛ㄥ悕
+      code: 'wasteWaterPfk',
+      name: '鎺掓斁鍙�',
+      sname: '鎺掓斁鍙�', // 琛ㄥ悕
       checked: true, // 榛樿閫変腑鐘舵��
       url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
       minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
     },
     {
       code: 'wasteWaterJcd',
-      name: '鐩戞祴鐐�',
-      sname: '鐩戞祴鐐�',
+      name: '娴侀噺',
+      sname: '娴侀噺',
       checked: true, // 榛樿閫変腑鐘舵��
       url: 'http://www.baidu2.com',
-      minZoom: 10,
-      childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
+      minZoom: 10
     },
     {
       code: 'wasteWaterfk',
-      name: '鎺掓斁鍙�',
-      sname: '鎺掓斁鍙�',
+      name: '娑蹭綅',
+      sname: '娑蹭綅',
       checked: true, // 榛樿閫変腑鐘舵��
       url: '',
-      minZoom: 10,
-      childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
+      minZoom: 10
     }
   ]
 }

--
Gitblit v1.8.0