|
@@ -1,5 +1,5 @@
|
|
|
import dayjs from "dayjs";
|
|
|
-const formatTofixed = val => val != 0 && !val ? '' : val.toFixed(2);
|
|
|
+export const formatTofixed = val => val != 0 && !val ? '' : val.toFixed(2);
|
|
|
// const formatTofixed = val => val
|
|
|
|
|
|
export const columns = [
|
|
@@ -92,7 +92,6 @@ export const ForecastColumns = [
|
|
|
key: "remark",
|
|
|
width: 140,
|
|
|
fixed: "left",
|
|
|
- // render: ({ vdateTime }) => dayjs(vdateTime).format("YYYY-MM-DD")
|
|
|
},
|
|
|
{
|
|
|
title: "预测类型",
|
|
@@ -103,7 +102,6 @@ export const ForecastColumns = [
|
|
|
title: "预测1时间",
|
|
|
key: "forecastTimeOne",
|
|
|
width: 130,
|
|
|
- // render: ({ forecastTimeOne }) => dayjs(forecastTimeOne).format("HH")
|
|
|
},
|
|
|
{
|
|
|
title: "实际1小时值",
|
|
@@ -128,6 +126,23 @@ export const ForecastColumns = [
|
|
|
key: "hsErrorRateOneStr",
|
|
|
width: 160,
|
|
|
},
|
|
|
+ {
|
|
|
+ title: "机理模型1小时值",
|
|
|
+ key: "jlForecastOne",
|
|
|
+ width: 140,
|
|
|
+ render: ({ jlForecastOne }) => formatTofixed(jlForecastOne)
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "机理模型1小时误差值",
|
|
|
+ key: "jlOneSubtract",
|
|
|
+ width: 150,
|
|
|
+ render: ({ jlOneSubtract }) => formatTofixed(jlOneSubtract)
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "机理模型1小时百分比误差",
|
|
|
+ key: "jlErrorRateOneStr",
|
|
|
+ width: 180,
|
|
|
+ },
|
|
|
{
|
|
|
title: "预测2时间",
|
|
|
key: "forecastTimeTwo",
|
|
@@ -156,11 +171,28 @@ export const ForecastColumns = [
|
|
|
key: "hsErrorRateTwoStr",
|
|
|
width: 160,
|
|
|
},
|
|
|
+ {
|
|
|
+ title: "机理模型2小时值",
|
|
|
+ key: "jlForecastTwo",
|
|
|
+ width: 140,
|
|
|
+ render: ({ jlForecastTwo }) => formatTofixed(jlForecastTwo)
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "机理模型2小时差值",
|
|
|
+ key: "jlTwoSubtract",
|
|
|
+ width: 150,
|
|
|
+ render: ({ jlTwoSubtract }) => formatTofixed(jlTwoSubtract)
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "机理模型2小时百分比误差",
|
|
|
+ key: "jlErrorRateTwoStr",
|
|
|
+ width: 180,
|
|
|
+ },
|
|
|
+
|
|
|
{
|
|
|
title: "预测3时间",
|
|
|
key: "forecastTimeThree",
|
|
|
width: 130,
|
|
|
- // render: ({ forecastTimeThree }) => dayjs(forecastTimeThree).format("HH")
|
|
|
},
|
|
|
{
|
|
|
title: "实际3小时值",
|
|
@@ -185,6 +217,24 @@ export const ForecastColumns = [
|
|
|
key: "hsErrorRateThreeStr",
|
|
|
width: 160,
|
|
|
},
|
|
|
+
|
|
|
+ {
|
|
|
+ title: "机理模型3小时值",
|
|
|
+ key: "jlForecastThree",
|
|
|
+ width: 140,
|
|
|
+ render: ({ jlForecastThree }) => formatTofixed(jlForecastThree)
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "机理模型3小时差值",
|
|
|
+ key: "jlThreeSubtract",
|
|
|
+ width: 150,
|
|
|
+ render: ({ jlThreeSubtract }) => formatTofixed(jlThreeSubtract)
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "机理模型3小时百分比误差",
|
|
|
+ key: "jlErrorRateThreeStr",
|
|
|
+ width: 180,
|
|
|
+ },
|
|
|
];
|
|
|
|
|
|
export const getEchartLineOptions = ({ xAxisData, seriesData }) => {
|