From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/WasteWater/WasteWaterHoursChart.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/components/base-page/WasteWater/WasteWaterHoursChart.vue b/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
index 765f402..2acfe80 100644
--- a/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
+++ b/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
@@ -79,8 +79,8 @@
formData: {
region: '25',
regionList: [25, 50, 75, 100],
- startTime: dayjs().subtract(16, 'hour').format('YYYY-MM-DD HH'),
- endTime: dayjs().format('YYYY-MM-DD HH')
+ startTime: dayjs().subtract(24, 'hour').format('YYYY-MM-DD HH:mm:ss'),
+ endTime: dayjs().format('YYYY-MM-DD HH:mm:ss')
},
chart: null,
jcdID: 1,
@@ -101,6 +101,9 @@
// 鍒濆鍖栨暟鎹姹�
async draw24Chart () {
const data = {
+ poltSourceId: '',
+ poltMtrlId: '',
+ emissTypeId: '',
onLineMonEmissPointId: 23,
monItemId: 28,
beginTime: this.formData.startTime,
@@ -327,12 +330,14 @@
biaozhuiz = bzzList[i].bzhui
}
}
- if (c.value[1] > biaozhuiz) {
- return zdcbcolor
- } else if (c.value[1] > biaozhuiz * 0.9) {
- return '#FFA500'
- } else {
- return '#33c95f'
+ if (c.value) {
+ if (c.value[1] > biaozhuiz) {
+ return zdcbcolor
+ } else if (c.value[1] > biaozhuiz * 0.9) {
+ return '#FFA500'
+ } else {
+ return '#33c95f'
+ }
}
},
lineStyle: { // 鎶樼嚎鐨勯鑹�
--
Gitblit v1.8.0