From 200d3045c0c285c7916d58589e3b810979da7f16 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 14:57:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
public/assets/imgs/legend/marker_p_2.png | 0
src/conf/layers/LayerPipeLines.js | 2
public/assets/imgs/legend/cyj.png | 0
public/assets/imgs/legend/YanChen.png | 0
src/conf/layers/LayerArea.js | 9 -
public/assets/imgs/legend/SO2.png | 0
src/api/mapApi.js | 4
public/assets/imgs/legend/red_airquality.png | 0
public/assets/imgs/legend/gray.png | 0
public/assets/imgs/legend/image15.gif | 0
src/conf/layers/LayerBasin.js | 12 -
public/assets/imgs/legend/green_airquality.png | 0
public/assets/imgs/legend/zlj.png | 0
public/assets/imgs/legend/cqj.png | 0
public/assets/imgs/legend/gwtl4.png | 0
public/assets/imgs/legend/zsj.png | 0
src/conf/layers/LayerHbss.js | 2
public/assets/imgs/legend/grn.png | 0
public/assets/imgs/legend/yellow_airquality.png | 0
public/assets/imgs/legend/orange_airquality.png | 0
public/assets/imgs/legend/WenDu.png | 0
public/assets/imgs/legend/image12.gif | 0
public/assets/imgs/legend/gwtl3.png | 0
src/components/LayerController/logic/WasteGas.js | 12 ++
public/assets/imgs/legend/green_airquality_2.png | 0
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 6
src/conf/layers/LayerFsss.js | 14 ++
src/views/MapTemplate.vue | 2
src/components/LayerController/service/LayerFactory.js | 41 +++++++
src/api/mapUrl.js | 1
src/components/BaseNav/PublicBounced/PublicBounced.vue | 7 +
public/assets/imgs/legend/orange.png | 0
public/assets/imgs/legend/red.png | 0
src/conf/layers/LayerSewers.js | 5 +
public/assets/imgs/legend/image9.gif | 0
public/assets/imgs/legend/NOX.png | 0
public/assets/imgs/legend/green_airquality_3.png | 0
public/assets/imgs/legend/green.png | 0
public/assets/imgs/legend/gwtl.png | 0
public/assets/imgs/legend/gwtl2.png | 0
public/assets/imgs/legend/marker_p_1.png | 0
public/assets/imgs/legend/zongdan.png | 0
public/assets/imgs/legend/blue.png | 0
public/assets/imgs/legend/VOCs.png | 0
public/assets/imgs/legend/purple.png | 0
public/assets/imgs/legend/yellow.png | 0
src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue | 140 ++++++++++++++++++++++++++++
47 files changed, 229 insertions(+), 28 deletions(-)
diff --git a/public/assets/imgs/legend/NOX.png b/public/assets/imgs/legend/NOX.png
new file mode 100644
index 0000000..98b699e
--- /dev/null
+++ b/public/assets/imgs/legend/NOX.png
Binary files differ
diff --git a/public/assets/imgs/legend/SO2.png b/public/assets/imgs/legend/SO2.png
new file mode 100644
index 0000000..0e2887e
--- /dev/null
+++ b/public/assets/imgs/legend/SO2.png
Binary files differ
diff --git a/public/assets/imgs/legend/VOCs.png b/public/assets/imgs/legend/VOCs.png
new file mode 100644
index 0000000..21cfbf8
--- /dev/null
+++ b/public/assets/imgs/legend/VOCs.png
Binary files differ
diff --git a/public/assets/imgs/legend/WenDu.png b/public/assets/imgs/legend/WenDu.png
new file mode 100644
index 0000000..74401e7
--- /dev/null
+++ b/public/assets/imgs/legend/WenDu.png
Binary files differ
diff --git a/public/assets/imgs/legend/YanChen.png b/public/assets/imgs/legend/YanChen.png
new file mode 100644
index 0000000..d7d2517
--- /dev/null
+++ b/public/assets/imgs/legend/YanChen.png
Binary files differ
diff --git a/public/assets/imgs/legend/blue.png b/public/assets/imgs/legend/blue.png
new file mode 100644
index 0000000..8943f6a
--- /dev/null
+++ b/public/assets/imgs/legend/blue.png
Binary files differ
diff --git a/public/assets/imgs/legend/cqj.png b/public/assets/imgs/legend/cqj.png
new file mode 100644
index 0000000..cd4d1f6
--- /dev/null
+++ b/public/assets/imgs/legend/cqj.png
Binary files differ
diff --git a/public/assets/imgs/legend/cyj.png b/public/assets/imgs/legend/cyj.png
new file mode 100644
index 0000000..639f7da
--- /dev/null
+++ b/public/assets/imgs/legend/cyj.png
Binary files differ
diff --git a/public/assets/imgs/legend/gray.png b/public/assets/imgs/legend/gray.png
new file mode 100644
index 0000000..4915b70
--- /dev/null
+++ b/public/assets/imgs/legend/gray.png
Binary files differ
diff --git a/public/assets/imgs/legend/green.png b/public/assets/imgs/legend/green.png
new file mode 100644
index 0000000..80463ea
--- /dev/null
+++ b/public/assets/imgs/legend/green.png
Binary files differ
diff --git a/public/assets/imgs/legend/green_airquality.png b/public/assets/imgs/legend/green_airquality.png
new file mode 100644
index 0000000..67f1d1c
--- /dev/null
+++ b/public/assets/imgs/legend/green_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/green_airquality_2.png b/public/assets/imgs/legend/green_airquality_2.png
new file mode 100644
index 0000000..ca7b11b
--- /dev/null
+++ b/public/assets/imgs/legend/green_airquality_2.png
Binary files differ
diff --git a/public/assets/imgs/legend/green_airquality_3.png b/public/assets/imgs/legend/green_airquality_3.png
new file mode 100644
index 0000000..d5f6a73
--- /dev/null
+++ b/public/assets/imgs/legend/green_airquality_3.png
Binary files differ
diff --git a/public/assets/imgs/legend/grn.png b/public/assets/imgs/legend/grn.png
new file mode 100644
index 0000000..70b4321
--- /dev/null
+++ b/public/assets/imgs/legend/grn.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl.png b/public/assets/imgs/legend/gwtl.png
new file mode 100644
index 0000000..2c1460d
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl2.png b/public/assets/imgs/legend/gwtl2.png
new file mode 100644
index 0000000..87c2011
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl2.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl3.png b/public/assets/imgs/legend/gwtl3.png
new file mode 100644
index 0000000..1dcbce3
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl3.png
Binary files differ
diff --git a/public/assets/imgs/legend/gwtl4.png b/public/assets/imgs/legend/gwtl4.png
new file mode 100644
index 0000000..391f82c
--- /dev/null
+++ b/public/assets/imgs/legend/gwtl4.png
Binary files differ
diff --git a/public/assets/imgs/legend/image12.gif b/public/assets/imgs/legend/image12.gif
new file mode 100644
index 0000000..f9b38b2
--- /dev/null
+++ b/public/assets/imgs/legend/image12.gif
Binary files differ
diff --git a/public/assets/imgs/legend/image15.gif b/public/assets/imgs/legend/image15.gif
new file mode 100644
index 0000000..15b1353
--- /dev/null
+++ b/public/assets/imgs/legend/image15.gif
Binary files differ
diff --git a/public/assets/imgs/legend/image9.gif b/public/assets/imgs/legend/image9.gif
new file mode 100644
index 0000000..9bbd325
--- /dev/null
+++ b/public/assets/imgs/legend/image9.gif
Binary files differ
diff --git a/public/assets/imgs/legend/marker_p_1.png b/public/assets/imgs/legend/marker_p_1.png
new file mode 100644
index 0000000..fc4a504
--- /dev/null
+++ b/public/assets/imgs/legend/marker_p_1.png
Binary files differ
diff --git a/public/assets/imgs/legend/marker_p_2.png b/public/assets/imgs/legend/marker_p_2.png
new file mode 100644
index 0000000..ee33170
--- /dev/null
+++ b/public/assets/imgs/legend/marker_p_2.png
Binary files differ
diff --git a/public/assets/imgs/legend/orange.png b/public/assets/imgs/legend/orange.png
new file mode 100644
index 0000000..cf3ceaf
--- /dev/null
+++ b/public/assets/imgs/legend/orange.png
Binary files differ
diff --git a/public/assets/imgs/legend/orange_airquality.png b/public/assets/imgs/legend/orange_airquality.png
new file mode 100644
index 0000000..c36469a
--- /dev/null
+++ b/public/assets/imgs/legend/orange_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/purple.png b/public/assets/imgs/legend/purple.png
new file mode 100644
index 0000000..b206049
--- /dev/null
+++ b/public/assets/imgs/legend/purple.png
Binary files differ
diff --git a/public/assets/imgs/legend/red.png b/public/assets/imgs/legend/red.png
new file mode 100644
index 0000000..9e29f57
--- /dev/null
+++ b/public/assets/imgs/legend/red.png
Binary files differ
diff --git a/public/assets/imgs/legend/red_airquality.png b/public/assets/imgs/legend/red_airquality.png
new file mode 100644
index 0000000..d43ca40
--- /dev/null
+++ b/public/assets/imgs/legend/red_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/yellow.png b/public/assets/imgs/legend/yellow.png
new file mode 100644
index 0000000..f1f339f
--- /dev/null
+++ b/public/assets/imgs/legend/yellow.png
Binary files differ
diff --git a/public/assets/imgs/legend/yellow_airquality.png b/public/assets/imgs/legend/yellow_airquality.png
new file mode 100644
index 0000000..567af17
--- /dev/null
+++ b/public/assets/imgs/legend/yellow_airquality.png
Binary files differ
diff --git a/public/assets/imgs/legend/zlj.png b/public/assets/imgs/legend/zlj.png
new file mode 100644
index 0000000..79a22ab
--- /dev/null
+++ b/public/assets/imgs/legend/zlj.png
Binary files differ
diff --git a/public/assets/imgs/legend/zongdan.png b/public/assets/imgs/legend/zongdan.png
new file mode 100644
index 0000000..55639d9
--- /dev/null
+++ b/public/assets/imgs/legend/zongdan.png
Binary files differ
diff --git a/public/assets/imgs/legend/zsj.png b/public/assets/imgs/legend/zsj.png
new file mode 100644
index 0000000..f7d6414
--- /dev/null
+++ b/public/assets/imgs/legend/zsj.png
Binary files differ
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 51e2068..19a8423 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -40,6 +40,10 @@
getWasteGasMonData (data) {
return axios.get(mapUrl.getWasteGasMonData, data)
},
+ // 搴熸皵浜哄伐鏁版嵁
+ getWasteGasManualData (data) {
+ return axios.get(mapUrl.getWasteGasManualData, data)
+ },
// 搴熸按鐐�
getWasteWater (data) {
return axios.get(mapUrl.getWasteWater, data)
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index ef1af63..fceb5ae 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -14,6 +14,7 @@
export const getWasteGasDetails = $HOST + '/wasteGas/getWasteGasMonitoringDetails'
export const DataItems = $HOST + '/wasteWater/RTDB/DataItems'
export const getWasteGasMonData = $HOST + '/wasteGas/QueryOnlineMonData'
+export const getWasteGasManualData = $HOST + '/wasteGas/QueryLabMonData'
export const getWasteWater = $HOST + '/wasteWater/getWasteWater' // 搴熸按鐐逛俊鎭�
export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 搴熸按鐩戞祴鏁版嵁
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
new file mode 100644
index 0000000..ca95a55
--- /dev/null
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
@@ -0,0 +1,140 @@
+<template>
+<!-- <el-table :data="tableData" style="width:730px" height="200px">-->
+<!-- <el-table-column v-for="(item, index) in tableLabel" :key="index" :prop="item.prop"-->
+<!-- :label="item.label">-->
+<!-- <el-table-column v-for="(item1, index1) in item.label" :key="index1" :prop="item1.prop" :label="item1.label">-->
+<!-- </el-table-column>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+ <el-table
+ :data="tableData"
+ style="width: 100%;height: 100%">
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="妫�娴嬫椂闂�">
+ </el-table-column>
+ <el-table-column
+ label="姘哀鍖栫墿">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="浜屾哀鍖栫～">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="鐑熷皹">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="榛戝害">
+ <el-table-column
+ prop="tableData.MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="tableData.LabMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+</template>
+
+<script>
+export default {
+ name: 'EChartsTable',
+ data () {
+ return {
+ // tableLabel: [
+ // {
+ // label: '妫�娴嬫椂闂�',
+ // prop: 'StoragePlaceId'
+ // },
+ // {
+ // label: '浜屾哀鍖栫～',
+ // prop: [
+ // {
+ // label: '鐩戞祴鍊�',
+ // NOMonitor: ''
+ // },
+ // {
+ // label: '鏍囧噯鍊�',
+ // NOtandard: ''
+ // }]
+ // },
+ // {
+ // label: '姘哀鍖栫墿',
+ // prop: [
+ // {
+ // label: '鐩戞祴鍊�',
+ // NOMonitor: ''
+ // },
+ // {
+ // label: '鏍囧噯鍊�',
+ // NOtandard: ''
+ // }]
+ // },
+ // {
+ // label: '鐑熷皹',
+ // prop: [
+ // {
+ // label: '鐩戞祴鍊�',
+ // NOMonitor: ''
+ // },
+ // {
+ // label: '鏍囧噯鍊�',
+ // NOtandard: ''
+ // }]
+ // },
+ // {
+ // label: '榛戝害',
+ // prop: [
+ // {
+ // label: '鐩戞祴鍊�',
+ // NOMonitor: ''
+ // },
+ // {
+ // label: '鏍囧噯鍊�',
+ // NOtandard: ''
+ // }]
+ // }
+ // ],
+ tableData: []
+ }
+ },
+ created () {
+ this.$nextTick(() => {
+ this.$attrs.ManualData.forEach(item => {
+ this.tableData = [...item]
+ })
+ this.tableData.LabMonTime = 100
+ console.log(this.tableData)
+ })
+ }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 6d3126f..584f1db 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -8,7 +8,7 @@
<li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
<li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>
+ <li @click='tabTaggle("EChartsTable")'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -28,6 +28,7 @@
import ECharts from './Echarts'
// import EChartsDate from './EChartsDate'
import EChartsHourWasteWater from './EChartsHourWasteWater'
+import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
export default {
name: 'PublicChart',
@@ -36,7 +37,8 @@
EChartsDate,
ECharts,
// EChartsDate
- EChartsHourWasteWater
+ EChartsHourWasteWater,
+ EChartsTable
},
data () {
return {
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4be0cc0..8ecaaa4 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -15,6 +15,7 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
ref="PublicChart"
>
</public-chart>
@@ -54,7 +55,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
// getGasQueryOnlineMonData: []
}
},
@@ -79,10 +81,11 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, GasHourData, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
+ this.ManualData = ManualData
console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bdc5e30..9b85faf 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -68,13 +68,21 @@
endTime: '2020-04-07 15:13:20',
dataType: '1'
}
+ const GasManualData = {
+ companyId: '3900100145',
+ labMonPointId: '219',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: ' 2020-04-07 15:13:20'
+ }
+ const ManualData = await mapApi.getWasteGasManualData(GasManualData)
+ console.log(ManualData)
const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
- console.log(Mondata)
+ // console.log(Mondata)
const result = await mapApi.getWasteGasDetails(dataValue)
// console.log(result.Result.DataInfo)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, 'feiqi')
+ instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index b617ae5..fef724f 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -21,6 +21,43 @@
var checked = config.checked
checked && this.load(config)
+ checked && this.toggleZoomByConfnig(config)
+ }
+ }
+ }
+
+ /**
+ * 鎺у埗鏄剧ず鐨勭骇鍒�
+ * @param layerConfig
+ */
+ initEvent (layerConfig) {
+ this.map.on('zoomend ', (e) => this.toggleZoomByLayer(layerConfig))
+ }
+
+ toggleZoomByLayer (layerConfig) {
+ var config = layerConfig
+ if (Array.isArray(layerConfig)) {
+ for (var i = 0, l = layerConfig.length; i < l; i++) {
+ config = layerConfig[i]
+ var layers = config.layers
+ var childLayer = config.childLayer
+ layers && this.toggleZoomByLayer(layers)
+ childLayer && this.toggleZoomByLayer(childLayer)
+ this.toggleZoomByConfnig(config)
+ }
+ } else {
+ this.toggleZoomByConfnig(layerConfig)
+ }
+ }
+
+ toggleZoomByConfnig (config) {
+ const zoom = this.map.getZoom()
+ var checked = config.checked
+ if (checked && config.minZoom) {
+ if (zoom > config.minZoom) {
+ this.show(config)
+ } else {
+ this.hide(config)
}
}
}
@@ -91,9 +128,9 @@
this.setZIndex(layer.getLayers())
} else {
if (layer.feature && (layer.feature.geometry.type === 'LineString' || layer.feature.geometry.type === 'MultiLineString')) {
- layer.bringToBack()
+ layer.bringToBack && layer.bringToBack()
} else {
- layer.bringToFront()
+ layer.bringToFront && layer.bringToFront()
}
}
}
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index c57b612..6ba6c53 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -13,24 +13,21 @@
name: '鍏徃',
sname: '鍏徃', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
- url: WFS_URL + '?TYPENAME=鍏徃',
- minZoom: 10
+ url: WFS_URL + '?TYPENAME=鍏徃'
},
{
code: 'sewersAreaMt',
name: '鐮佸ご',
sname: '鐮佸ご',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鐮佸ご',
- minZoom: 10
+ wfs: WFS_URL + '?TYPENAME=鐮佸ご'
},
{
code: 'sewersAreaZz',
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
- minZoom: 10
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
}
]
}
diff --git a/src/conf/layers/LayerBasin.js b/src/conf/layers/LayerBasin.js
index af3dae6..6e8a0cc 100644
--- a/src/conf/layers/LayerBasin.js
+++ b/src/conf/layers/LayerBasin.js
@@ -14,32 +14,28 @@
name: '闀挎睙娴佸煙',
sname: '闀挎睙娴佸煙', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
- url: WFS_URL + '?TYPENAME=鍏徃',
- minZoom: 10
+ url: WFS_URL + '?TYPENAME=鍏徃'
},
{
code: 'basinHh',
name: '榛勬渤娴佸煙',
sname: '榛勬渤娴佸煙',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鐮佸ご',
- minZoom: 10
+ wfs: WFS_URL + '?TYPENAME=鐮佸ご'
},
{
code: 'basinBh',
name: '娓ゆ捣娴佸煙',
sname: '娓ゆ捣娴佸煙',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
- minZoom: 10
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
},
{
code: 'basinQt',
name: '鍏朵粬',
sname: '鍏朵粬',
checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
- minZoom: 10
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
}
]
}
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 3fa1498..03212d8 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -2,18 +2,26 @@
* 鍖哄煙
*/
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
export const LayerFsss = {
code: 'sewersFsss',
name: '闄勫睘璁炬柦',
checked: false, // 榛樿閫変腑鐘舵��
layers: [
{
+ code: 'pipeSection',
+ name: '绠℃',
+ sname: '绠℃',
+ checked: false,
+ minZoom: 15,
+ wfs: WFS_URL + '?TYPENAME=绠℃'
+ },
+ {
code: 'fourlink',
name: '鍥涢��',
sname: '鍥涢��',
checked: true,
- minZoom: 10,
+ minZoom: 15,
wfs: WFS_URL + '?TYPENAME=鍥涢��',
icon: 'sewers/鍥涢��.png'
},
@@ -22,7 +30,7 @@
name: '涓夐��',
sname: '涓夐��',
checked: false,
- minZoom: 10,
+ minZoom: 15,
wfs: WFS_URL + '?TYPENAME=涓夐��',
icon: 'sewers/涓夐��.png'
},
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index bacacc0..769f155 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -2,7 +2,7 @@
* 鍖哄煙
*/
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
export const LayerHbss = {
code: 'sewersHbss',
name: '鐜繚璁炬柦',
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 5ea2a19..524a533 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -5,7 +5,7 @@
import { LayerFsss } from './LayerFsss'
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
export const LayerPipeLines = {
code: 'sewersPipeLines',
diff --git a/src/conf/layers/LayerSewers.js b/src/conf/layers/LayerSewers.js
index 39e71a5..c382c2d 100644
--- a/src/conf/layers/LayerSewers.js
+++ b/src/conf/layers/LayerSewers.js
@@ -1,3 +1,8 @@
+/**
+ * todo 鍑嗗鍒犻櫎姝ゆ枃浠讹紒锛侊紒锛�
+ * @type {string}
+ */
+
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
export const LayerSewersPoint = [
{
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2c80ca3..1bbf9e8 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -91,7 +91,7 @@
map: this.map
})
layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
- layerFactory.init(this.$store.state.map.serviceLayers.layerSewersPoint)
+ layerFactory.initEvent(this.$store.state.map.serviceLayers.LayerSewersLine)
window.layerFactory = layerFactory
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
--
Gitblit v1.8.0