From e0eb378045eb18117fcf0a1eac6dad57ce6f743b Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 16:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
public/assets/images/map/wastewater/fs_yellow.png | 0
src/conf/layers/LayerWasteWater.js | 8
public/assets/images/map/wastewater/fs_green.png | 0
src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 59 +-------
src/conf/layers/LayerArea.js | 8
src/conf/layers/LayerPk.js | 6
src/api/mapApi.js | 3
src/components/LayerController/service/LayerFactory.js | 75 ++++++----
src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue | 10
src/api/mapUrl.js | 3
src/components/BaseNav/PublicBounced/PublicBounced.vue | 11 +
src/components/LayerController/modules/LcServiceLayer.vue | 7
src/conf/layers/LayerHbss.js | 69 ++++-----
src/conf/Constants.js | 4
src/conf/MapConfig.js | 4
src/components/LayerController/logic/WasteWater.js | 63 +++++++++
src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue | 64 +++++++++
17 files changed, 246 insertions(+), 148 deletions(-)
diff --git a/public/assets/images/map/wastewater/fs_green.png b/public/assets/images/map/wastewater/fs_green.png
new file mode 100644
index 0000000..e75d458
--- /dev/null
+++ b/public/assets/images/map/wastewater/fs_green.png
Binary files differ
diff --git a/public/assets/images/map/wastewater/fs_yellow.png b/public/assets/images/map/wastewater/fs_yellow.png
new file mode 100644
index 0000000..8d84aa8
--- /dev/null
+++ b/public/assets/images/map/wastewater/fs_yellow.png
Binary files differ
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index ef9ea26..cebf2b3 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -15,6 +15,9 @@
getSolidWaste (data) {
return axios.get(mapUrl.getSolidWaste, data)
},
+ getWasteWater (data) {
+ return axios.get(mapUrl.getWasteWater, data)
+ },
getSolidWasteBaseInfo (data) {
return axios.get(mapUrl.getSolidWasteBaseInfo, data)
},
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index e45c1d5..1b986df 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -8,6 +8,9 @@
export const GetWasteGas = $HOST + '/wasteGas/getWasteGas'
export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
+
+export const getWasteWater = $HOST + '/wasteWater/getWasteWater'
+
export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
export const getCompany = $HOST + '/company/getCompany'
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
new file mode 100644
index 0000000..697d24d
--- /dev/null
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
@@ -0,0 +1,64 @@
+<template>
+ <!-- 妗� -->
+ <div class="win">
+ <div class="main">
+ <div class="main-matter">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="12">姘哀鍖栫墿:{{ displayContent.Name }} 鏍囧噯: 100</el-col>
+ <el-col :span="12">浜屾哀鍖栫～:{{ displayContent.DeptSname }} 鏍囧噯: 50</el-col>
+ <el-col :span="12">鐑熷皹:{{ displayContent.EmissTypeName }} 鏍囧噯: 30</el-col>
+ <el-col :span="12">搴熸皵娴侀噺:{{ displayContent.EmissTypeName }}</el-col>
+ </el-row>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'EchartsTab',
+ props: ['displayContent'],
+ data () {
+ return {}
+ }
+}
+</script>
+
+<style scoped lang="less">
+
+.win {
+ position: relative;
+ margin-bottom: 13px;
+ background-color: rgba(33, 41, 69,0.9);
+}
+.main {
+ width: 100%;
+ height: 100%;
+ .main-matter{
+ font-size: 13px;
+ font-weight: normal;
+ border: 1px solid #396d83;
+ .row-item-one{
+ margin-bottom: 7px;
+ }
+ .el-row {
+ width: 100%;
+ color: #00d0f9;
+ display: flex;
+ font-size: 12px !important;
+ .el-col{
+ flex: 1;
+ width: 100%;
+ background-color: #243a55;;
+ text-align: center;
+ line-height: 28px;
+ margin-left: 6px;
+ border-radius: 4px;
+ &:nth-child(1){
+ margin-left:0;
+ }
+ }
+ }
+ }
+}
+</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
index 675b787..bd1e845 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
@@ -1,19 +1,7 @@
<template>
- <!-- 妗� -->
- <div class="win">
- <!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div id="echarts" ref="main"></div>
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
</div>
- </div>
</template>
<script>
@@ -44,8 +32,9 @@
},
grid: {
left: '3%',
- right: '3%',
+ right: '1%',
bottom: '3%',
+ top: '10%',
containLabel: true
},
toolbox: {
@@ -161,48 +150,14 @@
</script>
<style scoped lang="less">
- .win {
- /*width: 100%;*/
- /*height: 100%;*/
- position: relative;
- //display: inline-block;
- background-color: rgba(33, 41, 69,0.9);
+ .main{
+ background: rgba(255, 255, 255, 0.1);
}
#echarts{
width: 600px;
height: 260px;
- }
- .border_corner{
- z-index: 2500;
- position: absolute;
- width: 14px;
- height: 14px;
- background: rgba(0,0,0,0);
- border: 2px solid #47d5ea;
- }
- .border_corner_left_top{
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
- }
- .border_corner_right_top{
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
- }
- .border_corner_left_bottom{
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
- border-bottom-left-radius: 4px;
- }
- .border_corner_right_bottom{
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
+ position: relative;
+ margin: 0;
+ padding: 0;
}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
index ff75f41..cb65c0c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -1,11 +1,13 @@
<template>
<div>
<el-tabs v-model="activeName">
- <el-tab-pane label="瀹炴椂鏁版嵁" name="first">鐢ㄦ埛绠＄悊</el-tab-pane>
- <el-tab-pane label="鏃ユ暟鎹�" name="second">閰嶇疆绠＄悊</el-tab-pane>
- <el-tab-pane label="鏈堟暟鎹�" name="third">瑙掕壊绠＄悊</el-tab-pane>
- <el-tab-pane label="浜哄伐鏁版嵁" name="fourth">瀹氭椂浠诲姟琛ュ伩</el-tab-pane>
+ <el-tab-pane label="瀹炶瘯鏁版嵁" name="first">瀹炶瘯鏁版嵁</el-tab-pane>
+ <el-tab-pane label="鏃ユ暟鎹�" name="second">鏃ユ暟鎹�</el-tab-pane>
+ <el-tab-pane label="鏈堟暟鎹�" name="third">鏈堟暟鎹�</el-tab-pane>
+ <el-tab-pane label="浜哄伐鏁版嵁" name="fourth">浜哄伐鏁版嵁</el-tab-pane>
</el-tabs>
+<!-- <EchartsTab></EchartsTab>-->
+<!-- <GasECharts></GasECharts>>-->
</div>
</template>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 1a63928..8d54ed9 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -7,8 +7,9 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
- <GasECharts v-else></GasECharts>
+<!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
+ <GasECharts></GasECharts>
+<!-- <GasTabs></GasTabs>-->
<!-- <PublicTable></PublicTable>-->
<!-- <GasECharts></GasECharts>-->
</div>
@@ -23,15 +24,17 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
-import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+// import GasTabs from './GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
+ // GasTabs,
GasTab,
- PublicTable,
+ // PublicTable,
GasECharts,
GasVideo
},
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
new file mode 100644
index 0000000..a5ca19f
--- /dev/null
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -0,0 +1,63 @@
+/**
+ * 搴熸按
+ */
+const AnimalService = require('../service/AnimalService').default
+const mapApi = require('../../../api/mapApi').default
+
+const testValue1 = '/assets/images/map/wastewater/fs_green.png'
+const testValue2 = '/assets/images/map/wastewater/fs_yellow.png'
+
+module.exports = function () {
+ /**
+ * 杩斿洖marker瀵硅薄鏁扮粍
+ * @param L leaflet瀵硅薄
+ */
+ this.init = async (layer, L) => {
+ this.animalService = new AnimalService({
+ L: L,
+ layer: layer
+ })
+ const res = await mapApi.getWasteWater()
+ console.log(res)
+ const data = res.Result.DataInfo
+ console.log(data)
+ for (let i = 0; i < data.length; i++) {
+ // 缁忕含搴� 浣嶇疆
+ const positionX = data[i].Latitude
+ const positionY = data[i].Longitude
+
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
+ const testValue = data[i].ContrLevel
+ const iconUrl = this.differentTypes(testValue)
+ const marker = L.marker.magic([positionX, positionY], {
+ icon: L.icon({
+ iconUrl: iconUrl,
+ iconSize: [50, 50],
+ iconAnchor: [25, 25]
+ })
+ })
+ layer.addLayer(marker)
+ }
+ }
+
+ this.bindTooltip = (layer) => {
+ return '娴嬭瘯搴熸按'
+ }
+
+ this.clickListener = (e) => {
+ // console.log(e)
+ this.animalService.pulseEffect(e.latlng)
+ return this.PublicBounced.$el
+ }
+
+ // 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
+ this.differentTypes = (testValue) => {
+ let testChange
+ if (testValue === 1) {
+ testChange = testValue1
+ } else {
+ testChange = testValue2
+ }
+ return testChange
+ }
+}
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 87ea4a7..01bfe83 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -6,8 +6,7 @@
<div class="wms-panel">
<div v-for="item in serviceLayers" :key="item.code" class="layerbox">
<div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
- @change="swAllLayers(item)"/>{{ item.name }} <span @click="swFilter(item)" v-if="item.childLayer"
- class="btn-filter">杩囨护</span>
+ @change="swAllLayers(item)"/>{{ item.name }}
</div>
<div class="layerbox-item">
<div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"
@@ -66,9 +65,9 @@
swWmsLayer (itm) {
itm.checked = !itm.checked
if (itm.checked) {
- window.layerFactory.show(itm.code)
+ window.layerFactory.show(itm)
} else {
- window.layerFactory.hide(itm.code)
+ window.layerFactory.hide(itm)
}
// this.updateWms()
},
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index e7a585c..484d6e2 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -18,44 +18,55 @@
var layers = config.layers
for (var j = 0; j < layers.length; j++) {
var childConfig = layers[j]
- var code = childConfig.code
- var wfs = childConfig.wfs
- var wms = childConfig.wms
- var url = childConfig.url
- // 鍒ゆ柇鏄惁宸茬粡鍔犺浇杩囷紝鍔犺浇杩囧氨 鐩存帴寰楀埌瀵硅薄璋冪敤 鏄剧ず鍑芥暟
- var layer = this.layers[code]
- if (!layer) {
- layer = this.L.featureGroup({}).addTo(this.map)
- // 2. 鍒ゆ柇绫诲瀷
- if (wfs) {
- // 3. 瀹炰緥鍖栧叿浣搒ervice
- var wfsLayerService = new WfsLayerService(childConfig)
- wfsLayerService.init(layer)
- }
- if (wms) {
- var wmsLayerService = new WmsLayerService(childConfig)
- wmsLayerService.init(layer)
- }
- // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
- if (url) {
- var busiLayerService = new BusiLayerService(childConfig)
- busiLayerService.init(layer)
- }
- layer ? (this.layers[code] = layer) : console.log('LayerFactory锛歯ewLayer is null锛宲lease check !!!')
- } else {
- this.show(code)
- }
+ var checked = childConfig.checked
+ checked && this.load(childConfig)
}
}
}
- show (code) {
- var _layer = this.layers[code].addTo(this.map)
- this.setZIndex(_layer)
+ load (config) {
+ var code = config.code
+ var wfs = config.wfs
+ var wms = config.wms
+ var url = config.url
+ // 鍒ゆ柇鏄惁宸茬粡鍔犺浇杩囷紝鍔犺浇杩囧氨 鐩存帴寰楀埌瀵硅薄璋冪敤 鏄剧ず鍑芥暟
+ var layer = this.layers[code]
+ if (!layer) {
+ layer = this.L.featureGroup({}).addTo(this.map)
+ // 2. 鍒ゆ柇绫诲瀷
+ if (wfs) {
+ // 3. 瀹炰緥鍖栧叿浣搒ervice
+ var wfsLayerService = new WfsLayerService(config)
+ wfsLayerService.init(layer)
+ this.setZIndex(layer)
+ }
+ if (wms) {
+ var wmsLayerService = new WmsLayerService(config)
+ wmsLayerService.init(layer)
+ }
+ // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
+ if (url) {
+ var busiLayerService = new BusiLayerService(config)
+ busiLayerService.init(layer)
+ }
+ layer ? (this.layers[code] = layer) : console.log('LayerFactory锛歯ewLayer is null锛宲lease check !!!')
+ } else {
+ this.show(code)
+ }
}
- hide (code) {
- var layer = this.layers[code]
+ show (config) {
+ var layer = this.layers[config.code]
+ if (layer) {
+ layer.addTo(this.map)
+ this.setZIndex(layer)
+ } else {
+ this.load(config)
+ }
+ }
+
+ hide (config) {
+ var layer = this.layers[config.code]
layer && this.map.removeLayer(layer)
}
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 1a14004..ef780e6 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -5,10 +5,8 @@
}
export const logicMapper = {
- // fsqy: 'Sample.js',
- fspfk: 'Sample.js',
- fsjcd: 'Sample.js',
wasteGasJcd: 'WasteGas.js',
+ wasteWaterJcd: 'WasteWater.js',
solidWasteJcd: 'SolidWaste.js',
fsqy: 'Company.js'
}
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index ea8b7fb..ef799e2 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -7,6 +7,8 @@
import { LayerPipeLine } from './layers/LayerPipeLine'
import { LayerArea } from './layers/LayerArea'
import { LayerPk } from './layers/LayerPk'
+import { LayerFsss } from './layers/LayerFsss'
+import { LayerHbss } from './layers/LayerHbss'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -46,7 +48,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerPipeLine, LayerArea, LayerPk, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
+ LayerSewersLine: [LayerPipeLine, LayerFsss, LayerHbss, LayerArea, LayerPk, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
layerSewersPoint: LayerSewersPoint
} // 姹￠洦姘村浘灞傞厤缃�
}
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index b4dd2b9..f3b9da5 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,6 +1,8 @@
/**
* 鍖哄煙
*/
+const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
+const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerArea = {
code: 'sewersArea',
name: '鍖哄煙淇℃伅',
@@ -11,7 +13,7 @@
name: '鍏徃',
sname: '鍏徃', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
- url: '?TYPENAME=绠＄綉',
+ wfs: WFS_URL + '?TYPENAME=鍏徃',
minZoom: 10, // 鍦ㄦ寚瀹氱骇鍒樉绀�
childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
},
@@ -20,7 +22,7 @@
name: '鐮佸ご',
sname: '鐮佸ご',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: '?TYPENAME=鍚补姹℃按',
+ wfs: WFS_URL + '?TYPENAME=鐮佸ご',
minZoom: 10,
childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
},
@@ -29,7 +31,7 @@
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: '?TYPENAME=鍚洂姹℃按',
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
minZoom: 10
}
]
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index c77b633..d5193d2 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -3,77 +3,68 @@
*/
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
-export const LayerFsss = {
- code: 'sewersFsss',
+export const LayerHbss = {
+ code: 'sewersHbss',
name: '鐜繚璁炬柦',
checked: false, // 榛樿閫変腑鐘舵��
layers: [
{
- code: 'fourlink',
- name: '鍥涢��',
- sname: '鍥涢��',
+ code: 'yj',
+ name: '绐ㄤ簳',
+ sname: '绐ㄤ簳',
checked: true,
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=鍥涢��',
+ wfs: WFS_URL + '?TYPENAME=绐ㄤ簳',
icon: 'sewers/鍥涢��.png'
},
{
- code: 'tee',
- name: '涓夐��',
- sname: '涓夐��',
+ code: 'ybz',
+ name: '闆ㄧ瀛�',
+ sname: '闆ㄧ瀛�',
checked: false,
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=涓夐��',
+ wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
icon: 'sewers/涓夐��.png'
},
{
- code: 'piperack',
- name: '绠℃灦(澧�)',
- sname: 'PipeRack',
+ code: 'fht',
+ name: '闃茬伀鍫�',
+ sname: '闃茬伀鍫�',
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=绠℃灦',
+ wfs: WFS_URL + '?TYPENAME=闃茬伀鍫�',
checked: false
},
{
- code: 'pipegallery',
- name: '绠″粖(甯�)',
- sname: 'PipeGallery',
+ code: 'jsc',
+ name: '闆嗘按姹�',
+ sname: '闆嗘按姹�',
minZoom: 10,
- wfs: WFS_URL + '?TYPENAME=绠″粖',
+ wfs: WFS_URL + '?TYPENAME=闆嗘按姹�',
checked: false
},
{
- code: 'pipesegment',
- name: '娴佸悜',
- sname: 'ywslx',
- wfs: WFS_URL + '?TYPENAME=娴佸悜',
+ code: 'jlz',
+ name: '鎴祦闂�',
+ sname: '鎴祦闂�',
+ wfs: WFS_URL + '?TYPENAME=鎴祦闂�',
checked: false
},
{
- code: 'pipeline',
- name: '绠＄綉',
+ code: 'yly',
+ name: '婧㈡祦鍫�',
+ sname: '婧㈡祦鍫�',
minZoom: 10,
- sname: 'pipeline',
- wfs: WFS_URL + '?TYPENAME=绠＄綉',
+ wfs: WFS_URL + '?TYPENAME=婧㈡祦鍫�',
checked: false
},
{
- code: 'valve',
- name: '闃�闂�',
+ code: 'gyd',
+ name: '闅旀补姹�',
+ sname: '闅旀补姹�',
minZoom: 10,
- sname: 'valve',
checked: false,
- wfs: WFS_URL + '?TYPENAME=闃�闂�',
+ wfs: WFS_URL + '?TYPENAME=闅旀补姹�',
icon: 'sewers/闃�闂�.png'
- },
- {
- code: 'elbow',
- name: '寮ご',
- sname: 'Elbow',
- minZoom: 10,
- checked: false,
- wfs: WFS_URL + '?TYPENAME=寮ご',
- icon: 'sewers/寮ご.png'
}
]
}
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index ab13cdf..62bbee9 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,6 +1,8 @@
/**
* 鎺掑彛
*/
+const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
+const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
export const LayerPk = {
code: 'sewersPk',
name: '鎺掑彛',
@@ -11,7 +13,7 @@
name: '鍐呮帓鍙�',
sname: '鍐呮帓鍙�',
checked: true,
- wfs: '?TYPENAME=绠＄綉',
+ wfs: WFS_URL + '?TYPENAME=鍐呮帓鍙�',
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
{
@@ -19,7 +21,7 @@
name: '澶栨帓鍙�',
sname: '澶栨帓鍙�',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: '?TYPENAME=浜嬫晠姘�',
+ wfs: WFS_URL + '?TYPENAME=澶栨帓鍙�',
minZoom: 10
}
]
diff --git a/src/conf/layers/LayerWasteWater.js b/src/conf/layers/LayerWasteWater.js
index 3f1ff32..c7d6a65 100644
--- a/src/conf/layers/LayerWasteWater.js
+++ b/src/conf/layers/LayerWasteWater.js
@@ -3,12 +3,12 @@
* @type {string}
*/
export const LayerWasteWater = {
- code: 'pipeline',
+ code: 'wasteWater',
name: '搴熸按',
checked: true,
layers: [
{
- code: 'fsqy',
+ code: 'wasteWaterqy',
name: '浼佷笟',
sname: '浼佷笟', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
@@ -16,7 +16,7 @@
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
{
- code: 'fsjcd',
+ code: 'wasteWaterJcd',
name: '鐩戞祴鐐�',
sname: '鐩戞祴鐐�',
checked: true, // 榛樿閫変腑鐘舵��
@@ -25,7 +25,7 @@
childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
},
{
- code: 'fspfk',
+ code: 'wasteWaterfk',
name: '鎺掓斁鍙�',
sname: '鎺掓斁鍙�',
checked: true, // 榛樿閫変腑鐘舵��
--
Gitblit v1.8.0