From 699e324c99cae1cac49dc5f92681c9ec587c73d3 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 09 四月 2021 15:48:04 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 188 +++++++++++++++++++++-------------------------
1 files changed, 85 insertions(+), 103 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index e4f7d3f..e37dbec 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -2,73 +2,64 @@
<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-row>
- <el-col :span="6"><div class="grid-content bg-purple">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</div></el-col>
- <el-col :span="6"><div class="grid-content bg-purple">浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</div></el-col>
- <el-col :span="6"><div class="grid-content bg-purple">鐑熷皹 : 6.93 鏍囧噯 : 30</div></el-col>
- <el-col :span="6"><div class="grid-content bg-purple">搴熸皵娴侀噺 : 120343.18</div></el-col>
-<!-- <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>-->
- </el-row>
+ <el-row>
+ <el-col :span="6"><div class="grid-content bg-purple">姘哀鍖栫墿:29.93鏍囧噯:100</div></el-col>
+ <el-col :span="6"><div class="grid-content bg-purple">浜屾哀鍖栫～:17.34鏍囧噯:50</div></el-col>
+ <el-col :span="6"><div class="grid-content bg-purple">鐑熷皹:6.93 鏍囧噯:30</div></el-col>
+ <el-col :span="6"><div class="grid-content bg-purple">搴熸皵娴侀噺:120343.18</div></el-col>
+ <!-- <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>-->
+ </el-row>
</div>
<div class="form-echrts">
<div class="from-search">
- <el-row type="flex">
- <el-col :span="14">
- <div class="pickerMon">
+ <div class="pickerMon">
<div class="pickerData">
- <span> 寮�濮嬫椂闂�:</span>
- <span class="pickerTable"><el-date-picker
- type="datetime"
- v-model="value1">
- </el-date-picker></span>
+ <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">
+ <span >缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
<el-date-picker
- type="datetime"
- v-model="value2"
+ type="datetime"
+ v-model="value2"
>
</el-date-picker>
</span>
</div>
- </div>
- </el-col>
- <el-col :span="5">
- 閲囨牱鐐规暟:
- <input list="source" id="ipt" class="echatsInput">
- <datalist id="source">
- <option value="0" />
- <option value="25" />
- <option value="50" />
- <option value="75" />
- <option value="100" />
- </datalist>
- </el-col>
- <el-col class="detailbtn" :span="2" @click="onSubmit">鏌ヨ</el-col>
- <el-col :span="3">
- <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</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
- >
- <div class="el-dialog-div" style="height: 500px">
- <public-detailed-list v-bind="$attrs"></public-detailed-list>
- </div>
- </el-dialog>
- </el-col>
- </el-row>
- </div>
+ </div>
+ <div>
+ 閲囨牱鐐规暟:
+ <input list="source" id="ipt" class="echatsInput">
+ <datalist id="source">
+ <option value="0" />
+ <option value="25" />
+ <option value="50" />
+ <option value="75" />
+ <option value="100" />
+ </datalist>
+ </div>
+ <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>
+ <!-- 鏄庣粏寮规 -->
+ <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">
+ <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -111,12 +102,12 @@
this.myChart.resize()
}
},
- initOptions: function (dataDate, dataValue1, dataValue2, dataValue3) {
+ initOptions: function (dataDate, series) {
var options = {
title: {
// text: '鎶樼嚎鍥惧爢鍙�'
},
- color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
+ color: ['#002fb3', '#8ce55e', '#ff0087'],
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -250,29 +241,7 @@
}
}
}],
- series: [
- {
- name: 'COD',
- type: 'line',
- stack: '鎬婚噺',
- data: dataValue1,
- yAxisIndex: 0
- },
- {
- name: '姘ㄦ爱',
- type: 'line',
- stack: '鎬婚噺',
- data: dataValue2,
- yAxisIndex: 0
- },
- {
- name: '搴熸按娴侀噺',
- type: 'line',
- stack: '鎬婚噺',
- data: dataValue3,
- yAxisIndex: 1
- }
- ]
+ series: series
}
return options
}
@@ -280,25 +249,33 @@
mounted () {
this.$nextTick(() => {
this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonData)).reverse()
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonHourData)).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))
- }
+ var dateDate = []
+ // {COD:[3,4,5]}
+ var data = {}
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)
+ var d = dataWatch[n].MonTimeStr.substring(9)
+ if (dateDate.indexOf(d) < 0) {
+ dateDate.push(d)
+ }
+ if (data[dataWatch[n].PoltmtrlName]) {
+ data[dataWatch[n].PoltmtrlName].push(dataWatch[n].MonQty)
+ } else {
+ data[dataWatch[n].PoltmtrlName] = [dataWatch[n].MonQty]
}
}
- const opitons = this.initOptions(dataDate, dataValue1, dataValue2, dataValue3)
+ var series = []
+ for (var k in data) {
+ series.push({
+ name: k,
+ type: 'line',
+ yAxisIndex: k === '搴熸按娴侀噺' ? 1 : 0,
+ data: data[k]
+ })
+ }
+ console.log(series)
+ const opitons = this.initOptions(dateDate, series)
this.myChart = this.$echarts.init(this.$refs.main)
this.myChart.setOption(opitons)
})
@@ -335,19 +312,25 @@
border-top: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
.from-search{
- margin-top: 6px;
+ display: flex;
+ padding:5px;
+ >div{margin-left: 10px}
.pickerMon{
display: flex;
+ >div:first-child{
+ margin-right: 10px;
+ }
.pickerData{
flex: 1;
display: flex;
+ >span{line-height: 22px}
.pickerTable{
margin-left: 6px;
- width: 40px;
-
+ /deep/.el-input__prefix{
+ }
/deep/.el-input__icon {
- width: 0.9rem;
- font-size: 0;
+ font-size: 0;
+ width: 100%;
}
}
}
@@ -357,11 +340,10 @@
}
/deep/.el-input__inner{
position: relative;
- width: 0.9rem!important;
- height: 0.125rem!important;
background-color: #2e4967;
color: #ffffff;
- font-size: 8px;
+ font-size: 12px;
+ height: 24px;
padding: 0;
//padding-left:20px ;
//padding: 0!important;
@@ -371,7 +353,8 @@
background-color: #2e4967;
border: none;
border-radius: 6px;
- width: 40px;
+ width: 80px;
+ height: 22px;
}
.detailbtn{
background-color:#2e4967;
@@ -379,7 +362,6 @@
padding: 0 7px;
line-height: 20px;
border-radius: 4px;
- margin-right: 6px;
}
}
.el-dialog-div {
--
Gitblit v1.8.0