From 9d3c877628410bc45689d9d110eb70d30c9344ba Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 4 Jan 2024 16:58:43 +0800 Subject: [PATCH] update --- src/components/Modules/EnergyCostAnalysis/BadGas/index.jsx | 2 +- src/components/Modules/EnergyCostAnalysis/Energy/index.jsx | 4 ++-- src/components/Modules/EnergyCostAnalysis/NatGas/index.jsx | 2 +- src/utils/energeChartOption.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Modules/EnergyCostAnalysis/BadGas/index.jsx b/src/components/Modules/EnergyCostAnalysis/BadGas/index.jsx index e6c9ccf..d904ffd 100644 --- a/src/components/Modules/EnergyCostAnalysis/BadGas/index.jsx +++ b/src/components/Modules/EnergyCostAnalysis/BadGas/index.jsx @@ -164,7 +164,7 @@ function getOptions(period, trend) { }, }, series: { - data: trend[period].map(item => item.toFixed(2)), + data: trend[period].map(item => item != null && (+item).toFixed(2)), type: "line", symbol: "circle", symbolSize: 6, diff --git a/src/components/Modules/EnergyCostAnalysis/Energy/index.jsx b/src/components/Modules/EnergyCostAnalysis/Energy/index.jsx index 6cf5f61..afacd88 100644 --- a/src/components/Modules/EnergyCostAnalysis/Energy/index.jsx +++ b/src/components/Modules/EnergyCostAnalysis/Energy/index.jsx @@ -40,7 +40,7 @@ function Energy(props) { 天然气I/Nm³ - {energyInfo?.ngQty1?.replace("Nm³", "") || "0"} + {energyInfo?.ngQty1?.replace("Nm³", "") || "0Nm³"} @@ -52,7 +52,7 @@ function Energy(props) { 天然气II/Nm³ - {energyInfo?.ngQty2?.replace("Nm³", "") || "0"} + {energyInfo?.ngQty2?.replace("Nm³", "") || "0Nm³"} diff --git a/src/components/Modules/EnergyCostAnalysis/NatGas/index.jsx b/src/components/Modules/EnergyCostAnalysis/NatGas/index.jsx index a7ca5ed..0a339d7 100644 --- a/src/components/Modules/EnergyCostAnalysis/NatGas/index.jsx +++ b/src/components/Modules/EnergyCostAnalysis/NatGas/index.jsx @@ -163,7 +163,7 @@ function getOptions(period, trend) { }, }, series: { - data: trend[period].map(item => item.toFixed(3)), + data: trend[period].map(item => item != null && (+item).toFixed(2)), type: "line", symbol: "circle", symbolSize: 6, diff --git a/src/utils/energeChartOption.js b/src/utils/energeChartOption.js index c460fb6..bbb0447 100644 --- a/src/utils/energeChartOption.js +++ b/src/utils/energeChartOption.js @@ -101,7 +101,7 @@ export function getOptions(period, source, trend, options = {}) { ? null : (+item.qty).toFixed(2) ) - : trend[period], + : trend[period].map(item => item != null && (+item).toFixed(2)), type: "line", symbol: "circle", symbolSize: 6,