@@ -65,6 +84,7 @@ export default FaultTotal;
function preHandleStatisticData(data, legend) {
const obj = {};
+ if (!data || !Array.isArray(data)) data = [];
data.forEach((item) => {
obj[item.name] = {};
item.data.forEach((d) => {
diff --git a/src/components/Common/TodayFaultType/index.jsx b/src/components/Common/TodayFaultType/index.jsx
index e980d17..5578dd9 100644
--- a/src/components/Common/TodayFaultType/index.jsx
+++ b/src/components/Common/TodayFaultType/index.jsx
@@ -47,10 +47,11 @@ function FaultType(props) {
diff --git a/src/components/Common/TodayGood/components/GoodRateChart/index.jsx b/src/components/Common/TodayGood/components/GoodRateChart/index.jsx
index 7903363..080a108 100644
--- a/src/components/Common/TodayGood/components/GoodRateChart/index.jsx
+++ b/src/components/Common/TodayGood/components/GoodRateChart/index.jsx
@@ -2,9 +2,13 @@ import cls from "./index.module.css";
import "./overwrite.css"; // 覆写 antd 默认样式，全局
import ReactECharts from "echarts-for-react";
import * as echarts from "echarts";
-import { Switch, Radio } from "antd";
+import { Switch, Select, Radio } from "antd";
import { useEffect, useState } from "react";
import { useSelector } from "react-redux";
+import triangle from "../../../../../assets/Icon/triangle.svg";
+import dayjs from "dayjs";
+
+const dateOptions = { day: "日", week: "周", month: "月", year: "年" };
const GoodRateChart = (props) => {
// 是否展示班次数据
@@ -13,8 +17,8 @@ const GoodRateChart = (props) => {
const [updateKey, setUpdateKey] = useState(Date.now());
// 默认的日期类型
const [dateType, setDateType] = useState("day");
+ const [defaultSelect, setDefaultSelect] = useState(dateOptions[dateType]);
const cutting = useSelector((state) => state.cutting);
-
useEffect(() => {
setUpdateKey(Date.now());
}, [showMore]);
@@ -24,9 +28,47 @@ const GoodRateChart = (props) => {
setShowMore(val);
}
- function handleDateChange({ target }) {
+ const [timestr, setTimestr] = useState("");
+ function handleDateChange(value) {
// e: Event
- setDateType(target.value);
+ let v = "day";
+ switch (value) {
+ case "日":
+ setTimestr(
+ dayjs().subtract(1, "day").format("YYYY.MM.DD") +
+ " 7点 - " +
+ dayjs().format("YYYY.MM.DD") +
+ " 7点"
+ );
+ break;
+ case "月":
+ v = "month";
+ setTimestr(
+ dayjs().subtract(8, "day").format("YYYY.MM.DD") +
+ " - " +
+ dayjs().subtract(1, "day").format("YYYY.MM.DD")
+ );
+ break;
+ case "周":
+ v = "week";
+ setTimestr(
+ dayjs().subtract(1, "month").format("YYYY.MM.") +
+ "29 - " +
+ dayjs().format("YYYY.MM.") +
+ "28"
+ );
+ break;
+ case "年":
+ v = "year";
+ setTimestr(
+ dayjs().subtract(1, "year").endOf("year").format("YYYY.MM.") +
+ "29 - " +
+ dayjs().endOf("year").format("YYYY.MM.") +
+ "28"
+ );
+ break;
+ }
+ setDateType(v);
}
// 根据日期类型，数据列表，是否展示班次数据，生成对应的 options
@@ -49,7 +91,32 @@ const GoodRateChart = (props) => {
)}
- {timestr}