From 54a7a67f871e0ee81ed9060aab2203e97226a677 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期五, 09 四月 2021 09:51:05 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 243 ++++++++++++++++++++++++++++--------------------
1 files changed, 140 insertions(+), 103 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 79a1a2b..0d40541 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -53,32 +53,28 @@
<!-- <option value="Jim">-->
<!-- <option value="Lily">-->
<!-- </datalist>-->
- <el-row type="flex" :gutter="20">
-<!-- <el-col :span="14">-->
-<!-- <el-row>-->
-<!-- <el-col :span="12">-->
-<!-- <el-row type="flex" justify="space-between">-->
-<!-- <el-col class="pickerData">-->
-<!-- 寮�濮嬫椂闂�:-->
-<!-- <el-date-picker-->
-<!-- type="date">-->
-<!-- </el-date-picker>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- </el-col>-->
-<!-- <el-col :span="12" type="flex">-->
-<!-- <el-row type="flex" justify="center">-->
-<!-- <el-col>-->
-<!-- 缁撴潫鏃堕棿:-->
-<!-- <el-date-picker-->
-<!-- type="date"-->
-<!-- >-->
-<!-- </el-date-picker>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- </el-col>-->
+ <el-row type="flex">
+ <el-col :span="14">
+ <div class="pickerMon">
+ <div class="pickerData">
+ <span> 寮�濮嬫椂闂�:</span>
+ <span class="pickerTable"><el-date-picker
+ type="datetime"
+ v-model="value1">
+ </el-date-picker></span>
+ </div>
+ <div class="pickerData">
+ <span >缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
+ <el-date-picker
+ type="datetime"
+ v-model="value2"
+ >
+ </el-date-picker>
+ </span>
+ </div>
+ </div>
+ </el-col>
<el-col :span="5">
閲囨牱鐐规暟:
<input list="source" id="ipt" class="echatsInput">
@@ -89,16 +85,6 @@
<option value="75" />
<option value="100" />
</datalist>
-<!-- <div data-tap-disabled="true">-->
-<!-- 閲囨牱鐐规暟:-->
-<!-- <select id="source">-->
-<!-- <option value="1">0</option>-->
-<!-- <option value="2">25</option>-->
-<!-- <option value="3">50</option>-->
-<!-- <option value="4">75</option>-->
-<!-- <option value="5">100</option>-->
-<!-- </select>-->
-<!-- </div>-->
</el-col>
<el-col class="detailbtn" :span="2" @click="onSubmit">鏌ヨ</el-col>
<el-col :span="3">
@@ -117,7 +103,7 @@
</el-col>
</el-row>
</div>
- <div style="width:100%;height:200px;" id="echarts" ref="main">
+ <div style="width:100%;height:300px;" id="echarts" ref="main">
</div>
</div>
</div>
@@ -133,11 +119,37 @@
},
data () {
return {
+ value1: '',
+ value2: '',
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: '鎶樼嚎鍥惧爢鍙�'
},
@@ -155,25 +167,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'
}
@@ -181,12 +187,11 @@
},
grid: {
left: '3%',
- right: '1%',
+ right: '6%',
bottom: '3%',
containLabel: true
},
- toolbox: {
- },
+ toolbox: {},
// 鍥炬爣缂╂斁璁剧疆
dataZoom: [{
type: 'inside',
@@ -210,12 +215,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: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
@@ -237,9 +243,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: {
@@ -261,66 +289,55 @@
}],
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)).reverse()
+ 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)
})
}
}
@@ -353,20 +370,40 @@
.form-echrts {
width: 100%;
- height: 1rem;
+ height: 2rem;
border-top: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
.from-search{
- //display: flex;
- //justify-content: space-between;
- .pickerData{
+ margin-top: 6px;
+ .pickerMon{
display: flex;
- justify-content: space-between;
+ .pickerData{
+ flex: 1;
+ display: flex;
+ .pickerTable{
+ margin-left: 6px;
+ width: 40px;
+
+ /deep/.el-input__icon {
+ width: 0.9rem;
+ font-size: 0;
+ }
+ }
+ }
+ }
+ /deep/.el-date-editor--datetime{
+ width: 100%;
}
/deep/.el-input__inner{
- width: 40px!important;
- height: 16px!important;
+ position: relative;
+ width: 0.9rem!important;
+ height: 0.125rem!important;
background-color: #2e4967;
+ color: #ffffff;
+ font-size: 8px;
+ padding: 0;
+ //padding-left:20px ;
+ //padding: 0!important;
}
.echatsInput{
color: #00ffff;
--
Gitblit v1.8.0