From 47a016469af7b02898ab67ec6ab1d00311f242cf Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 09:57:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 5 +
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 10 +-
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 0
src/components/BaseNav/PublicBounced/common/PublicTabs.vue | 0
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue | 0
src/components/BaseNav/PublicBounced/common/PublicVideo.vue | 0
src/components/LayerController/service/LayerFactory.js | 21 ++++++
src/components/BaseNav/PublicBounced/common/PublicTable.vue | 0
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8 +-
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 24 +++-----
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 0
src/conf/MapConfig.js | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 2
src/components/panel/topicSearch/SewersSearch.vue | 81 ++++++++++----------------
14 files changed, 76 insertions(+), 77 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 91%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
rename to src/components/BaseNav/PublicBounced/common/PublicChart.vue
index fdb0659..ba6a2db 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -27,12 +27,12 @@
</template>
<script>
-import EChartsHour from './EChartsHour'
-import EChartsDate from './EChartsDate'
-import ECharts from './Echarts'
+import EChartsHour from './echarts/EChartsHour'
+import EChartsDate from './echarts/EChartsDate'
+import ECharts from './echarts/Echarts'
// import EChartsDate from './EChartsDate'
-import EChartsHourWasteWater from './EChartsHourWasteWater'
-import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
+import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
+import EChartsTable from '@components/BaseNav/PublicBounced/common/echarts/EChartsTable'
export default {
name: 'PublicChart',
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 99%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index 66cd357..44814e0 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:6rem;height:2rem;" id="echarts" ref="main">
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -146,6 +146,9 @@
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/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
similarity index 96%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index 51b1e20..b0021f9 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,15 +38,12 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
-<!-- <div style="width: 5rem;height: 2rem">-->
-<!-- <div style="width:100%;height:100%;" id="echarts" ref="main">–>-->
-<!-- </div>-->
- <div style="width:720px;height:252px;" id="echarts" ref="main">
- </div>
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="main"></div>
</div>
<!-- 鏄庣粏寮规 -->
<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
@@ -144,7 +136,6 @@
}
},
created () {
- // console.log(dayjs().format('YYYY-MM-DD HH:mm:ss'))
// this.$nextTick(() => {
// 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)
// }
@@ -155,6 +146,9 @@
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 495445a..c7e775e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -62,7 +62,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/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
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/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/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/conf/MapConfig.js b/src/conf/MapConfig.js
index 445e160..b05cd61 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -21,7 +21,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],
--
Gitblit v1.8.0