From 10b043568dbe047eface8e417bfc3716e7148fbc Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 08 四月 2021 17:40:35 +0800
Subject: [PATCH] echarts小时数据的修改
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 309 ++++++++++++++++++++++++++++-----------------------
src/api/mapApi.js | 12 ++
src/components/LayerController/logic/WasteWater.js | 15 ++
src/api/mapUrl.js | 9 +
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8
5 files changed, 205 insertions(+), 148 deletions(-)
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index a621754..e865f9a 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -48,6 +48,18 @@
getWasteWaterMonitoringDetails (data) {
return axios.get(mapUrl.getWasteWaterMonitoringDetails, data)
},
+ // 搴熸按鏃ユ暟鎹拰灏忔椂鏁版嵁鍙婃槑缁嗚〃
+ getQueryOnlineMonData (data) {
+ return axios.get(mapUrl.getQueryOnlineMonData, data)
+ },
+ // 搴熸按浜哄伐鏁版嵁
+ getQueryLabMonData (data) {
+ return axios.get(mapUrl.getQueryLabMonData, data)
+ },
+ // 搴熸按瀹炴椂鏁版嵁
+ getDataItems (data) {
+ return axios.get(mapUrl.getDataItems, data)
+ },
getCompany (data) {
return axios.get(mapUrl.getCompany, data)
}
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index c2493a8..8825e32 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -13,8 +13,11 @@
export const getWasteGas = $HOST + '/wasteGas/getWasteGas'
export const getWasteGasDetails = $HOST + '/wasteGas/getWasteGasMonitoringDetails'
-export const getWasteWater = $HOST + '/wasteWater/getWasteWater'
-export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring'
-export const getWasteWaterMonitoringDetails = $HOST + '/wasteWater/getWasteWaterMonitoringDetails'
+export const getWasteWater = $HOST + '/wasteWater/getWasteWater' // 搴熸按鐐逛俊鎭�
+export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 搴熸按鐩戞祴鏁版嵁
+export const getWasteWaterMonitoringDetails = $HOST + '/wasteWater/getWasteWaterMonitoringDetails' // 搴熸按鐩戞祴鏁版嵁鏄庣粏琛�
+export const getQueryOnlineMonData = $HOST + '/wasteWater/QueryOnlineMonData' // 搴熸按鏃ユ暟鎹皬鏃舵暟鎹強鏄庣粏琛ㄦ暟鎹�
+export const getQueryLabMonData = $HOST + '/wasteWater/QueryLabMonMonData' // 浜哄伐鏁版嵁
+export const getDataItems = $HOST + '/wasteWater/RTDB/DataItems' // 瀹炴椂鏁版嵁
export const getCompany = $HOST + '/company/getCompany'
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 3c40d37..27d814e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -2,54 +2,48 @@
<template>
<div id="Tab">
<div class="infomation">
- <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>
- <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>
- <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>
- <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>
+ <el-tag>姘哀鍖栫墿:29.93 鏍囧噯:100</el-tag>
+ <el-tag>浜屾哀鍖栫～:17.34 鏍囧噯:50</el-tag>
+ <el-tag>鐑熷皹:6.93 鏍囧噯:30</el-tag>
+ <el-tag>搴熸皵娴侀噺:120343.18</el-tag>
</div>
<div class="form-echrts">
- <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
-<!-- <div class="from-search">-->
-<!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">-->
-<!--<!– <el-form-item label="瀹℃壒浜�">–>-->
-<!--<!– <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>–>-->
-<!--<!– </el-form-item>–>-->
-<!-- <div class="block">-->
-<!-- <el-date-picker-->
-<!-- class="date"-->
-<!-- v-model="value"-->
-<!-- type="datetimerange"-->
-<!-- range-separator="鑷�"-->
-<!-- start-placeholder="寮�濮嬫棩鏈�"-->
-<!-- end-placeholder="缁撴潫鏃ユ湡">-->
-<!-- </el-date-picker>-->
-<!-- </div>-->
-<!-- <el-form-item label="閲囨牱鐐规暟" class="text-size">-->
-<!-- <el-select v-model="formInline.region" placeholder="0">-->
-<!-- <el-option label="0" value="shanghai"></el-option>-->
-<!-- <el-option label="25" value="beijing"></el-option>-->
-<!-- <el-option label="50" value="beijing"></el-option>-->
-<!-- <el-option label="75" value="beijing"></el-option>-->
-<!-- <el-option label="100" value="beijing"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item>-->
-<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
-<!-- </el-form-item>-->
-<!-- </el-form>-->
-<!-- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>-->
-<!-- <el-dialog :visible.sync="dialogVisible"-->
-<!-- :append-to-body="true"-->
-<!-- :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"-->
-<!-- width="68%"-->
-<!-- center-->
-<!-- v-dialogDrag-->
-<!-- >-->
-<!-- <div class="el-dialog-div" style="height: 500px">-->
-<!-- <public-detailed-list v-bind="$attrs"></public-detailed-list>-->
-<!-- </div>-->
-<!-- </el-dialog>-->
-<!-- </div>-->
+ <div class="from-search">
+ <el-form :inline="true" :model="formInline" class="demo-form-inline">
+ <el-date-picker
+ class="date"
+ v-model="value"
+ type="datetimerange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ <el-form-item label="閲囨牱鐐规暟" class="text-size">
+ <el-select v-model="formInline.region" placeholder="0">
+ <el-option label="0" value="shanghai"></el-option>
+ <el-option label="25" value="beijing"></el-option>
+ <el-option label="50" value="beijing"></el-option>
+ <el-option label="75" value="beijing"></el-option>
+ <el-option label="100" value="beijing"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
+ </el-form-item>
+ <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
+ <el-dialog :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
+ width="68%"
+ center
+ v-dialogDrag
+ >
+ <div class="el-dialog-div" style="height: 500px">
+ <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ </div>
+ </el-dialog>
+ </el-form>
+ </div>
<div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
</div>
</div>
@@ -68,9 +62,33 @@
return {
watchData: [],
dialogVisible: false,
- dataDate: [],
+ myChar: null,
value: '',
- options: {
+ formInline: {
+ user: '',
+ region: ''
+ }
+ }
+ },
+ methods: {
+ onSubmit () {
+ console.log('submit!')
+ },
+ drawChart: function () {
+ window.onresize = function () {
+ var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ if (h1 > 700) {
+ this.myChart.getDom().style.height = 3 + 'rem'
+ this.myChart.getDom().style.width = 6 + 'rem'
+ } else {
+ this.myChart.getDom().style.height = 3 + 'rem'
+ this.myChart.getDom().style.width = 6 + 'rem'
+ }
+ this.myChart.resize()
+ }
+ },
+ initOptions: function (dataDate, dataValue1, dataValue2, dataValue3) {
+ var options = {
title: {
// text: '鎶樼嚎鍥惧爢鍙�'
},
@@ -88,25 +106,19 @@
x: '200px',
y: '30px',
data: [{
- name: '姘哀鍖栫墿',
+ name: 'COD',
textStyle: {
color: '#00d0f9'
}
},
{
- name: '浜屾哀鍖栫～',
+ name: '姘ㄦ爱',
textStyle: {
color: '#00d0f9'
}
},
{
- name: '鐑熷皹',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '搴熸皵娴侀噺',
+ name: '搴熸按娴侀噺',
textStyle: {
color: '#00d0f9'
}
@@ -114,12 +126,11 @@
},
grid: {
left: '3%',
- right: '1%',
+ right: '6%',
bottom: '3%',
containLabel: true
},
- toolbox: {
- },
+ toolbox: {},
// 鍥炬爣缂╂斁璁剧疆
dataZoom: [{
type: 'inside',
@@ -143,12 +154,13 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['12:00:00', '13:00:00', '14:00:00', '15:00:00', '16:00:00', '17:00:00', '18:00:00'],
+ data: dataDate,
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
textStyle: {
- color: '#fff'
+ color: '#fff',
+ fontSize: 10
}
},
splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
@@ -170,9 +182,31 @@
// Y 杞寸殑璁剧疆
yAxis: [{
type: 'value',
- // position: 'left', // 澶� Y 杞翠娇鐢�
- // name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
+ position: 'left', // 澶� Y 杞翠娇鐢�
name: '娴撳害(mg/m鲁)',
+ axisLabel: {
+ formatter: '{value}',
+ textStyle: {
+ color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
+ }
+ },
+ axisPointer: {
+ snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
+ },
+ splitLine: {
+ show: false // y杞� 缃戞牸绾夸笉鏄剧ず
+ },
+ axisLine: {
+ lineStyle: {
+ color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
+ width: 1
+ }
+ }
+ },
+ {
+ type: 'value',
+ position: 'right', // 澶� Y 杞翠娇鐢�
+ name: '娴侀噺(m鲁/h鲁)',
axisLabel: {
formatter: '{value}',
textStyle: {
@@ -194,106 +228,105 @@
}],
series: [
{
- name: '姘哀鍖栫墿',
+ name: 'COD',
type: 'line',
stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
+ data: dataValue1,
+ yAxisIndex: 0
},
{
- name: '浜屾哀鍖栫～',
+ name: '姘ㄦ爱',
type: 'line',
stack: '鎬婚噺',
- data: [150, 232, 201, 154, 190, 330, 410]
+ data: dataValue2,
+ yAxisIndex: 0
},
{
- name: '鐑熷皹',
+ name: '搴熸按娴侀噺',
type: 'line',
stack: '鎬婚噺',
- data: [320, 332, 301, 334, 390, 330, 320]
- },
- {
- name: '搴熸皵娴侀噺',
- type: 'line',
- stack: '鎬婚噺',
- data: [820, 932, 901, 934, 1290, 1330, 1320]
+ data: dataValue3,
+ yAxisIndex: 1
}
]
- },
- formInline: {
- user: '',
- region: ''
}
- }
- },
- methods: {
- onSubmit () {
- console.log('submit!')
- },
- drawChart: function () {
- const myChart = this.$echarts.init(this.$refs.main)
- myChart.setOption(this.options)
- window.onresize = function () {
- var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
- if (h1 > 700) {
- myChart.getDom().style.height = 3 + 'rem'
- myChart.getDom().style.width = 6 + 'rem'
- } else {
- myChart.getDom().style.height = 3 + 'rem'
- myChart.getDom().style.width = 6 + 'rem'
- }
- myChart.resize()
- }
+ return options
}
},
mounted () {
this.$nextTick(() => {
this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
- // console.log(dataWatch)
- for (var i = 0; i < dataWatch.length; i++) {
- this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonData))
+ console.log(dataWatch)
+ var dataValue1 = []
+ var dataValue2 = []
+ var dataValue3 = []
+ var dataDate = []
+ for (var i = 0; i < 24; i++) {
+ dataDate.push(dataWatch[i].MonTimeStr.substring(9))
}
- // console.log(this.dataDate)
+ for (var n = 0; n < dataWatch.length; n++) {
+ if (dataWatch[n].PoltmtrlName === 'COD') {
+ dataValue1.push(dataWatch[n].MonQty)
+ } else if (dataWatch[n].PoltmtrlName === '姘ㄦ爱') {
+ dataValue2.push(dataWatch[n].MonQty)
+ } else if (dataWatch[n].PoltmtrlName === '搴熸按娴侀噺') {
+ dataValue3.push(dataWatch[n].MonQty)
+ }
+ }
+ const opitons = this.initOptions(dataDate, dataValue1, dataValue2, dataValue3)
+ this.myChart = this.$echarts.init(this.$refs.main)
+ this.myChart.setOption(opitons)
})
}
}
</script>
<style scoped lang="less">
-.Infomation {
- margin-left: 10px;
- height: 0.2rem;
-}
+ .infomation {
+ height: 0.2rem;
+ display: flex;
+ justify-content: space-around;
+ margin-bottom: 5px;
+ }
-.el-tag {
- height: 25px;
- width: 140px;
- line-height: 25px;
- margin-right: 10px;
- font-size: 10px;
- background-color: rgba(0, 255, 246, 0.14);
- color: #00d0f9;
- border: none;
- padding: 0 15px;
-}
+ .el-tag {
+ height: 25px;
+ line-height: 25px;
+ background-color: rgba(0, 255, 246, 0.14);
+ color: #00d0f9;
+ border: none;
+ }
-.form-echrts {
- width: 100%;
- height: 1rem;
- border-top: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .el-dialog-div {
- //height: 50vh!important;
- overflow: auto;
- //overflow: hidden;
- }
+ .form-echrts {
+ height: 1rem;
+ border-top: 1px solid #396d83;
- #echarts {
- margin: 0;
- padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- }
-}
+ .el-dialog-div {
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
+ }
+
+ .from-search {
+ background-color: red;
+ .date{
+ width: 200px;
+ height: 30px;
+ padding: 0;
+ border: none;
+ .el-icon-time{
+ line-height: 30px;
+ }
+ }
+ }
+
+ #echarts {
+ margin: 0;
+ padding: 0;
+ //height: 3rem;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ }
+ }
</style>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 5a47938..91ae6e2 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -13,7 +13,7 @@
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
- :getWasteWaterMonitoring="getWasteWaterMonitoring"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
</div>
</div>
@@ -51,7 +51,7 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getWasteWaterMonitoring: []
+ getQueryOnlineMonData: []
}
},
methods: {
@@ -77,10 +77,10 @@
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, drawData, value) {
+ setWaterData (dataWater, dataDetail, hourData, value) {
this.setWasteWaterdata = dataWater
// console.log(data)
- this.getWasteWaterMonitoring = drawData
+ this.getQueryOnlineMonData = hourData
// console.log(drawData)
this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index c3bccaf..ea29aeb 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -55,12 +55,21 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
- const drawback = await mapApi.getWasteWaterMonitoring()
- console.log(drawback)
+ const hourValue = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '2'
+ }
+ const hourData = await mapApi.getQueryOnlineMonData(hourValue)
+ console.log(hourData)
+ // const drawback = await mapApi.getWasteWaterMonitoring()
+ // console.log(drawback)
const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setWaterData(e.layer.options.test, result.Result.DataInfo, drawback.Result.DataInfo, 'feishui')
+ instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, 'feishui')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
--
Gitblit v1.8.0