From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteGas/DayData.vue | 138 ++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 66 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/DayData.vue b/src/components/BaseNav/WasteGas/DayData.vue
index 74174c7..4c50dcb 100644
--- a/src/components/BaseNav/WasteGas/DayData.vue
+++ b/src/components/BaseNav/WasteGas/DayData.vue
@@ -218,14 +218,16 @@
for (var l = 0; l < nameList.length; l++) {
var obj
var iconurl
- if (nameList[l] === 'COD') {
+ if (nameList[l] === '浜屾哀鍖栫～') {
iconurl = 'image://../assets/imgs/legend/SO2.png'
- } else if (nameList[l] === '姘ㄦ爱') {
+ } else if (nameList[l] === '姘哀鍖栫墿') {
iconurl = 'image://../assets/imgs/legend/NOX.png'
- } else if (nameList[l] === '鎬荤７') {
+ } else if (nameList[l] === '鐑熷皹') {
iconurl = 'image://../assets/imgs/legend/YanChen.png'
- } else if (nameList[l] === '鎬绘爱') {
- iconurl = 'image://../assets/imgs/legend/zongdan.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'
}
@@ -267,21 +269,21 @@
for (let j = 0; j < nameList.length; j++) {
var zdcbcolor, zxcolor
- if (nameList[j] === 'COD') {
+ if (nameList[j] === '浜屾哀鍖栫～') {
zdcbcolor = 'red'
zxcolor = '#fff21c'
- } else if (nameList[j] === '姘ㄦ爱') {
+ } else if (nameList[j] === '姘哀鍖栫墿') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
} else if (nameList[j] === '鎬荤７') {
zdcbcolor = 'red'
zxcolor = '#f48183'
- } else if (nameList[j] === '鎬绘爱') {
+ } else if (nameList[j] === '搴熸皵娴侀噺') {
zdcbcolor = 'red'
- zxcolor = '#d9f2f4'
+ zxcolor = '#70ff49'
} else {
zdcbcolor = 'red'
- zxcolor = '#9ACD32'
+ zxcolor = '#d9f2f4'
}
let sdata = []
@@ -326,8 +328,10 @@
}
}
+ const bzzList = this.bzzList
+
for (let i = 0; i < ydatas.length; i++) {
- // const zdcbcolor = ydatas[i].zdcbcolor
+ const zdcbcolor = ydatas[i].zdcbcolor
const bzz = ydatas[i].bzz
let obj
if (bzz == null) {
@@ -337,31 +341,33 @@
symbolSize: 10, // 澶у皬
smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
yAxisIndex: 1,
- // 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
- // }
- // }
- // },
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ let biaozhuiz
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name === c.seriesName) {
+ biaozhuiz = bzzList[i].bzhui
+ }
+ }
+ if (c.value[1] > biaozhuiz) {
+ return zdcbcolor
+ } else if (c.value[1] > 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
}
@@ -371,33 +377,33 @@
symbol: 'circle', // 鎶樼偣褰㈢姸
symbolSize: 10, // 澶у皬
smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
- // 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
- // }
- // }
- // },
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ let biaozhuiz
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name === c.seriesName) {
+ biaozhuiz = bzzList[i].bzhui
+ }
+ }
+ if (c.value[1] > biaozhuiz) {
+ return zdcbcolor
+ } else if (c.value[1] > 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: { // 骞冲潎鍊� 锛� 鍜� 鎸囨爣涓婇檺
@@ -471,8 +477,8 @@
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:#F206FF;"></span>'
- } else {
- maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
+ } else if (seriesName === '搴熸皵娴侀噺') {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#70ff49;"></span>'
}
s += maker + seriesName + ':' + valueFliter + '<br />'
}
@@ -581,7 +587,7 @@
type: 'value',
name: dataUnit,
max: function (value) {
- const ma = value.max > 120 ? value.max : 120
+ const ma = value.max > 12 ? value.max : 120
return parseInt(ma)
},
axisLabel: {
--
Gitblit v1.8.0