);
};
@@ -79,6 +92,13 @@ export default GoodRateChart;
function getOptions(dataList, showMore, dateType) {
const list = [...dataList].sort((a, b) => a.dataTime - b.dataTime);
+
+ console.log(
+ "list ",
+ list.filter((item) => item.sum)
+ );
+ if (list.length === 0 || list.filter((item) => item.sum).length == 0)
+ return null;
// data: Array(7)
// .fill(1)
// .map((_, index) => {
@@ -140,7 +160,7 @@ function getOptions(dataList, showMore, dateType) {
};
const seriesTeam = [
{
- name: '白班',
+ name: "白班",
data: list.map((item) => (item.day * 100).toFixed(2)),
type: "line",
areaStyle: {
@@ -153,7 +173,7 @@ function getOptions(dataList, showMore, dateType) {
// smooth: true,
},
{
- name: '夜班',
+ name: "夜班",
data: list.map((item) => (item.night * 100).toFixed(2)),
type: "line",
areaStyle: {
@@ -175,7 +195,9 @@ function getOptions(dataList, showMore, dateType) {
trigger: "axis",
color: "#fff",
// formatter: "{b} {c}%",
- formatter: showMore ? "{a0} {c0}%
{a1} {c1}%
{a2} {c2}%" : "{b} {c}%",
+ formatter: showMore
+ ? "{a0} {c0}%
{a1} {c1}%
{a2} {c2}%"
+ : "{b} {c}%",
axisPointer: {
type: "shadow",
},
@@ -187,10 +209,12 @@ function getOptions(dataList, showMore, dateType) {
},
series: [
{
- name: '总量',
- data: list.map((item) => (item.sum * 100).toFixed(2)),
+ name: "总量",
+ data: list.map((item) =>
+ item.sum != null ? (item.sum * 100).toFixed(2) : "-- "
+ ),
type: "line",
- symbol: 'circle',
+ symbol: "circle",
symbolSize: 6,
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
diff --git a/src/components/Common/TodayGood/components/TodayTableData/index.jsx b/src/components/Common/TodayGood/components/TodayTableData/index.jsx
index 3b18898..8997a73 100644
--- a/src/components/Common/TodayGood/components/TodayTableData/index.jsx
+++ b/src/components/Common/TodayGood/components/TodayTableData/index.jsx
@@ -4,7 +4,7 @@ import { ScrollBoard } from "@jiaminghi/data-view-react";
import { useSelector } from "react-redux";
function getRate(decimal) {
- return (decimal.toFixed(2) * 100).toFixed(2) + "%";
+ return decimal != null ? (decimal.toFixed(2) * 100).toFixed(2) + "%" : undefined;
}
const TodayTableData = (props) => {
@@ -57,14 +57,14 @@ const TodayTableData = (props) => {
};
return (
- {config.data.lenght != 0 && (
+ {config.data.length != 0 && (
)}
- {config.data.lenght == 0 && (
+ {config.data.length == 0 && (
item.value).length == 0
+ )
+ return null;
return {
color: ["#FFD160", "#12FFF5", "#2760FF"],
grid: { top: 40, right: 12, bottom: 20, left: 64 },
@@ -141,7 +145,11 @@ function getOptions(source, period, trend) {
},
series: [
{
- data: trend[source].map((item) => !(item.value == null || isNaN(+item.value)) ? (+item.value).toFixed(2) : null),
+ data: trend[source].map((item) =>
+ !(item.value == null || isNaN(+item.value))
+ ? (+item.value).toFixed(2)
+ : null
+ ),
type: "line",
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
diff --git a/src/components/Modules/EnergyCostAnalysis/NO2/index.jsx b/src/components/Modules/EnergyCostAnalysis/NO2/index.jsx
index 3725446..3326eee 100644
--- a/src/components/Modules/EnergyCostAnalysis/NO2/index.jsx
+++ b/src/components/Modules/EnergyCostAnalysis/NO2/index.jsx
@@ -82,7 +82,11 @@ function Dust(props) {
export default Dust;
function getOptions(source, period, trend) {
- if (trend[source].length == 0) return null;
+ if (
+ trend[source].length == 0 ||
+ trend[source].filter((item) => item.value).length == 0
+ )
+ return null;
return {
color: ["#FFD160", "#12FFF5", "#2760FF"],
grid: { top: 40, right: 12, bottom: 20, left: 64 },
@@ -142,7 +146,11 @@ function getOptions(source, period, trend) {
series: [
{
// (isNaN((+"f")) ? 0 : (+"f")).toFixed(2)
- data: trend[source].map((item) => !(item.value == null || isNaN(+item.value)) ? (+item.value).toFixed(2) : null),
+ data: trend[source].map((item) =>
+ !(item.value == null || isNaN(+item.value))
+ ? (+item.value).toFixed(2)
+ : null
+ ),
type: "line",
symbol: "circle",
symbolSize: 6,
diff --git a/src/components/Modules/EnergyCostAnalysis/O/index.jsx b/src/components/Modules/EnergyCostAnalysis/O/index.jsx
index 4884bc7..3a48ca4 100644
--- a/src/components/Modules/EnergyCostAnalysis/O/index.jsx
+++ b/src/components/Modules/EnergyCostAnalysis/O/index.jsx
@@ -82,7 +82,11 @@ function Oxygen(props) {
export default Oxygen;
function getOptions(source, period, trend) {
- if (trend[source].length == 0) return null;
+ if (
+ trend[source].length == 0 ||
+ trend[source].filter((item) => item.value).length == 0
+ )
+ return null;
return {
color: ["#FFD160", "#12FFF5", "#2760FF"],
grid: { top: 40, right: 12, bottom: 20, left: 80 },
@@ -143,7 +147,11 @@ function getOptions(source, period, trend) {
},
series: [
{
- data: trend[source].map((item) => !(item.value == null || isNaN(+item.value)) ? (+item.value).toFixed(2) : null),
+ data: trend[source].map((item) =>
+ !(item.value == null || isNaN(+item.value))
+ ? (+item.value).toFixed(2)
+ : null
+ ),
type: "line",
symbol: "circle",
symbolSize: 6,
diff --git a/src/components/Modules/EnergyCostAnalysis/SO2/index.jsx b/src/components/Modules/EnergyCostAnalysis/SO2/index.jsx
index 0345a23..37881b7 100644
--- a/src/components/Modules/EnergyCostAnalysis/SO2/index.jsx
+++ b/src/components/Modules/EnergyCostAnalysis/SO2/index.jsx
@@ -81,7 +81,11 @@ function SO2(props) {
export default SO2;
function getOptions(source, period, trend) {
- if (trend[source].length == 0) return null;
+ if (
+ trend[source].length == 0 ||
+ trend[source].filter((item) => item.value).length == 0
+ )
+ return null;
return {
color: ["#FFD160", "#12FFF5", "#2760FF"],
grid: { top: 40, right: 12, bottom: 20, left: 64 },
diff --git a/src/components/Modules/Home/CenterTop/RightTable/index.jsx b/src/components/Modules/Home/CenterTop/RightTable/index.jsx
index ef81040..c15d1d4 100644
--- a/src/components/Modules/Home/CenterTop/RightTable/index.jsx
+++ b/src/components/Modules/Home/CenterTop/RightTable/index.jsx
@@ -28,7 +28,20 @@ function CurrentSpec(props) {
当前产线生产规格
-
+ {config.data.length !== 0 &&
}
+ {config.data.length === 0 && (
+
+ 暂无数据
+
+ )}
);
diff --git a/src/store/features/cuttingSlice.js b/src/store/features/cuttingSlice.js
index 8ef19b7..184a669 100644
--- a/src/store/features/cuttingSlice.js
+++ b/src/store/features/cuttingSlice.js
@@ -3,6 +3,7 @@ import { createSlice } from "@reduxjs/toolkit";
export const initialState = {
table: [],
productData: [],
+ productHourData: [],
chart: {
year: [],
week: [],
@@ -17,6 +18,8 @@ const cuttingSlice = createSlice({
reducers: {
setCuttingTable: (state, action) => {
if ("data" in action.payload) state.table = action.payload.data;
+ if ("productHourData" in action.payload)
+ state.productHourData = action.payload.productHourData;
if ("productData" in action.payload)
state.productData = action.payload.productData;
},