From 4af913e89b28f32a1ea168866f8dd38e2c6411fb Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 21 四月 2021 16:58:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteGas/HourData.vue | 892 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 514 insertions(+), 378 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index 14a2b5b..832658b 100644
--- a/src/components/BaseNav/WasteGas/HourData.vue
+++ b/src/components/BaseNav/WasteGas/HourData.vue
@@ -1,175 +1,377 @@
<!-- 灏忔椂鏁版嵁 -->
<template>
- <div id="Tab">
- <div class="infomation">
- <div>
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</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 id="Tab">
+ <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>
+ </span>
+ </div>
+ <div class="pickerData">
+ <span>缁撴潫鏃堕棿:</span>
+ <span class="pickerTable">
+ <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
+ </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="formInline.timeStart" @click="pickerBtn"></el-date-picker>
- </span>
- </div>
- <div class="pickerData">
- <span >缁撴潫鏃堕棿:</span>
- <span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeEnd" ></el-date-picker>
- </span>
- </div>
- </div>
- <div class="detailbtn" @click="onSubmit">鏌ヨ</div>
- <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
- </div>
- <div style="width:5rem;height:1.5rem;" id="echarts" ref="main"></div>
- </div>
- <!-- 鏄庣粏寮规 -->
- <el-dialog :visible.sync="dialogVisible"
- :append-to-body="true"
- 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 class="detailbtn">鏌ヨ</div>
+ <div class="detailbtn" @click="ScheduleShow">鏄庣粏琛�</div>
+ </div>
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="wastegashour"></div>
</div>
+<!-- 鏄庣粏寮规-->
+ <el-dialog :visible.sync="showSchedule"
+ :modal="false"
+ v-dialogDrag
+ >
+ <div class="el-dialog-div" style="height: 200px">
+ <Scheduleof></Scheduleof>
+ </div>
+ </el-dialog>
+ </div>
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+// import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+import Scheduleof from '@components/BaseNav/WasteGas/Scheduleof'
+import PublicDataStandard from '../PublicDataStandard'
+
import dayjs from 'dayjs'
+import mapApi from '@/api/mapApi'
+
export default {
name: 'HourData',
components: {
- PublicDetailedList
+ // PublicDetailedList
+ PublicDataStandard,
+ Scheduleof
},
data () {
return {
- watchData: [],
- dialogVisible: false,
- myChar: null,
- value: '',
+ // tab鏍忎紶閫掓帴鏀舵暟鎹�
+ dataStandard: [
+ {
+ current: {
+ name: '姘哀鍖栫墿',
+ val: 29.93
+ },
+ standard: {
+ name: '鏍囧噯',
+ val: 100
+ }
+ },
+ {
+ current: {
+ name: '浜屾哀鍖栫～',
+ val: 17.34
+ },
+ 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
},
+ showSchedule: false,
+ dataType: 2,
myChart: null,
- JsonCtarts: {
- id: 'mychart',
- title: '鍔犵儹鐐夌儫姘�',
- legend: [
- {
- icon: 'image://../assets/imgs/legend/NOX.png',
- itemHeight: 5,
- itemWidth: 20,
- textStyle: {
- color: '#CCC'
- },
- name: '姘哀鍖栫墿'
- },
- {
- 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' }
- }
- ],
- xdata: ['0鏃�', '1鏃�', '2鏃�', '3鏃�', '4鏃�', '5鏃�', '6鏃�', '7鏃�', '8鏃�', '9鏃�', '10鏃�', '11鏃�', '12鏃�', '13鏃�', '14鏃�', '15鏃�', '16鏃�'],
- ydatas: [
- { name: '姘哀鍖栫墿', data: ['34.44', '36.91', '37.65', '37.16', '38.03', '38.23', '37.21', '37.67', '37.97', '37.58', '36.61', '37.76', '37.27', '37.24', '35.86', '36.61', '37.21'], zdcbcolor: 'red', zxcolor: '#00B0F0', bzz: 50 },
- { name: '浜屾哀鍖栫～', data: ['4.98', '4.57', '4.19', '3.14', '3.80', '3.62', '3.33', '2.80', '3.13', '2.54', '3.08', '2.48', '1.97', '1.76', '0.82', '1.01', '1.5'], zdcbcolor: 'red', zxcolor: '#fff21c', bzz: 35 },
- { name: '搴熸皵娴侀噺', data: ['381907.22', '376474.19', '378572.31', '379369.44', '385225.72', '388657.56', '330667.31', '26560.98', '0.00', '0.00', '49567.43', '357837.31', '376972.66', '379693.50', '379982.22', '379693.50', '379982.22'], zdcbcolor: 'red', zxcolor: '#9ACD32', bzz: null },
- { name: '鐑熷皹', data: ['4.02', '4.17', '4.31', '4.00', '4.45', '4.40', '4.40', '4.25', '4.26', '4.18', '4.58', '4.21', '3.96', '3.83', '3.78', '3.83', '3.78'], zdcbcolor: 'red', zxcolor: '#f48183', bzz: 10 },
- { name: '娓╁害', data: ['46.55', '46.70', '46.47', '46.56', '46.57', '46.58', '46.56', '46.58', '46.69', '46.47', '46.58', '46.60', '46.54', '46.55', '46.60', '46.55', '46.60'], zdcbcolor: 'red', zxcolor: '#F206FF', bzz: null }
- ],
- yname: ' 娴撳害(mg/m鲁)',
- // id:'mychart',
- datatype: 2
- }
+ exhbzz: null,
+ jcdID: 1,
+ exhbzzList: []
}
},
- created () {
- },
mounted () {
- this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
- this.onSubmit()
+ this.$nextTick(() => {
+ this.initnData()
+ })
},
methods: {
- pickerBtn () {
- this.formInline.timeEnd = ''
- this.formInline.timeStart = ''
- console.log(1)
+ ScheduleShow () {
+ this.showSchedule = !this.showSchedule
},
- onSubmit () {
- this.CreateChart()
+ 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)
},
- CreateChart () {
- // var id = this.JsonCtarts.id
- // var title = this.JsonCtarts.title
- var legend = this.JsonCtarts.legend
- var xdata = this.JsonCtarts.xdata
- var ydatas = this.JsonCtarts.ydatas
- var yname = this.JsonCtarts.yname
- // var jcdId = this.JsonCtarts.jcdID
- var datatype = this.JsonCtarts.datatype
+ get24HourDate (res) {
+ if (res.length > 0) {
+ // 澶勭悊鏁版嵁寮�濮�
+ const d = res
+ const nameList = [] // 瀛樻斁鍥句緥
+ const dateList = [] // 瀛樻斁鏃堕棿
+ let dataList = [] // 瀛樻斁鏁版嵁
+ const bzh = [] // 鏍囧噯鍊�
+ let data = []
+ // wrwIDS = []
+ for (let i = 0; i < d.length; i++) {
+ const MonTimeStr = d[i].MonTimeStr
- this.myChart = this.$echarts.init(this.$refs.main)
- this.myChart.clear()
- var dataUnit = ''
+ // 20190430 add 鑾峰彇鐩戞祴鐐筰d 姹℃煋鐗﹊d 妫�娴嬮」id
+ // getWRW(d[i])
+ /* if(i==0){
+ let wrw ={
+ name: d[0].PoltmtrlName,
+ id:d[0].PoltmtrlId
+ }
+ wrwIDS.push(wrw);
+ }else {
+ let flag=true;
+ wrwIDS.forEach(item=>{
+ if(d[i].PoltmtrlId==item.id){
+ flag=false;
+ }
+ })
+
+ if(flag){
+ let wrw ={
+ name: d[i].PoltmtrlName,
+ id:d[i].PoltmtrlId
+ }
+ wrwIDS.push(wrw);
+ }
+ }
+*/
+
+ let strDate
+ const d1 = MonTimeStr.split('/')
+ const d2 = d1[2].split(' ')
+ const t = MonTimeStr.split(' ')
+ const hlist = t[1].split(':')
+ const h = hlist[0]
+ if (d1[1] > 9) {
+ // strDate=MonTimeStr.substring(8,10)+"鏃�";
+ if (d2[0] > 9) {
+ strDate = ''
+ if (h > 9) {
+ strDate += MonTimeStr.substring(11, 13) + '鏃�'
+ } else {
+ strDate += MonTimeStr.substring(11, 12) + '鏃�'
+ }
+ } else {
+ strDate = ''
+ if (h > 9) {
+ strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ } else {
+ strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ }
+ }
+ } else {
+ if (d2[0] > 9) {
+ strDate = ''
+ if (h > 9) {
+ strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ } else {
+ strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ }
+ } else {
+ strDate = ''
+ if (h > 9) {
+ strDate += MonTimeStr.substring(9, 11) + '鏃�'
+ } else {
+ strDate += MonTimeStr.substring(9, 10) + '鏃�'
+ }
+ }
+ }
+
+ // console.log("鏃堕棿",strDate);
+
+ if (nameList.length === 0) {
+ nameList.push(d[i].PoltmtrlName.trim())
+ dateList.push(strDate)
+ if ((d[i].PoltmtrlName === '搴熸皵娴侀噺' || d[i].PoltmtrlName === '搴熸皵') && d[i].MonQty < 0) {
+ d[i].MonQty = 0
+ }
+ data.push(d[i].MonQty)
+ bzh.push(d[i].StdValue)
+ } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
+ nameList.push(d[i].PoltmtrlName)
+ bzh.push(d[i].StdValue)
+ dataList.push(data)
+ data = []
+ if ((d[i].PoltmtrlName === '搴熸皵娴侀噺' || d[i].PoltmtrlName === '搴熸皵') && d[i].MonQty < 0) {
+ d[i].MonQty = 0
+ }
+ data.push(d[i].MonQty)
+ } else if (i === d.length - 1) {
+ if ((d[i].PoltmtrlName === '搴熸皵娴侀噺' || d[i].PoltmtrlName === '搴熸皵') && d[i].MonQty < 0) {
+ d[i].MonQty = 0
+ }
+ data.push(d[i].MonQty)
+ dataList.push(data)
+ } else {
+ if (dateList.indexOf(strDate) < 0) {
+ dateList.push(strDate)
+ }
+ if ((d[i].PoltmtrlName === '搴熸皵娴侀噺' || d[i].PoltmtrlName === '搴熸皵') && d[i].MonQty < 0) {
+ d[i].MonQty = 0
+ }
+ data.push(d[i].MonQty)
+ }
+ }
+ // 澶勭悊鏁版嵁缁撴潫
+
+ // dateList=get24DateTime();
+
+ const newList = []
+
+ for (let i = 0; i < dataList.length; i++) {
+ const list = dataList[i].reverse()
+ newList.push(list)
+ }
+ dataList = newList
+
+ const id = 'containerDomId' || 'mychart'
+ const title = '鍔犵儹鐐夌儫姘�'
+
+ const lengList = []
+ let objTemp
+
+ for (let l = 0; l < nameList.length; l++) {
+ let obj
+ let iconurl
+ if (nameList[l] === '浜屾哀鍖栫～') {
+ 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/grn.png'
+ } else if (nameList[l] === '娓╁害') {
+ iconurl = 'image://../assets/imgs/legend/WenDu.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)
+ }
+ }
+ lengList.push(objTemp)
+
+ const legend = lengList
+ const xdata = dateList.reverse()
+ const ydatas = []
+
+ for (let j = 0; j < nameList.length; j++) {
+ let zdcbcolor, zxcolor
+ if (nameList[j] === '浜屾哀鍖栫～') {
+ 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 = '#F206FF'
+ } else {
+ zdcbcolor = 'red'
+ zxcolor = '#9ACD32'
+ }
+ const ydata = {
+ name: nameList[j],
+ data: dataList[j],
+ zdcbcolor: zdcbcolor,
+ zxcolor: zxcolor,
+ bzz: bzh[j]
+ }
+ this.exhbzz = {
+ name: nameList[j],
+ bzhui: bzh[j]
+ }
+ this.exhbzzList.push(this.exhbzz)
+
+ ydatas.push(ydata)
+ }
+
+ const yname = '娴撳害(mg/m鲁)'
+
+ this.CreateChart(id, 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.wastegashour)
+ // 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,
@@ -177,31 +379,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
}
@@ -213,22 +415,21 @@
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'
- }
- */
- },
+ // 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
@@ -279,7 +480,7 @@
serLists.push(obj)
}
- var option = {
+ const option = {
tooltip: { // 鎻愮ず妗�
trigger: 'axis',
axisPointer: {
@@ -289,20 +490,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 === '姘哀鍖栫墿') {
@@ -314,7 +516,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
}
@@ -327,8 +529,7 @@
},
grid: { // 缃戞牸
top: '20%',
- left: '6%',
- bottom: '15%'
+ left: '5%'
// containLabel: true
},
legend: { // 鍥句緥
@@ -356,8 +557,8 @@
type: 'category',
boundaryGap: false,
axisLabel: { // x杞村叏閮ㄦ樉绀�
- rotate: 20,
- interval: 0,
+ // rotate: 20,
+ // interval: 0,
textStyle: {
color: '#fff'
}
@@ -382,22 +583,24 @@
yAxis: [{
type: 'value',
name: yname,
- /* max: function (value) {
- var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
- // if(exhbzzList && exhbzzList.length>0){
- // if (value.max != "-Infinity") { // 鑾峰彇鎵�鏈夌洃娴嬫寚鏍囩殑max鍊� 2020/12/31
- // valMax = parseInt(value.max + 5);
- // }
- // $.each(exhbzzList, function (index, item) {
- // if (item.bzhui != null) {
- // max_val_list.push(item.bzhui);
- // }
- // });
- // }
- 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]
- return parseInt(ma)
- }, */
+ // max: function (value) {
+ // let max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
+ // if (exhbzzList && exhbzzList.length > 0) {
+ // if (value.max != '-Infinity') { // 鑾峰彇鎵�鏈夌洃娴嬫寚鏍囩殑max鍊� 2020/12/31
+ // valMax = parseInt(value.max + 5)
+ // }
+ // $.each(exhbzzList, function (index, item) {
+ // if (item.bzhui != null) {
+ // max_val_list.push(item.bzhui)
+ // }
+ // })
+ // }
+ // 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: {
formatter: '{value}',
textStyle: {
@@ -420,7 +623,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: {
@@ -444,180 +647,113 @@
}],
series: serLists
}
- // console.log(option)
this.myChart.setOption(option)
- /*
- this.myChart.on('legendselectchanged', function (params) {
- var StdVal = null
- var op = { yAxis: {} }
- const 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.myChart.setOption(op)
- })
- */
-
- /**
- * 瑙ｅ喅myChart.on('click',function(){...})浜嬩欢閲嶅瑙﹀彂鐨勯棶棰�
- * Date: 20200720
- */
- this.myChart.off('click')
-
- /**
- * 鍥炬爣鐐瑰嚮浜嬩欢
- * 20190426 add
- * */
- /* this.myChart.on('click', function (params) {
- // 鑾峰彇褰撳墠鏃堕棿锛屽皬鏃�
- var nowHours = new Date().Format('hh')
- // 鐐瑰嚮鎶樼嚎鍥炬姌鐐瑰搴旂殑鏃堕棿
- // 闇�瑕佷紶鐨勬椂闂翠负
- const dates = null
- if (params.name.indexOf('鏃�') !== -1) {
- var hours = params.name.substring(0, params.name.indexOf('鏃�'))
- if (parseInt(hours) < parseInt(nowHours)) {
- dates = 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')
- dates = stringDate + ' ' + hours + ':00:00'
- }
- } else if (params.name.indexOf('鏃�') !== -1) {
- var day = params.name.substring(0, params.name.indexOf('鏃�') - 1)
- dates = 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.myChart.getDom().style.height = 3 + 'rem'
- // this.myChart.getDom().style.width = 6 + 'rem'
- // } else {
- // this.myChart.getDom().style.height = 3 + 'rem'
- // this.myChart.getDom().style.width = 6 + 'rem'
- // }
- // this.myChart.resize()
- // }
- // }
}
-
}
</script>
<style scoped lang="less">
- .animation {
- .infomation {
- padding: 0.02rem 0.04rem;
- .grid-content {
- font-size: 0.08rem;
- background-color: #2e4967;
- text-align: center;
- border-radius: 0.01rem;
- height: 0.15rem;
- line-height: 0.15rem;
- margin-right: 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;
- z-index: 9999;
- text-align: center;
- //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;
- }
+.animation {
+ .infomation {
+ padding: 0.02rem 0.04rem;
- 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;
- }
+ .grid-content {
+ font-size: 0.08rem;
+ background-color: #2e4967;
+ text-align: center;
+ border-radius: 0.01rem;
+ height: 0.15rem;
+ line-height: 0.15rem;
+ margin-right: 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;
+ z-index: 9999;
+ text-align: center;
+ //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>
--
Gitblit v1.8.0