From 270f4c72b8566400fe29f78099f5e206908ef501 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 15:52:32 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 206 +++++++++++++++++++++++++++++++-------------------
1 files changed, 127 insertions(+), 79 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 0b4fe94..00a1f84 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -2,11 +2,16 @@
<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">姘哀鍖栫墿 : 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">
@@ -25,46 +30,43 @@
<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 style="width:5rem;height:2rem;" id="echarts" ref="main">
- </div>
+ </div>
</div>
+ <div>
+ 閲囨牱鐐规暟:
+ <input list="source" id="ipt" class="echatsInput" v-model="value" @change="datalistBtn">
+ <datalist id="source" @click="datalistBtn">
+ <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" style="height: 500px">
+ <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ </div>
+ </el-dialog>
+ </div>
</template>
<script>
@@ -82,14 +84,30 @@
watchData: [],
dialogVisible: false,
myChar: null,
- value: '',
+ value: '50',
formInline: {
user: '',
region: ''
+ },
+ source: {
+
}
}
},
methods: {
+ datalistBtn (value) {
+ // var inputSelect = document.getElementById('#ipt').value
+ // var optionlength = document.getElementsByTagName('option').length
+ // var optionId = ''
+ // for (var i = 0; i < optionlength; i++) {
+ // // var optionValue = $('option').eq(i).attr('data-value')
+ // if (inputSelect == optionValue) {
+ // optionId = $('option').eq(i).attr('data-id')
+ // }
+ // }
+ console.log(1)
+ // this.value = value
+ },
onSubmit () {
console.log('submit!')
},
@@ -106,12 +124,12 @@
this.myChart.resize()
}
},
- initOptions: function (dateDate, series) {
+ initOptions: function (dataDate, dataValue1, dataValue2, dataValue3) {
var options = {
title: {
// text: '鎶樼嚎鍥惧爢鍙�'
},
- color: ['#446cdc', '#c4c916', '#c1187e'],
+ color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -159,6 +177,7 @@
start: 0,
end: 100,
show: false,
+ // handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
handleSize: '80%',
handleStyle: {
color: '#fff',
@@ -171,8 +190,8 @@
// x杞寸殑璁剧疆
xAxis: {
type: 'category',
- boundaryGap: false,
- data: dateDate,
+ boundaryGap: ['10%', '10%'],
+ data: dataDate,
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
@@ -244,7 +263,29 @@
}
}
}],
- series: series
+ 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
+ }
+ ]
}
return options
}
@@ -252,33 +293,25 @@
mounted () {
this.$nextTick(() => {
this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonDateData)).reverse()
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonData)).reverse()
console.log(dataWatch)
- var dateDate = []
- // {COD:[3,4,5]}
- var data = {}
+ var dataValue1 = []
+ var dataValue2 = []
+ var dataValue3 = []
+ var dataDate = []
+ for (var i = 0; i < 24; i++) {
+ dataDate.push(dataWatch[i].MonTimeStr.substring(0, 8))
+ }
for (var n = 0; n < dataWatch.length; n++) {
- var d = dataWatch[n].MonTimeStr.substring(5, 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]
+ 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 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)
+ const opitons = this.initOptions(dataDate, dataValue1, dataValue2, dataValue3)
this.myChart = this.$echarts.init(this.$refs.main)
this.myChart.setOption(opitons)
})
@@ -315,18 +348,28 @@
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;
+ 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{
+ font-size: 0px;
+ .el-input__prefix{
+ width: 100%;
+ }
+ }
/deep/.el-input__icon {
- width: 0.9rem;
+ width: 100%;
font-size: 0;
}
}
@@ -341,18 +384,23 @@
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;
}
.echatsInput{
- color: #00ffff;
- background-color: #2e4967;
- border: none;
- border-radius: 6px;
- width: 40px;
+ color: #00ffff;
+ background-color: #2e4967;
+ border: none;
+ border-radius: 6px;
+ width: 80px;
+ height: 22px;
}
+ input::-webkit-calendar-picker-indicator {
+ opacity: 100;
+ }
.detailbtn{
background-color:#2e4967;
text-align: center;
--
Gitblit v1.8.0