From 8bb5942235c86ea771c4215a77c46b1245c30a93 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 11:31:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 204 ++++++++++++++++++++++----------------------------
1 files changed, 91 insertions(+), 113 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 00a1f84..8e0f659 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -1,34 +1,27 @@
<!-- 鏃ユ暟鎹� -->
<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>
- </div>
- <div class="form-echrts">
- <div class="from-search">
- <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">
+ <div id="Tab">
+ <div class="animation">
+ <div class="infomation">
+ <span class="grid-content">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : 6.93 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : 120343.18</span>
+ </div>
+ </div>
+ <div class="form-echrts">
+ <div class="from-search">
+ <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"
@@ -39,7 +32,7 @@
</div>
<div>
閲囨牱鐐规暟:
- <input list="source" id="ipt" class="echatsInput" v-model="value" @change="datalistBtn">
+ <input list="source" id="ipt" class="echatsInput" @change="datalistBtn">
<datalist id="source" @click="datalistBtn">
<option value="0" />
<option value="25" />
@@ -71,6 +64,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+// import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -84,30 +78,15 @@
watchData: [],
dialogVisible: false,
myChar: null,
- value: '50',
+ value: '',
formInline: {
user: '',
region: ''
},
- source: {
-
- }
+ info: this.series
}
},
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!')
},
@@ -124,12 +103,12 @@
this.myChart.resize()
}
},
- initOptions: function (dataDate, dataValue1, dataValue2, dataValue3) {
+ initOptions: function (dateDate, series) {
var options = {
title: {
// text: '鎶樼嚎鍥惧爢鍙�'
},
- color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
+ color: ['#446cdc', '#c4c916', '#c1187e'],
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -177,7 +156,6 @@
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',
@@ -190,8 +168,8 @@
// x杞寸殑璁剧疆
xAxis: {
type: 'category',
- boundaryGap: ['10%', '10%'],
- data: dataDate,
+ boundaryGap: false,
+ data: dateDate,
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
@@ -263,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
}
@@ -293,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.getQueryOnlineMonDateData)).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(0, 8))
- }
+ 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(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]
}
}
- 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)
})
@@ -320,29 +284,43 @@
</script>
<style scoped lang="less">
- .grid-content{
- font-size: 8px!important;
- background-color:#2e4967;
- text-align: center;
- margin: 0 2px 4px 2px;
- border-radius: 2px;
- }
- .Infomation {
- margin-left: 10px;
- }
-
- .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;
- }
-
+//.animation{
+// padding: 0 1rem;
+// overflow: hidden;
+// //width: 1rem;
+// .infomation{
+// display: flex;
+// //margin: 0 1rem;
+// overflow: hidden;
+// animation: move 1s linear 0s infinite;
+// @keyframes move {
+// 0% {
+// }
+// 100% {
+// transform: translateX(-10%);
+// }
+// }
+// /* 榧犳爣缁忚繃marquee 灏卞仠姝㈠姩鐢� */
+// &:hover {
+// //z-index: 9999999;
+// animation-play-state: paused;
+// }
+// }
+//}
+ .grid-content {
+ font-size: 8px !important;
+ background-color: #2e4967;
+ text-align: center;
+ margin: 0 2px 4px 2px;
+ border-radius: 2px;
+ }
+.animation {
+ //width: 600px;
+ //height: 0.06rem;
+ .Infomation {
+ margin-left: 10px;
+ }
+}
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
--
Gitblit v1.8.0