From f01aad869490becbbbc79ae0821ddd7bb2ecc40c Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 21 四月 2021 11:21:20 +0800
Subject: [PATCH] 废汽日数据/人工数据
---
src/components/BaseNav/WasteGas/Detail.vue | 41 +-
src/components/BaseNav/WasteGas/DayData.vue | 963 ++++++++++++++++++++++++++-----------------------------
src/components/BaseNav/WasteGas/HourData.vue | 2
3 files changed, 477 insertions(+), 529 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/DayData.vue b/src/components/BaseNav/WasteGas/DayData.vue
index c9df08e..74174c7 100644
--- a/src/components/BaseNav/WasteGas/DayData.vue
+++ b/src/components/BaseNav/WasteGas/DayData.vue
@@ -1,184 +1,335 @@
<!-- 鏃ユ暟鎹� -->
<template>
<div id="Tab">
- <div class="animation">
- <div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : <i style="color: #e8ee0b">100</i> </span>
- <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
- </div>
- </div>
+ <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
<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="formInline.timeStart"></el-date-picker>
+ <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
</span>
</div>
<div class="pickerData">
- <span >缁撴潫鏃堕棿:</span>
+ <span>缁撴潫鏃堕棿:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
+ <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
</span>
</div>
</div>
-<!-- <div>-->
-<!-- 閲囨牱鐐规暟:-->
-<!-- <el-select v-model="formInline.region" placeholder="50">-->
-<!-- <el-option label="0" value="0"></el-option>-->
-<!-- <el-option label="25" value="25"></el-option>-->
-<!-- <el-option label="50" value="50"></el-option>-->
-<!-- <el-option label="75" value="75"></el-option>-->
-<!-- <el-option label="100" value="100"></el-option>-->
-<!-- </el-select>-->
-<!-- </div>-->
- <div class="detailbtn hover-bottom" @click="onSubmit">鏌ヨ</div>
- <div class="detailbtn hover-bottom" @click="dialogVisible = true" >鏄庣粏琛�</div>
+ <!-- <div>-->
+ <!-- 閲囨牱鐐规暟:-->
+ <!-- <el-select v-model="formInline.region" placeholder="50">-->
+ <!-- <el-option label="0" value="0"></el-option>-->
+ <!-- <el-option label="25" value="25"></el-option>-->
+ <!-- <el-option label="50" value="50"></el-option>-->
+ <!-- <el-option label="75" value="75"></el-option>-->
+ <!-- <el-option label="100" value="100"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </div>-->
+ <div class="detailbtn hover-bottom">鏌ヨ</div>
+ <div class="detailbtn hover-bottom">鏄庣粏琛�</div>
</div>
- <div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="wastegasday">
</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>-->
+ <!-- <!– 鏄庣粏寮规 –>-->
+ <!-- <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>
// import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+import PublicDataStandard from '../PublicDataStandard'
+import 'dayjs/locale/es'
import dayjs from 'dayjs'
+import mapApi from '@/api/mapApi'
export default {
name: 'DayData',
components: {
// PublicDetailedList
+ PublicDataStandard
},
data () {
return {
- watchData: [],
- dialogVisible: false,
- myChar: null,
- value: '',
- formInline: {
- region: '',
- timeStart: '',
- timeEnd: ''
- },
- info: this.series,
- JsonDayCharts: {
- id: 'mychartsDay',
- title: '鍔犵儹鐐夌儫姘�',
- legend: [
- {
- icon: 'image://../assets/imgs/legend/NOX.png',
- itemHeight: 5,
- itemWidth: 20,
- textStyle: {
- color: '#CCC'
- },
- name: '姘哀鍖栫墿'
+ // tab鏍忎紶閫掓帴鏀舵暟鎹�
+ dataStandard: [
+ {
+ current: {
+ name: '姘哀鍖栫墿',
+ val: 29.93
},
- {
- icon: 'image://../assets/imgs/legend/SO2.png',
- itemHeight: 5,
- itemWidth: 20,
- name: '浜屾哀鍖栫～',
- textStyle: {
- color: '#CCC'
- }
- },
- {
- icon: 'image://../assets/imgs/legend/YanChen.png',
- itemHeight: 5,
- itemWidth: 20,
- name: '鐑熷皹',
- textStyle: { color: '#ccc' }
- },
- {
- icon: 'image://../assets/imgs/legend/WenDu.png',
- itemHeight: 5,
- itemWidth: 20,
- name: '娓╁害',
- textStyle: { color: '#ccc' }
- },
- {
- icon: 'image://../assets/imgs/legend/VOCs.png',
- itemHeight: 5,
- itemWidth: 20,
- name: '搴熸皵娴侀噺',
- textStyle: { color: '#ccc' }
+ standard: {
+ name: '鏍囧噯',
+ val: 100
}
- ],
- xdata: ['1鏃�', '2鏃�', '3鏃�', '4鏃�', '5鏃�', '6鏃�', '7鏃�', '8鏃�', '9鏃�', '10鏃�', '11鏃�', '12鏃�', '13鏃�', '14鏃�', '15鏃�', '16鏃�', '17鏃�', '18鏃�', '19鏃�', '20鏃�', '21鏃�', '22鏃�', '23鏃�', '24鏃�', '25鏃�', '26鏃�', '27鏃�', '28鏃�', '29鏃�', '30鏃�', '31鏃�'],
- ydatas: [
- { name: '姘哀鍖栫墿', data: ['40.01', '44.38', '44.71', '40.43', '42.79', '46.00', '52.66', '48.75', '45.75', '49.24', '54.22', '52.25', '53.34', '65.72', '60.01', '54.20', '48.37', '45.56', '42.58', '40.96', '45.14', '49.31', '54.21', '57.89', '51.18', '60.21', '57.76', '60.33', '48.34', '45.66', '53.38'], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 100 },
- { name: '浜屾哀鍖栫～', data: ['9.22', '8.07', '8.69', '9.16', '6.25', '5.78', '15.91', '3232992.75', '11.34', '13.63', '14.13', '11.47', '8.48', '9.46', '7.85', '5.91', '4.64', '4.77', '6.99', '5.82', '5.59', '5.30', '6.62', '9.00', '13.35', '2.68', '1.89', '0.70', '3.68', '6.25', '5.14'], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 50 },
- {
- name: '搴熸皵娴侀噺',
- data: ['2827518.25', '2763525.75', '2776435.50', '2742003.50', '2856001.75', '2890287.00', '2832898.25', '2803715.50', '2513925.75', '2753303.50', '2749836.00', '2786188.50', '2738838.00', '2733660.25', '2815521.25', '2830217.25', '2798918.00', '2803543.50', '2770175.25', '2823321.25', '2856329.25', '2801588.00', '2798103.50', '2766343.00', '2750489.50', '2697786.25', '2796775.50', '2808028.50', '2813561.75', '2757129.25', '2720755.50'],
- zdcbcolor: 'red',
- zxcolor: '#9ACD32',
- bzz: null
+ },
+ {
+ current: {
+ name: '浜屾哀鍖栫～',
+ val: 17.34
},
- { name: '鐑熷皹', data: ['3.88', '3.48', '3.85', '3.99', '3.99', '4.48', '3.96', '3.36', '2.79', '4.65', '4.70', '5.08', '4.55', '4.90', '4.43', '3.10', '2.64', '2.84', '2.63', '2.69', '2.56', '2.32', '2.51', '3.29', '3.40', '3.06', '2.94', '2.90', '2.80', '3.07', '4.55'], zdcbcolor: 'red', zxcolor: '#f48183', bzz: 30 }
- ],
- yname: ' 娴撳害(mg/m鲁)',
- // id:'mychartDay',
- datatype: 1
- }
+ standard: {
+ name: '鏍囧噯',
+ val: 50
+ }
+ },
+ {
+ current: {
+ name: '鐑熷皹',
+ val: 6.93
+ },
+ standard: {
+ name: '鏍囧噯',
+ val: 30
+ }
+ },
+ {
+ current: {
+ name: '搴熸皵娴侀噺',
+ val: 120
+ },
+ standard: {
+ name: '',
+ val: null
+ }
+ }],
+ formInline: {
+ timeStart: null,
+ timeEnd: null
+ },
+ dataType: 1,
+ myChart: null,
+ exhbzz: null,
+ jcdID: 1,
+ exhbzzList: [],
+ bzz: null,
+ bzzList: []
}
},
mounted () {
- this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- this.formInline.timeStart = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss')
- this.onSubmit()
- // this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
- },
- updated () {
- this.onSubmit()
+ this.$nextTick(() => {
+ this.initnData()
+ })
},
methods: {
- onSubmit () {
- console.log('submit!')
- this.CreateCharts(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
+ async initnData () {
+ // 鐢ㄤ簬鎺ュ彛鏁版嵁璇锋眰鐨勫弬鏁� 寮�濮�/缁撴潫鏃堕棿 || 鍙�夋嫨鏌ヨ鐨勫紑濮�/缁撴潫鏃堕棿
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss')
+ const data = {
+ onLineMonEmissPointId: 23,
+ monItemId: 28,
+ beginTime: this.formInline.timeStart,
+ endTime: this.formInline.timeEnd,
+ dataType: this.dataType
+ }
+ const result = (await mapApi.getWasteGasMonData(data)).Result.DataInfo
+ // console.log(result)
+ this.get24HourDate(result)
},
+ get24HourDate (res) {
+ if (res.length > 0) {
+ // 澶勭悊鏁版嵁寮�濮�
+ const d = res
+ const nameList = [] // 瀛樻斁鍥句緥
+ const dateList = [] // 瀛樻斁鏃堕棿
+ const dataList = [] // 瀛樻斁鏁版嵁
+ let data
+ const bzh = []
- CreateCharts: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
- this.mychartDay = this.$echarts.init(this.$refs.main)
- this.mychartDay.clear()
- var dataUnit = ''
+ // wrwIDS = []
+
+ for (let i = 0; i < d.length; i++) {
+ if (d[i].MonItemId === '29') {
+ continue
+ }
+ // 20190430 add 鑾峰彇鐩戞祴鐐筰d 姹℃煋鐗﹊d 妫�娴嬮」id
+ // getWRW(d[i])
+ const MonTimeStr = d[i].MonTimeStr
+
+ const d1 = MonTimeStr.split('/')
+ // var d2=d1[2].split(' ');
+ let strDate
+ if (d1[1] > 9) {
+ // if(d2[0]>9){
+ strDate = MonTimeStr.substring(8, 10) + '鏃�'
+ // }else {
+ // strDate=MonTimeStr.substring(8,9)+"鏃�";
+ // }
+ } else {
+ // if(d2[0]>9){
+ strDate = MonTimeStr.substring(7, 9) + '鏃�'
+ // }else {
+ // strDate=MonTimeStr.substring(7,8)+"鏃�";
+ // }
+ }
+
+ if (nameList.length === 0) {
+ nameList.push(d[i].PoltmtrlName.trim())
+ dateList.push(strDate)
+
+ bzh.push(d[i].StdValue)
+ data = {
+ name: d[i].PoltmtrlName.trim(),
+ data: [d[i].MonQty]
+ }
+ dataList.push(data)
+ } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
+ nameList.push(d[i].PoltmtrlName)
+ bzh.push(d[i].StdValue)
+ data = {
+ name: d[i].PoltmtrlName.trim(),
+ data: [d[i].MonQty]
+ }
+ dataList.push(data)
+ } else {
+ if (dateList.indexOf(strDate) < 0) {
+ dateList.push(strDate)
+ }
+ for (var j = 0; j < dataList.length; j++) {
+ if (d[i].PoltmtrlName.trim() === dataList[j].name) {
+ dataList[j].data.push(d[i].MonQty)
+ }
+ }
+ }
+ }
+ // 澶勭悊鏁版嵁缁撴潫
+
+ var divid = 'mychart1eff'
+
+ var title = name
+
+ var lengList = []
+ var objTemp
+
+ for (var l = 0; l < nameList.length; l++) {
+ var obj
+ var iconurl
+ if (nameList[l] === 'COD') {
+ iconurl = 'image://../assets/imgs/legend/SO2.png'
+ } else if (nameList[l] === '姘ㄦ爱') {
+ iconurl = 'image://../assets/imgs/legend/NOX.png'
+ } else if (nameList[l] === '鎬荤７') {
+ iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ } else if (nameList[l] === '鎬绘爱') {
+ iconurl = 'image://../assets/imgs/legend/zongdan.png'
+ } else {
+ iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ }
+
+ if (nameList[l] === '搴熸按' || nameList[l] === '搴熸按娴侀噺') { // 灏嗗簾姘存祦閲忔帓鍒版暟缁勬渶鍚�
+ objTemp = {
+ name: nameList[l],
+ icon: iconurl,
+ textStyle: {
+ color: '#ccc'
+ },
+ itemWidth: 20,
+ itemHeight: 5
+ }
+ } else {
+ obj = {
+ name: nameList[l],
+ icon: iconurl,
+ textStyle: {
+ color: '#ccc'
+ },
+ itemWidth: 20,
+ itemHeight: 5
+ }
+ lengList.push(obj)
+ }
+
+ this.bzz = {
+ name: nameList[l],
+ bzhui: bzh[l]
+ }
+ this.bzzList.push(this.bzz)
+ }
+ lengList.push(objTemp)
+
+ const legend = lengList
+ const xdata = dateList.reverse()
+ const ydatas = []
+
+ for (let j = 0; j < nameList.length; j++) {
+ var zdcbcolor, zxcolor
+ if (nameList[j] === 'COD') {
+ zdcbcolor = 'red'
+ zxcolor = '#fff21c'
+ } else if (nameList[j] === '姘ㄦ爱') {
+ zdcbcolor = 'red'
+ zxcolor = '#00B0F0'
+ } else if (nameList[j] === '鎬荤７') {
+ zdcbcolor = 'red'
+ zxcolor = '#f48183'
+ } else if (nameList[j] === '鎬绘爱') {
+ zdcbcolor = 'red'
+ zxcolor = '#d9f2f4'
+ } else {
+ zdcbcolor = 'red'
+ zxcolor = '#9ACD32'
+ }
+
+ let sdata = []
+
+ for (let k = 0; k < dataList.length; k++) {
+ if (nameList[j].trim() === dataList[k].name.trim()) {
+ sdata = dataList[k].data.reverse()
+ }
+ }
+
+ const ydata = {
+ name: nameList[j],
+ data: sdata,
+ zdcbcolor: zdcbcolor,
+ zxcolor: zxcolor,
+ bzz: bzh[j]
+ }
+ ydatas.push(ydata)
+ }
+
+ const yname = '娴撳害(mg/l)'
+ this.CreateChart(divid, title, legend, xdata, ydatas, yname, this.jcdID, this.datatype)
+ }
+ },
+ CreateChart (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
+ this.myChart = this.$echarts.init(this.$refs.wastegasday)
+ this.myChart.clear()
+ let dataUnit = ''
if (datatype === 1) {
- dataUnit = '搴熸皵姘旈噺(m鲁/d)'
+ dataUnit = '姘旈噺(m鲁/d)'
} else {
- dataUnit = '搴熸皵姘旈噺(m鲁/h)'
+ dataUnit = '姘旈噺(m鲁/h)'
}
- var serLists = []
- for (var j = 0; j < ydatas.length; j++) {
- var len = ydatas[j].data.length
- for (var k = 0; k < len; k++) {
- var it = ydatas[j].data[k]
- var it2 = parseFloat(it).toFixed(2)
+ const serLists = []
+ for (let j = 0; j < ydatas.length; j++) {
+ const len = ydatas[j].data.length
+ for (let k = 0; k < len; k++) {
+ const it = ydatas[j].data[k]
+ const it2 = parseFloat(it).toFixed(2)
ydatas[j].data[k] = it2
}
}
- for (var i = 0; i < ydatas.length; i++) {
- // var zdcbcolor = ydatas[i].zdcbcolor
- var bzz = ydatas[i].bzz
- var obj
+ for (let i = 0; i < ydatas.length; i++) {
+ // const zdcbcolor = ydatas[i].zdcbcolor
+ const bzz = ydatas[i].bzz
+ let obj
if (bzz == null) {
obj = {
name: ydatas[i].name,
@@ -186,31 +337,31 @@
symbolSize: 10, // 澶у皬
smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
yAxisIndex: 1,
- itemStyle: {
- normal: {
- color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
- // var biaozhuiz
- // for (var i = 0; i < exhbzzList.length; i++) {
- // if (exhbzzList[i].name == c.seriesName) {
- // biaozhuiz = exhbzzList[i].bzhui
- // }
- // }
- // if (c.value > 999999999999) {
- // return zdcbcolor
- // } else {
- // return '#33c95f'
- // }
- },
- lineStyle: { // 鎶樼嚎鐨勯鑹�
- color: ydatas[i].zxcolor,
- width: 5
- },
- borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
- label: { // 鏄剧ず鍊�
- show: false
- }
- }
- },
+ // itemStyle: {
+ // normal: {
+ // color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ // let biaozhuiz
+ // for (let i = 0; i < exhbzzList.length; i++) {
+ // if (exhbzzList[i].name === c.seriesName) {
+ // biaozhuiz = exhbzzList[i].bzhui
+ // }
+ // }
+ // if (c.value > 999999999999) {
+ // return zdcbcolor
+ // } else {
+ // return '#33c95f'
+ // }
+ // },
+ // lineStyle: { // 鎶樼嚎鐨勯鑹�
+ // color: ydatas[i].zxcolor,
+ // width: 5
+ // },
+ // borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
+ // label: { // 鏄剧ず鍊�
+ // show: false
+ // }
+ // }
+ // },
type: 'line',
data: ydatas[i].data
}
@@ -220,52 +371,52 @@
symbol: 'circle', // 鎶樼偣褰㈢姸
symbolSize: 10, // 澶у皬
smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
- itemStyle: {
- normal: {
- color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
- // var biaozhuiz
- // for (var i = 0; i < exhbzzList.length; i++) {
- // if (exhbzzList[i].name == c.seriesName) {
- // biaozhuiz = exhbzzList[i].bzhui
- // }
- // }
- // if (c.value > biaozhuiz) {
- // return zdcbcolor
- // } else if (c.value > biaozhuiz * 0.9) {
- // return '#FFA500'
- // } else {
- // return '#33c95f'
- // }
- },
- lineStyle: { // 鎶樼嚎鐨勯鑹�
- color: ydatas[i].zxcolor,
- width: 5
- },
- borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
- label: { // 鏄剧ず鍊�
- show: false
- }
- }
- },
+ // itemStyle: {
+ // normal: {
+ // color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ // let biaozhuiz
+ // for (let i = 0; i < exhbzzList.length; i++) {
+ // if (exhbzzList[i].name == c.seriesName) {
+ // biaozhuiz = exhbzzList[i].bzhui
+ // }
+ // }
+ // if (c.value > biaozhuiz) {
+ // return zdcbcolor
+ // } else if (c.value > biaozhuiz * 0.9) {
+ // return '#FFA500'
+ // } else {
+ // return '#33c95f'
+ // }
+ // },
+ // lineStyle: { // 鎶樼嚎鐨勯鑹�
+ // color: ydatas[i].zxcolor,
+ // width: 5
+ // },
+ // borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
+ // label: { // 鏄剧ず鍊�
+ // show: false
+ // }
+ // }
+ // },
type: 'line',
data: ydatas[i].data,
markLine: { // 骞冲潎鍊� 锛� 鍜� 鎸囨爣涓婇檺
symbol: 'none',
data: [
/* {
- type: 'average',
- name: '鏃ュ钩鍧囧��',
- label: {
- normal: {
- position: 'end', //鏄剧ず浣嶇疆
- formatter: ydatas[i].name+'\n鏃ュ钩鍧囧��'+'{c}' //鏄剧ず鏍峰紡
+ type: 'average',
+ name: '鏃ュ钩鍧囧��',
+ label: {
+ normal: {
+ position: 'end', //鏄剧ず浣嶇疆
+ formatter: ydatas[i].name+'\n鏃ュ钩鍧囧��'+'{c}' //鏄剧ず鏍峰紡
+ }
+ },
+ lineStyle:{ // 棰滆壊
+ color: 'yellow',
+ type:'solid'
}
- },
- lineStyle:{ // 棰滆壊
- color: 'yellow',
- type:'solid'
- }
- }, */ {
+ }, */ {
label: {
normal: {
position: 'end',
@@ -287,7 +438,7 @@
serLists.push(obj)
}
- var option = {
+ const option = {
tooltip: { // 鎻愮ず妗�
trigger: 'axis',
axisPointer: {
@@ -297,20 +448,21 @@
}
},
formatter: function (params) {
- var s = params[0].name + '<br/>'
- for (var i = 0; i < params.length; i++) {
+ let s = params[0].name + '<br/>'
+ for (let i = 0; i < params.length; i++) {
// const name = params[i].name
// 鍥捐〃title鍚嶇О
- var seriesName = params[i].seriesName
+ const seriesName = params[i].seriesName
// 鍊�
- var value = params[i].value
- // var valueFliter
- // if (value === 'NaN') {
- // valueFliter = ''
- // } else {
- // valueFliter = this.formatter(value)
- // }
- var maker = params[i].marker
+ const value = params[i].value
+ let valueFliter
+ if (value === 'NaN') {
+ valueFliter = ''
+ } else {
+ // valueFliter = formatter(value)
+ valueFliter = value
+ }
+ let maker = params[i].marker
if (seriesName === '浜屾哀鍖栫～') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
} else if (seriesName === '姘哀鍖栫墿') {
@@ -322,7 +474,7 @@
} else {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
}
- s += maker + seriesName + ':' + value + '<br />'
+ s += maker + seriesName + ':' + valueFliter + '<br />'
}
return s
}
@@ -335,8 +487,7 @@
},
grid: { // 缃戞牸
top: '20%',
- left: '12%',
- bottom: '15%'
+ left: '5%'
// containLabel: true
},
legend: { // 鍥句緥
@@ -364,8 +515,8 @@
type: 'category',
boundaryGap: false,
axisLabel: { // x杞村叏閮ㄦ樉绀�
- rotate: 20,
- interval: 0,
+ // rotate: 20,
+ // interval: 0,
textStyle: {
color: '#fff'
}
@@ -391,7 +542,7 @@
type: 'value',
name: yname,
// max: function (value) {
- // var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
+ // let max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
// if (exhbzzList && exhbzzList.length > 0) {
// if (value.max != '-Infinity') { // 鑾峰彇鎵�鏈夌洃娴嬫寚鏍囩殑max鍊� 2020/12/31
// valMax = parseInt(value.max + 5)
@@ -402,8 +553,10 @@
// }
// })
// }
- // max_val_list = max_val_list.sort(function (a, b) { return a - b }) // 鎺掑簭
- // var ma = value.max > max_val_list[max_val_list.length - 1] ? value.max + 5 : max_val_list[max_val_list.length - 1]
+ // max_val_list = max_val_list.sort(function (a, b) {
+ // return a - b
+ // }) // 鎺掑簭
+ // const ma = value.max > max_val_list[max_val_list.length - 1] ? value.max + 5 : max_val_list[max_val_list.length - 1]
// return parseInt(ma)
// },
axisLabel: {
@@ -428,7 +581,7 @@
type: 'value',
name: dataUnit,
max: function (value) {
- var ma = value.max > 120 ? value.max : 120
+ const ma = value.max > 120 ? value.max : 120
return parseInt(ma)
},
axisLabel: {
@@ -452,232 +605,8 @@
}],
series: serLists
}
- this.mychartDay.setOption(option)
-
- // this.mychartDay.on('legendselectchanged', function (params) {
- // var StdVal = null
- // var op = { yAxis: {} }
- // var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
- // if (exhbzzList && exhbzzList.length > 0) {
- // max_val_list.push(valMax) // 灏嗙洃娴嬫寚鏍囩殑max鍊间篃鏀惧叆鏁扮粍 2020/12/31
- // $.each(exhbzzList, function (index, item) {
- // params.selected[item.name] ? max_val_list.push(item.bzhui) : ''
- // if (item.name == params.name) {
- // item.name == 'VOCs' ? StdVal = 20 : StdVal = item.bzhui
- // }
- // })
- // }
- // max_val_list = max_val_list.sort(function (a, b) { return a - b }) // 鎺掑簭
- // op.yAxis.max = function (value) {
- // var ma = value.max < StdVal ? StdVal : Math.ceil(value.max)
- // max_val_list ? ma = max_val_list[max_val_list.length - 1] : ''// 閫夋嫨鏈�澶у��
- // return ma
- // }
- // this.mychartDay.setOption(op)
- // })
-
- /**
- * 瑙ｅ喅mychartDay.on('click',function(){...})浜嬩欢閲嶅瑙﹀彂鐨勯棶棰�
- * Date: 20200720
- */
- this.mychartDay.off('click')
-
- /**
- * 鍥炬爣鐐瑰嚮浜嬩欢
- * 20190426 add
- * */
- // this.mychartDay.on('click', function (params) {
- // // 鑾峰彇褰撳墠鏃堕棿锛屽皬鏃�
- // var nowHours = new Date().Format('hh')
- // // 鐐瑰嚮鎶樼嚎鍥炬姌鐐瑰搴旂殑鏃堕棿
- // // 闇�瑕佷紶鐨勬椂闂翠负
- // var _date = null
- // if (params.name.indexOf('鏃�') !== -1) {
- // var hours = params.name.substring(0, params.name.indexOf('鏃�'))
- // if (parseInt(hours) < parseInt(nowHours)) {
- // _date = new Date().Format('yyyy-MM-dd') + ' ' + hours + ':00:00'
- // } else {
- // var currentDate = new Date()
- // // 24灏忔椂涔嬪墠鏃堕棿
- // var stringDate = new Date(currentDate.getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')
- // _date = stringDate + ' ' + hours + ':00:00'
- // }
- // } else if (params.name.indexOf('鏃�') !== -1) {
- // var day = params.name.substring(0, params.name.indexOf('鏃�') - 1)
- // _date = new Date().Format('yyyy-MM') + '-' + day.trim()
- // }
-
- // todo 璋冩帴鍙� 鏌ュ嚟璇�
- // if (params.color != 'red') {
- // var poltMtrlId
- // var monItemId = 28
- // for (var i = 0; i < wrwIDS.length; i++) {
- // if (params.seriesName == wrwIDS[i].name) {
- // poltMtrlId = wrwIDS[i].id
- // }
- // }
- // getCBMX(jcdID, poltMtrlId, monItemId, _date, function (res) {
- // createDivByMouse(res, params.event)
- // })
- // }
- // createDivByMouse("s",params.event);
- // })
- },
- drawChart: function () {
- window.onresize = function () {
- var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
- if (h1 > 700) {
- this.mychartDay.getDom().style.height = 3 + 'rem'
- this.mychartDay.getDom().style.width = 6 + 'rem'
- } else {
- this.mychartDay.getDom().style.height = 3 + 'rem'
- this.mychartDay.getDom().style.width = 6 + 'rem'
- }
- this.mychartDay.resize()
- }
+ this.myChart.setOption(option)
}
- // initOptions: function (dateDate, series) {
- // var options = {
- // title: {
- // // text: '鎶樼嚎鍥惧爢鍙�'
- // },
- // color: ['#446cdc', '#c4c916', '#c1187e'],
- // tooltip: {
- // trigger: 'axis',
- // axisPointer: {
- // type: 'cross',
- // label: {
- // color: '#1a4245'
- // }
- // }
- // },
- // legend: {
- // x: '200px',
- // y: '30px',
- // data: [{
- // name: 'COD',
- // textStyle: {
- // color: '#00d0f9'
- // }
- // },
- // {
- // name: '姘ㄦ爱',
- // textStyle: {
- // color: '#00d0f9'
- // }
- // },
- // {
- // name: '搴熸按娴侀噺',
- // textStyle: {
- // color: '#00d0f9'
- // }
- // }]
- // },
- // grid: {
- // left: '3%',
- // right: '3%',
- // bottom: '3%',
- // containLabel: true
- // },
- // toolbox: {},
- // // 鍥炬爣缂╂斁璁剧疆
- // dataZoom: [{
- // type: 'inside',
- // start: 0,
- // end: 100
- // }, {
- // start: 0,
- // end: 100,
- // show: false,
- // handleSize: '80%',
- // handleStyle: {
- // color: '#fff',
- // shadowBlur: 3,
- // shadowColor: 'rgba(0, 0, 0, 0.6)',
- // shadowOffsetX: 2,
- // shadowOffsetY: 2
- // }
- // }],
- // // x杞寸殑璁剧疆
- // xAxis: {
- // type: 'category',
- // boundaryGap: false,
- // data: dateDate,
- // axisLabel: { // x杞村叏閮ㄦ樉绀�
- // rotate: 20,
- // interval: 0,
- // textStyle: {
- // color: '#fff',
- // fontSize: 10
- // }
- // },
- // splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
- // show: true,
- // lineStyle: {
- // type: 'dashed'
- // }
- // },
- // axisTick: { // x 杞村埢搴︽樉绀�
- // show: false
- // },
- // axisLine: {
- // lineStyle: {
- // color: '#FFFFFF',
- // width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
- // }
- // }
- // },
- // // Y 杞寸殑璁剧疆
- // yAxis: [{
- // type: 'value',
- // 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: {
- // color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
- // }
- // },
- // axisPointer: {
- // snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
- // },
- // splitLine: {
- // show: false // y杞� 缃戞牸绾夸笉鏄剧ず
- // },
- // axisLine: {
- // lineStyle: {
- // color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
- // width: 1
- // }
- // }
- // }],
- // series: series
- // }
- // return options
- // }
}
}
</script>
@@ -687,6 +616,7 @@
.animation {
.infomation {
padding: 0.02rem 0.04rem;
+
.grid-content {
font-size: 0.08rem;
background-color: #2e4967;
@@ -695,77 +625,94 @@
height: 0.15rem;
line-height: 0.15rem;
margin-right: 0.04rem;
- padding:0 0.04rem
+ padding: 0 0.04rem
}
}
}
- .form-echrts {
- width: 100%;
- border-top: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .from-search{
- display: flex;
- padding:0.02rem;
- >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: 3px;
- }
- }
- }
- /deep/.el-date-editor--datetime{
- width: 100%;
- }
- /deep/.el-input__inner{
- position: relative;
- width:1rem;
- background-color: #2e4967;
- color: #fff;
- font-size: 0.08rem;
- height: 0.15rem;
- padding: 0;
- border:none;
- text-align: center;
- z-index: 9999;
- //padding-left:20px ;
- //padding: 0!important;
- }
- /deep/.el-input__icon{
- display: block;
- width:1rem;
- height: 0.15rem;
- line-height: 0.15rem;
- cursor: pointer;
- font-size: 0;
- }
- input::-webkit-calendar-picker-indicator {
- opacity: 100;
- }
- .detailbtn{
- background-color:#2e4967;
- text-align: center;
- padding: 0 7px;
- height: 0.15rem;
- line-height: 0.15rem;
- border-radius: 4px;
- margin-right: 6px;
- }
- }
- .el-dialog-div {
- overflow: auto;
- }
- #echarts {
- margin: 0;
- padding: 0;
- }
+.form-echrts {
+ width: 100%;
+ border-top: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ .from-search {
+ display: flex;
+ padding: 0.02rem;
+
+ > 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: 3px;
+ }
+ }
+ }
+
+ /deep/ .el-date-editor--datetime {
+ width: 100%;
+ }
+
+ /deep/ .el-input__inner {
+ position: relative;
+ width: 1rem;
+ background-color: #2e4967;
+ color: #fff;
+ font-size: 0.08rem;
+ height: 0.15rem;
+ padding: 0;
+ border: none;
+ text-align: center;
+ z-index: 9999;
+ //padding-left:20px ;
+ //padding: 0!important;
+ }
+
+ /deep/ .el-input__icon {
+ display: block;
+ width: 1rem;
+ height: 0.15rem;
+ line-height: 0.15rem;
+ cursor: pointer;
+ font-size: 0;
+ }
+
+ input::-webkit-calendar-picker-indicator {
+ opacity: 100;
+ }
+
+ .detailbtn {
+ background-color: #2e4967;
+ text-align: center;
+ padding: 0 7px;
+ height: 0.15rem;
+ line-height: 0.15rem;
+ border-radius: 4px;
+ margin-right: 6px;
+ }
+ }
+
+ .el-dialog-div {
+ overflow: auto;
+ }
+
+ #echarts {
+ margin: 0;
+ padding: 0;
+ }
+}
</style>
diff --git a/src/components/BaseNav/WasteGas/Detail.vue b/src/components/BaseNav/WasteGas/Detail.vue
index 8bee0af..38dfbc2 100644
--- a/src/components/BaseNav/WasteGas/Detail.vue
+++ b/src/components/BaseNav/WasteGas/Detail.vue
@@ -54,32 +54,33 @@
</template>
<script>
+import dayjs from 'dayjs'
+import mapApi from '@/api/mapApi'
+
export default {
name: 'Detail',
data () {
return {
- tableData: [{
- LabMonTime: '2021-02-05 09:54',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '44',
- NOEndTime: '100',
- SOMontime: '9',
- SoEndTime: '50'
- }, {
- LabMonTime: '2021-01-14 10:15',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '70',
- NOEndTime: '100',
- SOMontime: '---',
- SoEndTime: '50'
- }]
+ tableData: []
}
},
- created () {
- // this.tableData = [...this.$attrs.ManualData]
- // console.log(this.tableData)
+ mounted () {
+ this.initdetail()
+ },
+ methods: {
+ async initdetail () {
+ const timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ const timeStart = dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
+ const data = {
+ companyId: 3900100145,
+ labMonPointId: 219,
+ beginTime: timeStart,
+ endTime: timeEnd
+ }
+ const result = (await mapApi.getWasteGasManualData(data)).Result.DataInfo
+ console.log(result)
+ this.tableData = result
+ }
}
}
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index 0fb69f2..e34fd9e 100644
--- a/src/components/BaseNav/WasteGas/HourData.vue
+++ b/src/components/BaseNav/WasteGas/HourData.vue
@@ -123,7 +123,7 @@
dataType: this.dataType
}
const result = (await mapApi.getWasteGasMonData(data)).Result.DataInfo
- console.log(result)
+ // console.log(result)
this.get24HourDate(result)
},
get24HourDate (res) {
--
Gitblit v1.8.0