From caf8a79ddf7850b41bed74b8f66843d731581c7d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 13:38:47 +0800
Subject: [PATCH] 废水图标功能
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 4
src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue | 2
src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue | 11 --
src/components/BaseNav/PublicBounced/GasComponents/EChartsDateWasteWater.vue | 13 +-
src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue | 249 ++++++++++++++++++++++++++++++++++++-------------
5 files changed, 192 insertions(+), 87 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDateWasteWater.vue
index 698c1b8..48b9924 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDateWasteWater.vue
@@ -133,14 +133,13 @@
},
methods: {
onSubmit () {
- console.log('submit!')
this.effChartShow(this.JsonDateWater.id, this.JsonDateWater.title, this.JsonDateWater.legend, this.JsonDateWater.xdata, this.JsonDateWater.ydatas, this.JsonDateWater.yname, this.JsonDateWater.id, this.JsonDateWater.datatype)
},
effChartShow: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
- this.myChart = this.echarts.init(this.$refs.main)
+ this.myChart = this.$echarts.init(this.$refs.main)
this.myChart.clear()
var dataUnit = ''
- if (datatype == 1) {
+ if (datatype === 1) {
dataUnit = '娴侀噺(m鲁/d)'
} else {
dataUnit = '娴侀噺(m鲁/h)'
@@ -274,13 +273,13 @@
// valueFliter = formatter(value)
}
var maker = params[i].marker
- if (seriesName == 'COD') {
+ if (seriesName === 'COD') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
- } else if (seriesName == '姘ㄦ爱') {
+ } else if (seriesName === '姘ㄦ爱') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#00B0F0;"></span>'
- } else if (seriesName == '鎬荤７') {
+ } else if (seriesName === '鎬荤７') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
- } else if (seriesName == '鎬绘爱') {
+ } else if (seriesName === '鎬绘爱') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#d9f2f4;"></span>'
} else {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#9ACD32;"></span>'
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
index 1752528..a3caf82 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
@@ -128,18 +128,7 @@
},
methods: {
onSubmit () {
- console.log(1)
-
- // const date = [this.value1, this.value2, this.formInline.region]
this.effChartShow(this.JsonHourWater.id, this.JsonHourWater.title, this.JsonHourWater.legend, this.JsonHourWater.xdata, this.JsonHourWater.ydatas, this.JsonHourWater.yname, this.JsonHourWater.id, this.JsonHourWater.datatype)
- // console.log(date)
- // if (date) {
- // var date1 = new Date(date)
- // date1 = new Date(date1.getTime() - (8 * 3600000))
- // console.log(date1)
- // var dateUtil = new DateUtil()
- // var datePkg = dateUtil.getTowDate(date1, "a", 24 * 3600000 - 1);
- // var datatype = 2;
},
effChartShow: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
this.myChart = this.$echarts.init(this.$refs.main)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue
index a9220cc..40da91e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue
@@ -1,4 +1,4 @@
-<!-- 鏃ユ暟鎹� -->
+<!-- 搴熸按瀹炴椂鏁版嵁 -->
<template>
<div id="Tab">
<div class="animation">
@@ -58,6 +58,8 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import 'dayjs/locale/es'
+import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -71,72 +73,200 @@
watchData: [],
dialogVisible: false,
myChar: null,
+ RealTimeChart: null,
value: '',
+ days: dayjs(new Date()).format('YYYYMMDDHHmmss'),
formInline: {
user: '',
region: ''
},
- JsonRealWater: {
- datatype: 1,
- id: 'mychart1eff',
- jcdID: '1020',
+ JsonRealWasteWater: {
+ id: 'mycharteff_second ',
+ title: 'COD',
legend: [
{
- name: 'COD',
- icon: 'image://../assets/imgs/legend/SO2.png',
- textStyle: { color: '#ccc' },
- itemWidth: 20,
- itemHeight: 5
- },
- {
- name: '姘ㄦ爱',
icon: 'image://../assets/imgs/legend/NOX.png',
- textStyle: { color: '#ccc' },
+ itemHeight: 5,
itemWidth: 20,
- itemHeight: 5
+ name: '姘ㄦ爱',
+ textStyle: { color: '#ccc' }
},
{
- name: '搴熸按娴侀噺',
- icon: 'image://../assets/imgs/legend/VOCs.png',
- textStyle: { color: '#ccc' },
+ icon: 'image://../assets/imgs/legend/YanChen.png',
+ itemHeight: 5,
itemWidth: 20,
- itemHeight: 5
+ name: '鎬荤７',
+ textStyle: { color: '#ccc' }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/SO2.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '鎬绘爱',
+ textStyle: { color: '#ccc' }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/NOX.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: 'COD',
+ textStyle: { color: '#ccc' }
+ },
+ {
+ icon: 'image://../assets/imgs/legend/VOCs.png',
+ itemHeight: 5,
+ itemWidth: 20,
+ name: '搴熸按娴侀噺',
+ textStyle: { color: '#ccc' }
}
],
- xdata: ['14鏃�', '15鏃�', '16鏃�', '17鏃�', '18鏃�', '19鏃�', '20鏃�', '21鏃�', '22鏃�', '23鏃�', '24鏃�', '25鏃�', '26鏃�', '27鏃�', '28鏃�', '29鏃�', '30鏃�', '31鏃�', '1 鏃�', '2 鏃�', '3 鏃�', '4 鏃�', '5 鏃�', '6 鏃�', '7 鏃�', '8 鏃�', '9 鏃�', '10鏃�', '11鏃�', '12鏃�'],
ydatas: [
{
- name: 'COD',
- data: [11.626, 11.263, 13.186, 16.041, 20.021, 11.285, 19.546, 15.592, 16.603001, 23.582001, 23.325001, 21.077999, 20.959999, 18.955, 18.676001, 19.322001, 11.976, 11.92, 8.247, 6.38, 6.559, 10.25, 8.354, 7.562, 7.442, 7.543, 7.268, 6.255, 5.735, 8.115],
- zdcbcolor: 'red',
- zxcolor: '#fff21c',
- bzz: 80
- },
- {
- name: '姘ㄦ爱',
- data: [0.224, 3.283, 1.715, 0.831, 4.168, 2.197, 0.451, 0.342, 0.601, 2.669, 1.503, 0.595, 0.649, 0.74, 0.631, 0.432, 0.488, 1.817, 0.579, 2.748, 0.527, 1.01, 0.441, 0.459, 0.582, 0.578, 0.575, 0.295, 0.297, 0.31],
+ name: '姘哀',
+ data: [{ name: '姘哀', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1900156] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1902795] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1892689] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1882582] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1882284] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1886617] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1873395] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1866319] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1895212] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1898232] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1880916] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1883546] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1907846] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1887416] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1873472] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1886214] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1891896] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1891176] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1890455] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1889734] },
+ { name: '姘哀', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1889014] }],
zdcbcolor: 'red',
zxcolor: '#00B0F0',
- bzz: 25
+ bzz: 3
+ },
+ {
+ name: '鎬荤７',
+ data: [{ name: '鎬荤７', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813388] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813333] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813278] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813223] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813168] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813113] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813057] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813003] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812947] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812892] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812837] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812782] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812727] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812672] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812617] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812562] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812507] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812452] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812397] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812342] },
+ { name: '鎬荤７', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812287] }],
+ zdcbcolor: 'red',
+ zxcolor: '#f48183',
+ bzz: 0.3
+ },
+ {
+ name: '鎬绘爱',
+ data: [{ name: '鎬绘爱', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779342] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779337] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779331] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779823] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779321] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779344] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779452] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779224] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779133] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779445] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779743] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779332] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779562] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779560] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779534] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779412] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779673] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779452] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779397] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779342] },
+ { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779287] }],
+ zdcbcolor: 'red',
+ zxcolor: '#e0ffff',
+ bzz: 15
},
{
name: '搴熸按娴侀噺',
- data: [5697.10791, 5623.143066, 5177.564941, 5162.195801, 4633.836914, 4198.133789, 4286.970215, 4162.566895, 2561.10791, 1808.824951, 2961.506104, 2758.715088, 3373.334961, 3282.522949, 3817.322998, 3382.928955, 4747.026855, 2645.947021, 3539.041992, 2540.4729, 4657.589844, 3618.812988, 5725.787109, 6082.206055, 6345.832031, 6470.28418, 5611.5, 5599.958984, 4924.814941, 5191.693848],
+ data: [{ name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 31.63029] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 31.9791] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 31.92095] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.05784] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.01669] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.39344] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.66452] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.45224] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.42133] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.88445] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.36743] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.83332] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.15562] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.61560] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.89534] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.72412] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.48673] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.03452] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.93397] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.84342] },
+ { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.16287] }],
zdcbcolor: 'red',
zxcolor: '#9ACD32',
bzz: null
+ },
+ {
+ name: 'COD',
+ data: [{ name: 'COD', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
+ { name: 'COD', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] }],
+ zdcbcolor: 'red',
+ zxcolor: '#fff21c',
+ bzz: 35
}
],
- yname: '娴撳害(mg/l)'
+ yname: ' 娴撳害(mg/l)'
}
}
},
methods: {
onSubmit () {
- console.log('submit!')
+ this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
- DrawRealTimeDateChart: function (id, title, legend, ydatas, yname) {
- this.myChart = this.echarts.init(this.$refs.main)
+ DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
+ this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
var serLists = []
for (var i = 0; i < ydatas.length; i++) {
// var zdcbcolor = ydatas[i].zdcbcolor
@@ -253,32 +383,19 @@
var seriesName = params[i].seriesName
// 鍊�
var value = params[i].value[1]
- var valueFliter
- if (value === 'NaN') {
- valueFliter = ''
- } else {
- // valueFliter = formatter(value)
- }
+ var valueFliter = this.formatter(value)
var maker = params[i].marker
- var colo = ''
- switch (seriesName) {
- case 'COD':
- colo = '#fff21c'
- break
- case '姘ㄦ爱':
- colo = '#00B0F0'
- break
- case '鎬荤７':
- colo = '#f48183'
- break
- case '鎬绘爱':
- colo = '#e0ffff'
- break
- default:
- colo = '#9ACD32'
- break
+ if (seriesName === 'COD') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
+ } else if (seriesName === '姘ㄦ爱') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#00B0F0;"></span>'
+ } else if (seriesName === '鎬荤７') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
+ } else if (seriesName === '鎬绘爱') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#d9f2f4;"></span>'
+ } else {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#9ACD32;"></span>'
}
- maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:' + colo + ';"></span>'
s += maker + seriesName + ':' + valueFliter + '<br />'
}
return s
@@ -346,7 +463,8 @@
type: 'value',
name: yname,
max: function (value) {
- return parseInt(value.max + 30)
+ var ma = value.max > 100 ? value.max : 100
+ return parseInt(ma)
},
axisLabel: {
formatter: '{value}',
@@ -368,7 +486,7 @@
}
}, {
type: 'value',
- name: dataUnit,
+ name: '娴侀噺(m鲁/h)',
axisLabel: {
formatter: '{value}',
textStyle: {
@@ -381,9 +499,6 @@
splitLine: {
show: false
}, // y杞� 缃戞牸绾夸笉鏄剧ず,
- // inverse: true,
- // nameLocation: 'start',
- // max:500,
axisLine: {
lineStyle: {
color: '#FFFFFF',
@@ -393,8 +508,8 @@
}],
series: serLists
}
- RealTimeChart.setOption(option)
- RealTimeChart.on('legendselectchanged', function (params) {
+ this.RealTimeChart.setOption(option)
+ /* RealTimeChart.on('legendselectchanged', function (params) {
// console.log(params);
var StdVal = null
var op = { yAxis: {} }
@@ -482,7 +597,7 @@
this.myChart.getDom().style.width = 6 + 'rem'
}
this.myChart.resize()
- }
+ } */
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
index feb9840..4f96d4a 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
@@ -430,7 +430,7 @@
}
}, { // 娴侀噺杞�
type: 'value',
- name: '搴熸皵娴侀噺(m3/h)',
+ name: '娴侀噺(m3/h)',
axisLabel: {
formatter: '{value}',
textStyle: {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index aa20800..2874dc9 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -26,6 +26,7 @@
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
import ECharts from './Echarts'
+// import EChartsRealWasteWater from './EChartsRealWasteWater'
// import EChartsHourWasteWater from './EChartsHourWasteWater'
// import EChartsDateWasteWater from './EChartsDateWasteWater'
@@ -37,10 +38,11 @@
ECharts
// EChartsHourWasteWater,
// EChartsDateWasteWater,
+ // EChartsRealWasteWater
},
data () {
return {
- currentTab: 'EChartsHour'
+ currentTab: 'EChartsHourWasteWater'
}
},
methods: {
--
Gitblit v1.8.0