From 0ad898ff9d0f6718db2b3137665c81c46c50312d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 10:40:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 10
src/conf/layers/LayerPipeLines.js | 4
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 0
src/components/panel/topicSearch/pipeInformationSearch.vue | 3
src/components/panel/topicSearch/GasWasteSearch.vue | 16
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue | 10
src/conf/layers/LayerAirQuality.js | 4
src/components/LayerController/modules/LcServiceLayerFilter.vue | 3
src/conf/layers/LayerArea.js | 4
src/conf/layers/LayerPk.js | 4
src/components/BaseNav/PublicBounced/common/PublicTable.vue | 0
src/components/panel/topicSearch/DischargeSearch.vue | 3
src/conf/layers/LayerBasin.js | 4
src/components/panel/topicSearch/EnvRiskSearch.vue | 3
src/components/panel/topicSearch/pipeChangesSearch.vue | 3
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 35 +-
src/conf/layers/LayerHbss.js | 4
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 8
src/conf/Constants.js | 2
src/conf/layers/LayerEnvRisk.js | 4
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 0
src/components/helpers/WfsHelper.js | 2
src/components/BaseNav/PublicBounced/common/PublicTabs.vue | 0
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 0
src/conf/layers/LayerFsss.js | 4
src/components/BaseNav/PublicBounced/common/PublicVideo.vue | 0
src/components/LayerController/service/LayerFactory.js | 21 +
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8
/dev/null | 523 ----------------------------------------
src/conf/MapConfig.js | 3
src/conf/layers/LayerSoilGroundWater.js | 4
src/components/panel/topicSearch/SewersSearch.vue | 81 ++---
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue | 0
src/components/panel/topicSearch/SoilGroundWaterSearch.vue | 3
36 files changed, 123 insertions(+), 654 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index d635356..47b7762 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -31,10 +31,10 @@
<script>
import '@/utils/dragBoxes'
-import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
-import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import PublicChart from './GasComponents/PublicChart'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
export default {
name: 'PublicBounced',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
similarity index 99%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
rename to src/components/BaseNav/PublicBounced/common/PublicChart.vue
index e4d0a61..e0e94a3 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -46,9 +46,9 @@
EChartsDate,
ECharts,
EChartsTable,
+ EChartsRealWasteWater,
EChartsHourWasteWater,
EChartsDateWasteWater,
- EChartsRealWasteWater,
EChartsWasteWaterTable
},
mounted () {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
rename to src/components/BaseNav/PublicBounced/common/PublicTable.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
rename to src/components/BaseNav/PublicBounced/common/PublicTabs.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/common/PublicVideo.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
rename to src/components/BaseNav/PublicBounced/common/PublicVideo.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
similarity index 98%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index a17c565..4ead4bd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -38,7 +38,7 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
- <div style="width:5rem;height:2rem;" id="echarts" ref="main">
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -57,7 +57,8 @@
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -140,9 +141,14 @@
}
},
mounted () {
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss')
this.onSubmit()
// this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
},
+ updated () {
+ this.onSubmit()
+ },
methods: {
onSubmit () {
console.log('submit!')
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsDateWasteWater.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
similarity index 95%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index f8a7ec3..22a84ad 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -15,19 +15,14 @@
<div class="pickerData">
<span> 寮�濮嬫椂闂�:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeStart">
- </el-date-picker>
- </span>
+ <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
+ </span>
</div>
<div class="pickerData">
<span >缁撴潫鏃堕棿:</span>
<span class="pickerTable">
- <el-date-picker
- type="datetime"
- v-model="formInline.timeEnd"
- >
- </el-date-picker>
- </span>
+ <el-date-picker type="datetime" v-model="formInline.timeEnd" ></el-date-picker>
+ </span>
</div>
</div>
<!-- <div>-->
@@ -43,8 +38,7 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
- <div style="width:5rem;height:2rem;" id="echarts" ref="main">
- </div>
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="main"></div>
</div>
<!-- 鏄庣粏寮规 -->
<el-dialog :visible.sync="dialogVisible"
@@ -62,8 +56,8 @@
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
-
+import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+import dayjs from 'dayjs'
export default {
name: 'ECharts',
components: {
@@ -129,11 +123,11 @@
],
xdata: ['0鏃�', '1鏃�', '2鏃�', '3鏃�', '4鏃�', '5鏃�', '6鏃�', '7鏃�', '8鏃�', '9鏃�', '10鏃�', '11鏃�', '12鏃�', '13鏃�', '14鏃�', '15鏃�', '16鏃�'],
ydatas: [
- { name: '姘哀鍖栫墿', data: ['34.44', '36.91', '37.65', '37.16', '38.03', '38.23', '37.21', '37.67', '37.97', '37.58', '36.61', '37.76', '37.27', '37.24', '35.86', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 50 },
- { name: '浜屾哀鍖栫～', data: ['4.98', '4.57', '4.19', '3.14', '3.80', '3.62', '3.33', '2.80', '3.13', '2.54', '3.08', '2.48', '1.97', '1.76', '0.82', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 35 },
- { name: '搴熸皵娴侀噺', data: ['381907.22', '376474.19', '378572.31', '379369.44', '385225.72', '388657.56', '330667.31', '26560.98', '0.00', '0.00', '49567.43', '357837.31', '376972.66', '379693.50', '379982.22', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#9ACD32', bzz: null },
- { name: '鐑熷皹', data: ['4.02', '4.17', '4.31', '4.00', '4.45', '4.40', '4.40', '4.25', '4.26', '4.18', '4.58', '4.21', '3.96', '3.83', '3.78', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#f48183', bzz: 10 },
- { name: '娓╁害', data: ['46.55', '46.70', '46.47', '46.56', '46.57', '46.58', '46.56', '46.58', '46.69', '46.47', '46.58', '46.60', '46.54', '46.55', '46.60', 'NaN', 'NaN'], zdcbcolor: 'red', zxcolor: '#F206FF', bzz: null }
+ { name: '姘哀鍖栫墿', data: ['34.44', '36.91', '37.65', '37.16', '38.03', '38.23', '37.21', '37.67', '37.97', '37.58', '36.61', '37.76', '37.27', '37.24', '35.86', '36.61', '37.21'], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 50 },
+ { name: '浜屾哀鍖栫～', data: ['4.98', '4.57', '4.19', '3.14', '3.80', '3.62', '3.33', '2.80', '3.13', '2.54', '3.08', '2.48', '1.97', '1.76', '0.82', '1.01', '1.5'], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 35 },
+ { name: '搴熸皵娴侀噺', data: ['381907.22', '376474.19', '378572.31', '379369.44', '385225.72', '388657.56', '330667.31', '26560.98', '0.00', '0.00', '49567.43', '357837.31', '376972.66', '379693.50', '379982.22', '379693.50', '379982.22'], zdcbcolor: 'red', zxcolor: '#9ACD32', bzz: null },
+ { name: '鐑熷皹', data: ['4.02', '4.17', '4.31', '4.00', '4.45', '4.40', '4.40', '4.25', '4.26', '4.18', '4.58', '4.21', '3.96', '3.83', '3.78', '3.83', '3.78'], zdcbcolor: 'red', zxcolor: '#f48183', bzz: 10 },
+ { name: '娓╁害', data: ['46.55', '46.70', '46.47', '46.56', '46.57', '46.58', '46.56', '46.58', '46.69', '46.47', '46.58', '46.60', '46.54', '46.55', '46.60', '46.55', '46.60'], zdcbcolor: 'red', zxcolor: '#F206FF', bzz: null }
],
yname: ' 娴撳害(mg/m鲁)',
// id:'mychart',
@@ -147,9 +141,14 @@
// }
},
mounted () {
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
this.onSubmit()
// this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
},
+ updated () {
+ this.onSubmit()
+ },
methods: {
onSubmit () {
this.CreateChart()
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
similarity index 99%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index cf7c29f..7e48cb7 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -60,7 +60,7 @@
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
export default {
name: 'ECharts',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
similarity index 94%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
index ca95a55..90d24e1 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
@@ -119,15 +119,15 @@
// }]
// }
// ],
- tableData: []
+ tableData: ''
}
},
created () {
this.$nextTick(() => {
- this.$attrs.ManualData.forEach(item => {
- this.tableData = [...item]
- })
- this.tableData.LabMonTime = 100
+ // this.$attrs.ManualData.forEach(item => {
+ this.tableData = [...this.$attrs.ManualData]
+ // })
+ // this.tableData.LabMonTime = 100
console.log(this.tableData)
})
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsWasteWaterTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsWasteWaterTable.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
similarity index 98%
rename from src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 7873e75..7cf33e4 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -36,7 +36,9 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:2rem;" ref="echarts"></div>
+ <div style="width:5rem;height:1.5rem;" >
+ <div style="width:100%;height:100%;" ref="echarts"> </div>
+ </div>
</div>
</div>
</template>
@@ -205,8 +207,8 @@
}
},
mounted () {
- // const Day = new Date()
- // console.log(Day)
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
},
methods: {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 9f36a5e..6903552 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -20,15 +20,12 @@
</template>
<script>
-import { LayerSewersPoint } from '@src/conf/layers/LayerSewers'
-
export default {
name: 'LcServiceLayerFilter',
components: { },
data () {
return {
visible: {},
- layerSewersPoint: LayerSewersPoint,
layers: [],
filterConfig: [] // 闄勫睘瑕佺礌
}
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index fef724f..593b5fd 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -12,7 +12,7 @@
init (layerConfig) {
// 1. 閬嶅巻layer config
if (layerConfig) {
- for (var i = 0, l = layerConfig.length; i < l; i++) {
+ for (var i = 0; i < layerConfig.length; i++) {
var config = layerConfig[i]
var layers = config.layers
var childLayer = config.childLayer
@@ -112,6 +112,25 @@
}
+ flyByLayerId (layerId, bound) {
+ for (var k in this.layers) {
+ var layerGroup = this.layers[k]
+ var layers = layerGroup.getLayers()
+ if (layers) {
+ for (var m = 0; m < layers.length; m++) {
+ var layer = layers[m]
+ console.log(layer.toGeoJSON())
+ /* var feature = layer.feature
+ if (feature.id === layerId) {
+ this.map.flyToBounds(bound)
+ return layer
+ } */
+ }
+ }
+ }
+ return null
+ }
+
/**
* todo 杩欓噷鏃犳晥锛岃矊浼兼槸鍥犱负geojson鍔犺浇鍒板湴鍥句篃鏄釜layergroup
*
diff --git a/src/components/helpers/WfsHelper.js b/src/components/helpers/WfsHelper.js
index 9cac21f..b9cd594 100644
--- a/src/components/helpers/WfsHelper.js
+++ b/src/components/helpers/WfsHelper.js
@@ -5,7 +5,7 @@
function WfsHelper () {
this.filters = []
this.typeNames = []
- this.url = MapConfig.BLUEMAP_HOST + '/server/ogcserver/PipeLine/wfs'
+ this.url = MapConfig.PIPELINE_WFS
this.params = {
REQUEST: 'getfeature',
OUTPUTFORMAT: 'JSON',
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index 294a471..e71a71c 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -117,8 +117,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -127,7 +125,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index 8c214dc..5a3aaac 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -77,8 +77,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -87,7 +85,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 80c2f12..b390331 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,17 +97,15 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
+import mapApi from '@/api/mapApi'
-import WfsHelper from '@components/helpers/WfsHelper'
-import AjaxUtils from '@utils/AjaxUtils'
+// import WfsHelper from '@components/helpers/WfsHelper'
export default {
name: 'GasWasteSearch',
data () {
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
@@ -160,11 +158,13 @@
dataType: this.form.dataType
}
console.log(param)
- var wfsHelper = new WfsHelper()
- wfsHelper.addTypeName(this.form.query.layerName)
- wfsHelper.addLike(this.form.query.key, this.form.keyword)
+ // var wfsHelper = new WfsHelper()
+ // wfsHelper.addTypeName(this.form.query.layerName)
+ // wfsHelper.addLike(this.form.query.key, this.form.keyword)
// const _this = this
- const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ // const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ const res = await mapApi.getWasteGas()
+ console.log(res)
if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
this.list = res.data.features
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index b659cfa..8d0b517 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -6,24 +6,22 @@
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
- :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType" :popper-class="'select-down'">
<el-option
- v-for="item in pipelineTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="form.pipelineType+'锛�'" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType"
- :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
<el-option
- v-for="item in dataTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -71,7 +69,11 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
+import { LayerPipeLines } from '@src/conf/layers/LayerPipeLines'
+import { LayerFsss } from '@src/conf/layers/LayerFsss'
+import { LayerHbss } from '@src/conf/layers/LayerHbss'
+import { LayerPk } from '@src/conf/layers/LayerPk'
+import { LayerArea } from '@src/conf/layers/LayerArea'
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
@@ -91,18 +93,13 @@
activeName: 'first',
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
+ items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
+ subItems: LayerPipeLines.layers,
total: 0,
- pipelineTypeOptions: PipelineTypeOptions,
- dataTypeOptions: PipelineTypeOptions[0].options,
form: {
- pipelineType: PipelineTypeOptions[0].label,
- dataType: PipelineTypeOptions[0].options[0].label,
- query: PipelineTypeOptions[0].options[0],
- keyword: '鐮旂┒闄�01璺痀S000001'
- // ,
- // size: 10,
- // current: 1
+ pipelineType: '绠＄綉',
+ dataType: '',
+ keyword: ''
},
// pageSize: 10,
// current: 1,
@@ -116,32 +113,19 @@
console.log(tab, event)
},
handlePipelineType (val) {
- this.pipelineTypeOptions.forEach((itm) => {
- if (val === itm.value) {
- this.dataTypeOptions = itm.options
- this.form.pipelineType = itm.label
- this.form.labelList = itm.labelList
+ for (var i = 0; i < this.items.length; i++) {
+ const item = this.items[i]
+ if (val === item.name) {
+ this.subItems = item.layers
+ return
}
- })
- this.form.dataType = this.dataTypeOptions[0].label
- this.form.key = this.dataTypeOptions[0].key
- },
- handleDataType (val) {
- this.dataTypeOptions.forEach((itm) => {
- if (val === itm.value) {
- this.form.query = itm
- }
- })
+ }
},
async handleSearch () {
- const param = {
- pipelineType: this.form.pipelineType,
- dataType: this.form.dataType
- }
- console.log(param)
var wfsHelper = new WfsHelper()
- wfsHelper.addTypeName(this.form.query.layerName)
- wfsHelper.addLike(this.form.query.key, this.form.keyword)
+ // todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
+ wfsHelper.addTypeName('绠＄綉')
+ wfsHelper.addLike('name', this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
@@ -149,11 +133,10 @@
}
},
handleLocation (val) {
- console.log(val)
const bound = this.L.geoJSON([val], {}).getBounds()
- var layer = window.serviceLayerHelper.getByLayerId(val.id)
- layer && layer.openPopup()
- this.$store.state.map.map.flyToBounds(bound)
+ // var layer = window.layerFactory.flyByLayerId(val.id, bound)
+ window.map.flyToBounds(bound)
+ // layer && layer.openPopup()
}
}
}
diff --git a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
index 7b74153..6060961 100644
--- a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
+++ b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
@@ -127,8 +127,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -137,7 +135,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
diff --git a/src/components/panel/topicSearch/pipeChangesSearch.vue b/src/components/panel/topicSearch/pipeChangesSearch.vue
index dbd4bee..e433b29 100644
--- a/src/components/panel/topicSearch/pipeChangesSearch.vue
+++ b/src/components/panel/topicSearch/pipeChangesSearch.vue
@@ -68,8 +68,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -78,7 +76,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
form: {
areaVal: '',
diff --git a/src/components/panel/topicSearch/pipeInformationSearch.vue b/src/components/panel/topicSearch/pipeInformationSearch.vue
index 916f4d2..19b638f 100644
--- a/src/components/panel/topicSearch/pipeInformationSearch.vue
+++ b/src/components/panel/topicSearch/pipeInformationSearch.vue
@@ -62,8 +62,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -72,7 +70,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
form: {
areaVal: '',
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 848d666..f78ac95 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -4,6 +4,8 @@
POLYGON: 'polygon'
}
+export const PIPELINE_WFS = 'http://xearth.cn:8088/server/ogcserver/PipeLine2/wfs'
+
export const logicMapper = {
wasteGasPfk: 'WasteGas.js',
wasteWaterPfk: 'WasteWater.js',
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 445e160..168b466 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -11,7 +11,6 @@
// service涓绘満閰嶇疆
// const APP_GIS_HOST = 'http://xearth.cn:6299'
const APP_GIS_HOST = 'http://xearth.cn:8088'
-
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -21,7 +20,7 @@
const mapOptions = {
crs: L.CRS.EPSG4326,
minZoom: 3,
- maxZoom: 18,
+ maxZoom: 17,
// center: [26, 104],
center: [38.828558921813965, 117.41676807403564],
// center: [29.454345703125, 113.40362548828125],
diff --git a/src/conf/layers/LayerAirQuality.js b/src/conf/layers/LayerAirQuality.js
index 738548e..5c0de19 100644
--- a/src/conf/layers/LayerAirQuality.js
+++ b/src/conf/layers/LayerAirQuality.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerAirQuality = {
code: 'sewersAirQuality',
name: '绌烘皵璐ㄩ噺',
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index 6ba6c53..ffdbf98 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerArea = {
code: 'sewersArea',
name: '鍖哄煙淇℃伅',
diff --git a/src/conf/layers/LayerBasin.js b/src/conf/layers/LayerBasin.js
index 6e8a0cc..7e8b80e 100644
--- a/src/conf/layers/LayerBasin.js
+++ b/src/conf/layers/LayerBasin.js
@@ -1,8 +1,8 @@
/**
* 娴佸煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerBasin = {
code: 'sewersBasin',
name: '鍖哄煙鍥惧眰',
diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index eef22d8..b1dfafe 100644
--- a/src/conf/layers/LayerEnvRisk.js
+++ b/src/conf/layers/LayerEnvRisk.js
@@ -1,8 +1,8 @@
/**
* 鐜椋庨櫓
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerEnvRisk = {
code: 'sewersEnvRisk',
name: '鐜椋庨櫓',
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 03212d8..01a5615 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerFsss = {
code: 'sewersFsss',
name: '闄勫睘璁炬柦',
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 769f155..fe105f7 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerHbss = {
code: 'sewersHbss',
name: '鐜繚璁炬柦',
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 524a533..6e3f5b1 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -4,8 +4,8 @@
import { LayerHbss } from './LayerHbss'
import { LayerFsss } from './LayerFsss'
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine2/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerPipeLines = {
code: 'sewersPipeLines',
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index 62bbee9..5547507 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,8 +1,8 @@
/**
* 鎺掑彛
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerPk = {
code: 'sewersPk',
name: '鎺掑彛',
diff --git a/src/conf/layers/LayerSewers.js b/src/conf/layers/LayerSewers.js
deleted file mode 100644
index c382c2d..0000000
--- a/src/conf/layers/LayerSewers.js
+++ /dev/null
@@ -1,523 +0,0 @@
-/**
- * todo 鍑嗗鍒犻櫎姝ゆ枃浠讹紒锛侊紒锛�
- * @type {string}
- */
-
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-export const LayerSewersPoint = [
- {
- code: 'sewersFsss',
- name: '闄勫睘璁炬柦',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'fourlink',
- name: '鍥涢��',
- sname: '鍥涢��',
- checked: true,
- minZoom: 10,
- icon: 'sewers/鍥涢��.png'
- },
- {
- code: 'tee',
- name: '涓夐��',
- sname: '涓夐��',
- checked: false,
- minZoom: 10,
- icon: 'sewers/涓夐��.png'
- },
- {
- code: 'piperack',
- name: '绠℃灦(澧�)',
- sname: 'PipeRack',
- minZoom: 10,
- checked: false
- },
- {
- code: 'pipegallery',
- name: '绠″粖(甯�)',
- sname: 'PipeGallery',
- minZoom: 10,
- checked: false
- },
- {
- code: 'pipesegment',
- name: '娴佸悜',
- sname: 'ywslx',
- checked: false
- },
- {
- code: 'pipeline',
- name: '绠＄綉',
- minZoom: 10,
- sname: 'pipeline',
- checked: false
- },
- {
- code: 'valve',
- name: '闃�闂�',
- minZoom: 10,
- sname: 'valve',
- checked: false,
- icon: 'sewers/闃�闂�.png'
- },
- {
- code: 'elbow',
- name: '寮ご',
- sname: 'Elbow',
- minZoom: 10,
- checked: false,
- icon: 'sewers/寮ご.png'
- }
- ]
- },
- {
- code: 'sewersHbss',
- name: '鐜繚璁炬柦',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'manhole',
- name: '绐ㄤ簳',
- minZoom: 10,
- sname: '绐ㄤ簳',
- checked: false,
- icon: 'sewers/绐ㄤ簳.png'
- },
- {
- code: 'firedike',
- name: '闃茬伀鍫�',
- sname: '闃茬伀鍫�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'raingate',
- name: '闆ㄧ瀛�',
- sname: '闆ㄧ瀛�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/闆ㄧ瀛�.png'
- },
- {
- code: 'overflowweir',
- name: '婧㈡祦鍫�',
- sname: '婧㈡祦鍫�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'chokevalve',
- name: '鎴祦闂�',
- sname: '鎴祦闂�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'collectingbasin',
- name: '闆嗘按姹�(缃�)',
- sname: '闆嗘按姹�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/闆嗘按姹�.png'
- },
- {
- code: 'oilseparator',
- name: '闅旀补姹�',
- sname: '闅旀补姹�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/闅旀补姹�.png'
- }
- ]
- },
- {
- code: 'sewersPk',
- name: '鎺掑彛',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'dischargeport',
- name: '鎺掓斁鍙�',
- minZoom: 10,
- sname: '鎺掓斁鍙�',
- checked: false
- }
- ]
- },
- {
- code: 'sewersQyxx',
- name: '鍖哄煙淇℃伅',
- checked: false, // 榛樿閫変腑鐘舵��
- type: 'geojson',
- url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
- layers: [
- {
- code: 'thirdpartypipe',
- name: '绗笁鏂圭閬�',
- minZoom: 10,
- sname: '绗笁鏂圭閬�',
- checked: false
- },
- {
- code: 'firefightingunit',
- name: '娑堥槻鍗曚綅',
- sname: '娑堥槻鍗曚綅',
- minZoom: 10,
- checked: false,
- icon: 'sewers/娑堥槻鍗曚綅.png'
- },
- {
- code: 'emergencyesources',
- name: '搴旀�ョ墿璧�',
- sname: '搴旀�ョ墿璧�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'emergencyres',
- name: '绀句細涓撲笟搴旀�ユ晳鎻撮槦浼�',
- sname: '涓撲笟搴旀�ユ晳鎻�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
- },
- {
- code: 'maintenanceteam',
- name: '缁存姠淇槦浼�',
- sname: '缁存姠淇槦浼�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
- },
- {
- code: 'hospital',
- name: '鍖婚櫌',
- sname: '鍖婚櫌',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鍖婚櫌.png'
- },
- {
- code: 'pointpreservationzone',
- name: '鑷劧淇濇姢鍖�',
- sname: '鑷劧淇濇姢鍖�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鑷劧淇濇姢鍖�.png'
- },
- {
- code: 'pointhydrology',
- name: '姘翠綋',
- sname: '姘翠綋',
- checked: false,
- minZoom: 10,
- icon: 'sewers/姘翠綋.png'
- },
- {
- code: 'sensitivetarget',
- name: '鏁忔劅鐩爣',
- sname: '鏁忔劅鐩爣',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鏁忔劅鐩爣.png'
- },
- {
- code: 'envmonunit',
- name: '鐜鐩戞祴鍗曚綅',
- sname: '鐜鐩戞祴鍗曚綅',
- checked: false,
- minZoom: 10,
- icon: 'sewers/鐜鐩戞祴鍗曚綅.png'
- },
- {
- code: 'pointcontaminants',
- name: '鐩戞祴鐐规薄鏌撶墿鎸囨爣淇℃伅',
- sname: '姹℃煋鐗╂寚鏍�',
- minZoom: 10,
- checked: false
- },
- {
- code: 'dischargeportaround',
- name: '鎺掓斁鍙ｅ懆杈圭幆澧冩晱鎰熶俊鎭�',
- sname: '鎺掓斁鍙ｅ懆杈圭幆澧�',
- minZoom: 10,
- checked: false,
- iconN: 'sewers/鎺掓斁鍙ｅ懆杈规晱鎰熶俊鎭�.png'
- },
- {
- code: 'pump',
- name: '娉�',
- sname: '娉�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/娉�.png'
- },
- {
- code: 'liquidlevelmeter',
- name: '娑蹭綅璁�',
- sname: '娑蹭綅璁�',
- checked: false,
- minZoom: 10,
- icon: 'sewers/娑蹭綅璁�.png'
- },
- {
- code: 'flowmeter',
- name: '娴侀噺璁�',
- sname: '娴侀噺璁�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/娴侀噺璁�.png'
- },
- {
- code: 'video',
- name: '瑙嗛鐩戞帶閰嶇疆',
- sname: '瑙嗛鐩戞帶',
- minZoom: 10,
- checked: false
- },
- {
- code: 'onlinemonitoring',
- name: '鍦ㄧ嚎鐩戞祴璁惧閰嶇疆',
- sname: '鍦ㄧ嚎鐩戞祴',
- minZoom: 10,
- checked: false
- },
- {
- code: 'combustiblegas',
- name: '鍙噧姘斾綋鎶ヨ璁惧閰嶇疆',
- sname: '鍙噧姘斾綋鎶ヨ',
- minZoom: 10,
- checked: false
- },
- {
- code: 'hydrogensulfide',
- name: 'H2S娴撳害鎶ヨ璁惧閰嶇疆',
- sname: 'H2S娴撳害鎶ヨ',
- minZoom: 10,
- checked: false
- },
- {
- code: 'controlpoint',
- name: '绠＄嚎鐐�',
- sname: '绠＄嚎鐐�',
- minZoom: 10,
- checked: false,
- icon: 'sewers/绠＄嚎鐐�.png'
- },
- {
- code: 'pipesegment',
- name: '绠℃',
- sname: '绠℃',
- minZoom: 10,
- checked: false
- }
- ]
- }
-]
-
-export const PipelineTypeOptions = [{
- value: '1',
- label: '绠＄嚎鏈綋',
- options: [{
- value: '1',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍏ㄩ儴绠＄嚎'
- }, {
- value: '2',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鐢熸椿姹℃按绠＄嚎'
- }, {
- value: '3',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍚洂绠＄嚎'
- }, {
- value: '4',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '闆ㄦ按绠＄嚎'
- }, {
- value: '5',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍚补绠＄嚎'
- }, {
- value: '6',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '浜嬫晠姘寸绾�'
- }, {
- value: '7',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍚⒈绠＄嚎'
- }, {
- value: '8',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '寰幆姘寸绾�'
- }, {
- value: '9',
- layerName: '绠＄綉',
- key: 'pipename',
- label: '鍑�鍖栨按绠＄嚎'
- }],
- labelList: [{ label: '杈撻�佷粙璐�', key: 'mediumtype' }, { label: '闀垮害(m)', key: 'length' }]
-}, {
- value: '2',
- label: '鎺掑彛淇℃伅',
- options: [{
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴鎺掑彛'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '鍐呮帓鍙�'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '澶栨帓鍙�'
- }],
- labelList: []
-}, {
- value: '3',
- label: '闄勫睘璁炬柦',
- options: [
- {
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴璁炬柦'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '闃�闂�'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '绠″粖'
- }, {
- value: '4',
- layerName: '',
- key: '',
- label: '绠℃灦'
- }, {
- value: '5',
- layerName: '',
- key: '',
- label: '涓夐��'
- }, {
- value: '6',
- layerName: '',
- key: '',
- label: '鍥涢��'
- }, {
- value: '7',
- layerName: '',
- key: '',
- label: '寮ご'
- }],
- labelList: []
-}, {
- value: '4',
- label: '鐜繚璁炬柦',
- options: [
- {
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴璁炬柦'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '闆ㄧ瀛�'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '闃茬伀鍫�'
- }, {
- value: '4',
- layerName: '',
- key: '',
- label: '闆嗘按姹�'
- }, {
- value: '5',
- layerName: '',
- key: '',
- label: '鏀堕泦缃�'
- }, {
- value: '6',
- layerName: '',
- key: '',
- label: '鎴祦闂�'
- }, {
- value: '7',
- layerName: '',
- key: '',
- label: '婧㈡祦鍫�'
- }, {
- value: '8',
- layerName: '',
- key: '',
- label: '闅旀补姹�'
- }, {
- value: '9',
- layerName: '',
- key: '',
- label: '娉�'
- }],
- labelList: []
-}, {
- value: '5',
- label: '鍛ㄨ竟鐜',
- options: [{
- value: '1',
- layerName: '',
- key: '',
- label: '鍏ㄩ儴鍛ㄨ竟鐜'
- }, {
- value: '2',
- layerName: '',
- key: '',
- label: '鍖婚櫌'
- }, {
- value: '3',
- layerName: '',
- key: '',
- label: '鏅尯'
- }, {
- value: '4',
- layerName: '',
- key: '',
- label: '鑷劧淇濇姢鍖�'
- }, {
- value: '5',
- layerName: '',
- key: '',
- label: '娑堥槻'
- }, {
- value: '6',
- layerName: '',
- key: '',
- label: '姘翠綋'
- }
- ],
- labelList: []
-}]
diff --git a/src/conf/layers/LayerSoilGroundWater.js b/src/conf/layers/LayerSoilGroundWater.js
index b75b78d..471d241 100644
--- a/src/conf/layers/LayerSoilGroundWater.js
+++ b/src/conf/layers/LayerSoilGroundWater.js
@@ -1,8 +1,8 @@
/**
* 鍦熷￥鍙婂湴涓嬫按
*/
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerSoilGroundWater = {
code: 'sewersSoilGroundWater',
name: '鍦熷￥鍙婂湴涓嬫按',
--
Gitblit v1.8.0