From 288e2c8e042ebc4efb3ce126177bea6f3913e4a8 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Fri, 21 Feb 2025 16:03:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E8=AD=A6=E5=91=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/LinePage4-2/Right/RightDown.tsx | 6 +++--- src/page/LinePage4-2/Right/RightUp.tsx | 2 +- src/page/LinePage5-1/Center/CenterDown.tsx | 24 +++++++++++----------- src/page/LinePage5-1/Left/LeftDown.tsx | 6 +++--- src/page/LinePage5-1/Left/LeftUp.tsx | 15 +++++++------- src/page/LinePage5-1/Right/RightDown.tsx | 6 +++--- src/page/LinePage5-1/Right/RightUp.tsx | 2 +- src/page/LinePage5-2/Center/CenterDown.tsx | 22 ++++++++++---------- src/page/LinePage5-2/Left/LeftDown.tsx | 6 +++--- src/page/LinePage5-2/Left/LeftUp.tsx | 12 +++++------ src/page/LinePage5-2/Right/RightDown.tsx | 6 +++--- src/page/LinePage5-2/Right/RightUp.tsx | 2 +- src/store/UpdateData.tsx | 2 +- 13 files changed, 56 insertions(+), 55 deletions(-) diff --git a/src/page/LinePage4-2/Right/RightDown.tsx b/src/page/LinePage4-2/Right/RightDown.tsx index 82b2ee3..2403307 100644 --- a/src/page/LinePage4-2/Right/RightDown.tsx +++ b/src/page/LinePage4-2/Right/RightDown.tsx @@ -81,7 +81,7 @@ function RightDown() { // @ts-ignore if (data.todayProductionDets && data.todayProductionDets.length > 0) { // @ts-ignore - data.todayProductionDets.map((item,index)=>{ + data.todayProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("HH:mm"),item.inputNum,item.outputNum); arr1.push(arrInner); @@ -97,7 +97,7 @@ function RightDown() { // @ts-ignore if (data.weekProductionDets && data.weekProductionDets.length > 0) { // @ts-ignore - data.weekProductionDets.map((item,index)=>{ + data.weekProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("YYYY/MM/DD"),item.inputNum,item.outputNum); arr2.push(arrInner); @@ -113,7 +113,7 @@ function RightDown() { // @ts-ignore if (data.monthProductionDets && data.monthProductionDets.length > 0) { // @ts-ignore - data.monthProductionDets.map((item,index)=>{ + data.monthProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("YYYY/MM/DD"),item.inputNum,item.outputNum); arr3.push(arrInner); diff --git a/src/page/LinePage4-2/Right/RightUp.tsx b/src/page/LinePage4-2/Right/RightUp.tsx index a2ade9b..314bc27 100644 --- a/src/page/LinePage4-2/Right/RightUp.tsx +++ b/src/page/LinePage4-2/Right/RightUp.tsx @@ -19,7 +19,7 @@ function RightUp() { // @ts-ignore if (data.sectionDet && data.sectionDet.length > 0) { // @ts-ignore - data.sectionDet.map((item, index) => { + data.sectionDet.forEach((item, index) => { let arrInner = [] arrInner.push(index + 1, item.lineName, item.inputNum, item.outputNum) arr.push(arrInner) diff --git a/src/page/LinePage5-1/Center/CenterDown.tsx b/src/page/LinePage5-1/Center/CenterDown.tsx index 71fdcf1..632b12b 100644 --- a/src/page/LinePage5-1/Center/CenterDown.tsx +++ b/src/page/LinePage5-1/Center/CenterDown.tsx @@ -29,7 +29,7 @@ function CenterDown() { { name: "周", ename: "week" }, { name: "月", ename: "month" }, ]; - const [activeName, setActiveName] = useState(nameList[1].ename); + const [activeName] = useState(nameList[1].ename); // const handleButtonChange = (activeName: string) => { // setActiveName(activeName); // }; @@ -52,7 +52,7 @@ function CenterDown() { // @ts-ignore sumAlarm = data.alarms.length // @ts-ignore - data.alarms.map((item,index) => { + data.alarms.forEach((item,index) => { let arrInner = [] arrInner.push( index+1, @@ -70,11 +70,11 @@ function CenterDown() { // @ts-ignore let keys = Object.keys(data.todayProductionRates) // @ts-ignore - data.todayProductionRates[keys[0]].map((item,index)=>{ + data.todayProductionRates[keys[0]].forEach((item,index)=>{ // @ts-ignore dataSource.day.xData.push(dayjs(item.recTime).format("HH:mm")) }) - keys.map((item,index)=>{ + keys.forEach((item,index)=>{ let obj = { name: "", type: "line", @@ -85,7 +85,7 @@ function CenterDown() { // @ts-ignore obj.name = data.todayProductionRates[item][0].lineName // @ts-ignore - data.todayProductionRates[item].map((subItem,index)=>{ + data.todayProductionRates[item].forEach((subItem,index)=>{ // @ts-ignore obj.data.push(subItem.passRate) }) @@ -100,11 +100,11 @@ function CenterDown() { // @ts-ignore let keys = Object.keys(data.weekProductionRates) // @ts-ignore - data.weekProductionRates[keys[0]].map((item,index)=>{ + data.weekProductionRates[keys[0]].forEach((item,index)=>{ // @ts-ignore dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) }) - keys.map((item,index)=>{ + keys.forEach((item,index)=>{ let obj = { name: "", type: "line", @@ -115,7 +115,7 @@ function CenterDown() { // @ts-ignore obj.name = data.weekProductionRates[item][0].lineName // @ts-ignore - data.weekProductionRates[item].map((subItem,index)=>{ + data.weekProductionRates[item].forEach((subItem,index)=>{ // @ts-ignore obj.data.push(subItem.passRate) }) @@ -130,11 +130,11 @@ function CenterDown() { // @ts-ignore let keys = Object.keys(data.monthProductionRates) // @ts-ignore - data.monthProductionRates[keys[0]].map((item,index)=>{ + data.monthProductionRates[keys[0]].forEach((item,index)=>{ // @ts-ignore dataSource.month.xData.push(dayjs(item.recTime).format("HH:mm")) }) - keys.map((item,index)=>{ + keys.forEach((item,index)=>{ let obj = { name: "", type: "line", @@ -145,7 +145,7 @@ function CenterDown() { // @ts-ignore obj.name = data.monthProductionRates[item][0].lineName // @ts-ignore - data.monthProductionRates[item].map((subItem,index)=>{ + data.monthProductionRates[item].forEach((subItem,index)=>{ // @ts-ignore obj.data.push(subItem.passRate) }) @@ -192,7 +192,7 @@ function CenterDown() { {} )} - {chartData.xData.length==0 && ( + {chartData.xData.length===0 && (

0) { // @ts-ignore - data.todayProductionScraps.map((item,index)=>{ + data.todayProductionScraps.forEach((item,index)=>{ let arrInner = []; arrInner.push(index+1,item.sectionName,item.scrapNum || 0); arr1.push(arrInner); @@ -90,7 +90,7 @@ function LeftDown() { // @ts-ignore if (data.weekProductionScraps && data.weekProductionScraps.length > 0) { // @ts-ignore - data.weekProductionScraps.map((item,index)=>{ + data.weekProductionScraps.forEach((item,index)=>{ let arrInner = []; arrInner.push(index+1,item.sectionName,item.scrapNum || 0); arr2.push(arrInner); @@ -103,7 +103,7 @@ function LeftDown() { // @ts-ignore if (data.monthProductionScraps && data.monthProductionScraps.length > 0) { // @ts-ignore - data.monthProductionScraps.map((item,index)=>{ + data.monthProductionScraps.forEach((item,index)=>{ let arrInner = []; arrInner.push(index+1,item.sectionName,item.scrapNum || 0); arr3.push(arrInner); diff --git a/src/page/LinePage5-1/Left/LeftUp.tsx b/src/page/LinePage5-1/Left/LeftUp.tsx index de4d768..88371da 100644 --- a/src/page/LinePage5-1/Left/LeftUp.tsx +++ b/src/page/LinePage5-1/Left/LeftUp.tsx @@ -37,7 +37,7 @@ function LeftUp() { let sum: number[] = []; // 生成obj // @ts-ignore - data.scrapBars.map((item,index) => { + data.scrapBars.forEach((item,index) => { let obj = { data: [], type: "bar", @@ -67,7 +67,7 @@ function LeftUp() { for(let i = 0;i < dataSource.day.series.length;i++){ let itemSeries = dataSource.day.series[i] // @ts-ignore - data.todayAllProductionScraps[item].map((itemInner,indexInner)=>{ + data.todayAllProductionScraps[item].forEach((itemInner,indexInner)=>{ // @ts-ignore if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) { // @ts-ignore @@ -105,7 +105,7 @@ function LeftUp() { let sum: number[] = []; // 生成obj // @ts-ignore - data.scrapBars.map((item,index) => { + data.scrapBars.forEach((item,index) => { let obj = { data: [], type: "bar", @@ -135,7 +135,7 @@ function LeftUp() { for(let i = 0;i < dataSource.week.series.length;i++){ let itemSeries = dataSource.week.series[i] // @ts-ignore - data.weekAllProductionScraps[item].map((itemInner,indexInner)=>{ + data.weekAllProductionScraps[item].forEach((itemInner,indexInner)=>{ // @ts-ignore if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) { // @ts-ignore @@ -173,7 +173,7 @@ function LeftUp() { let sum: number[] = []; // 生成obj // @ts-ignore - data.scrapBars.map((item,index) => { + data.scrapBars.forEach((item,index) => { let obj = { data: [], type: "bar", @@ -201,9 +201,9 @@ function LeftUp() { let item = dataSource.month.xData[k]; let sumIner = 0 for(let i = 0;i < dataSource.month.series.length;i++){ - let itemSeries = dataSource.month.series[i] + var itemSeries = dataSource.month.series[i] // @ts-ignore - data.monthAllProductionScraps[item].map((itemInner,indexInner)=>{ + data.monthAllProductionScraps[item].forEach((itemInner,indexInner)=>{ // @ts-ignore if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) { // @ts-ignore @@ -217,6 +217,7 @@ function LeftUp() { } } sum.push(sumIner) + } dataSource.month.series.push({ data: sum, diff --git a/src/page/LinePage5-1/Right/RightDown.tsx b/src/page/LinePage5-1/Right/RightDown.tsx index 6b620cb..e5294cd 100644 --- a/src/page/LinePage5-1/Right/RightDown.tsx +++ b/src/page/LinePage5-1/Right/RightDown.tsx @@ -81,7 +81,7 @@ function RightDown() { // @ts-ignore if (data.todayProductionDets && data.todayProductionDets.length > 0) { // @ts-ignore - data.todayProductionDets.map((item,index)=>{ + data.todayProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("HH:mm"),item.inputNum,item.outputNum); arr1.push(arrInner); @@ -97,7 +97,7 @@ function RightDown() { // @ts-ignore if (data.weekProductionDets && data.weekProductionDets.length > 0) { // @ts-ignore - data.weekProductionDets.map((item,index)=>{ + data.weekProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("YYYY/MM/DD"),item.inputNum,item.outputNum); arr2.push(arrInner); @@ -113,7 +113,7 @@ function RightDown() { // @ts-ignore if (data.monthProductionDets && data.monthProductionDets.length > 0) { // @ts-ignore - data.monthProductionDets.map((item,index)=>{ + data.monthProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("YYYY/MM/DD"),item.inputNum,item.outputNum); arr3.push(arrInner); diff --git a/src/page/LinePage5-1/Right/RightUp.tsx b/src/page/LinePage5-1/Right/RightUp.tsx index 4d1946c..dc449f8 100644 --- a/src/page/LinePage5-1/Right/RightUp.tsx +++ b/src/page/LinePage5-1/Right/RightUp.tsx @@ -19,7 +19,7 @@ function RightUp() { // @ts-ignore if (data.sectionDet && data.sectionDet.length > 0) { // @ts-ignore - data.sectionDet.map((item, index) => { + data.sectionDet.forEach((item, index) => { let arrInner = [] arrInner.push(index + 1, item.lineName, item.inputNum, item.outputNum) arr.push(arrInner) diff --git a/src/page/LinePage5-2/Center/CenterDown.tsx b/src/page/LinePage5-2/Center/CenterDown.tsx index fef412d..d235a27 100644 --- a/src/page/LinePage5-2/Center/CenterDown.tsx +++ b/src/page/LinePage5-2/Center/CenterDown.tsx @@ -29,7 +29,7 @@ function CenterDown() { { name: "周", ename: "week" }, { name: "月", ename: "month" }, ]; - const [activeName, setActiveName] = useState(nameList[1].ename); + const [activeName] = useState(nameList[1].ename); // const handleButtonChange = (activeName: string) => { // setActiveName(activeName); // }; @@ -52,7 +52,7 @@ function CenterDown() { // @ts-ignore sumAlarm = data.alarms.length // @ts-ignore - data.alarms.map((item,index) => { + data.alarms.forEach((item,index) => { let arrInner = [] arrInner.push( index+1, @@ -70,11 +70,11 @@ function CenterDown() { // @ts-ignore let keys = Object.keys(data.todayProductionRates) // @ts-ignore - data.todayProductionRates[keys[0]].map((item,index)=>{ + data.todayProductionRates[keys[0]].mforEachap((item,index)=>{ // @ts-ignore dataSource.day.xData.push(dayjs(item.recTime).format("HH:mm")) }) - keys.map((item,index)=>{ + keys.forEach((item,index)=>{ let obj = { name: "", type: "line", @@ -85,7 +85,7 @@ function CenterDown() { // @ts-ignore obj.name = data.todayProductionRates[item][0].lineName // @ts-ignore - data.todayProductionRates[item].map((subItem,index)=>{ + data.todayProductionRates[item].forEach((subItem,index)=>{ // @ts-ignore obj.data.push(subItem.passRate) }) @@ -100,11 +100,11 @@ function CenterDown() { // @ts-ignore let keys = Object.keys(data.weekProductionRates) // @ts-ignore - data.weekProductionRates[keys[0]].map((item,index)=>{ + data.weekProductionRates[keys[0]].forEach((item,index)=>{ // @ts-ignore dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) }) - keys.map((item,index)=>{ + keys.forEach((item,index)=>{ let obj = { name: "", type: "line", @@ -115,7 +115,7 @@ function CenterDown() { // @ts-ignore obj.name = data.weekProductionRates[item][0].lineName // @ts-ignore - data.weekProductionRates[item].map((subItem,index)=>{ + data.weekProductionRates[item].forEach((subItem,index)=>{ // @ts-ignore obj.data.push(subItem.passRate) }) @@ -130,11 +130,11 @@ function CenterDown() { // @ts-ignore let keys = Object.keys(data.monthProductionRates) // @ts-ignore - data.monthProductionRates[keys[0]].map((item,index)=>{ + data.monthProductionRates[keys[0]].forEach((item,index)=>{ // @ts-ignore dataSource.month.xData.push(dayjs(item.recTime).format("HH:mm")) }) - keys.map((item,index)=>{ + keys.forEach((item,index)=>{ let obj = { name: "", type: "line", @@ -145,7 +145,7 @@ function CenterDown() { // @ts-ignore obj.name = data.monthProductionRates[item][0].lineName // @ts-ignore - data.monthProductionRates[item].map((subItem,index)=>{ + data.monthProductionRates[item].forEach((subItem,index)=>{ // @ts-ignore obj.data.push(subItem.passRate) }) diff --git a/src/page/LinePage5-2/Left/LeftDown.tsx b/src/page/LinePage5-2/Left/LeftDown.tsx index ff14474..e3f3564 100644 --- a/src/page/LinePage5-2/Left/LeftDown.tsx +++ b/src/page/LinePage5-2/Left/LeftDown.tsx @@ -77,7 +77,7 @@ function LeftDown() { // @ts-ignore if (data.todayProductionScraps && data.todayProductionScraps.length > 0) { // @ts-ignore - data.todayProductionScraps.map((item,index)=>{ + data.todayProductionScraps.forEach((item,index)=>{ let arrInner = []; arrInner.push(index+1,item.sectionName,item.scrapNum || 0); arr1.push(arrInner); @@ -90,7 +90,7 @@ function LeftDown() { // @ts-ignore if (data.weekProductionScraps && data.weekProductionScraps.length > 0) { // @ts-ignore - data.weekProductionScraps.map((item,index)=>{ + data.weekProductionScraps.forEach((item,index)=>{ let arrInner = []; arrInner.push(index+1,item.sectionName,item.scrapNum || 0); arr2.push(arrInner); @@ -103,7 +103,7 @@ function LeftDown() { // @ts-ignore if (data.monthProductionScraps && data.monthProductionScraps.length > 0) { // @ts-ignore - data.monthProductionScraps.map((item,index)=>{ + data.monthProductionScraps.forEach((item,index)=>{ let arrInner = []; arrInner.push(index+1,item.sectionName,item.scrapNum || 0); arr3.push(arrInner); diff --git a/src/page/LinePage5-2/Left/LeftUp.tsx b/src/page/LinePage5-2/Left/LeftUp.tsx index 61c9eb4..793e46b 100644 --- a/src/page/LinePage5-2/Left/LeftUp.tsx +++ b/src/page/LinePage5-2/Left/LeftUp.tsx @@ -37,7 +37,7 @@ function LeftUp() { let sum: number[] = []; // 生成obj // @ts-ignore - data.scrapBars.map((item,index) => { + data.scrapBars.forEach((item,index) => { let obj = { data: [], type: "bar", @@ -67,7 +67,7 @@ function LeftUp() { for(let i = 0;i < dataSource.day.series.length;i++){ let itemSeries = dataSource.day.series[i] // @ts-ignore - data.todayAllProductionScraps[item].map((itemInner,indexInner)=>{ + data.todayAllProductionScraps[item].forEach((itemInner,indexInner)=>{ // @ts-ignore if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) { // @ts-ignore @@ -105,7 +105,7 @@ function LeftUp() { let sum: number[] = []; // 生成obj // @ts-ignore - data.scrapBars.map((item,index) => { + data.scrapBars.forEach((item,index) => { let obj = { data: [], type: "bar", @@ -135,7 +135,7 @@ function LeftUp() { for(let i = 0;i < dataSource.week.series.length;i++){ let itemSeries = dataSource.week.series[i] // @ts-ignore - data.weekAllProductionScraps[item].map((itemInner,indexInner)=>{ + data.weekAllProductionScraps[item].forEach((itemInner,indexInner)=>{ // @ts-ignore if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) { // @ts-ignore @@ -173,7 +173,7 @@ function LeftUp() { let sum: number[] = []; // 生成obj // @ts-ignore - data.scrapBars.map((item,index) => { + data.scrapBars.forEach((item,index) => { let obj = { data: [], type: "bar", @@ -203,7 +203,7 @@ function LeftUp() { for(let i = 0;i < dataSource.month.series.length;i++){ let itemSeries = dataSource.month.series[i] // @ts-ignore - data.monthAllProductionScraps[item].map((itemInner,indexInner)=>{ + data.monthAllProductionScraps[item].forEach((itemInner,indexInner)=>{ // @ts-ignore if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) { // @ts-ignore diff --git a/src/page/LinePage5-2/Right/RightDown.tsx b/src/page/LinePage5-2/Right/RightDown.tsx index 9d38343..1e50aee 100644 --- a/src/page/LinePage5-2/Right/RightDown.tsx +++ b/src/page/LinePage5-2/Right/RightDown.tsx @@ -80,7 +80,7 @@ function RightDown() { // @ts-ignore if (data.todayProductionDets && data.todayProductionDets.length > 0) { // @ts-ignore - data.todayProductionDets.map((item,index)=>{ + data.todayProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("HH:mm"),item.inputNum,item.outputNum); arr1.push(arrInner); @@ -96,7 +96,7 @@ function RightDown() { // @ts-ignore if (data.weekProductionDets && data.weekProductionDets.length > 0) { // @ts-ignore - data.weekProductionDets.map((item,index)=>{ + data.weekProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("YYYY/MM/DD"),item.inputNum,item.outputNum); arr2.push(arrInner); @@ -112,7 +112,7 @@ function RightDown() { // @ts-ignore if (data.monthProductionDets && data.monthProductionDets.length > 0) { // @ts-ignore - data.monthProductionDets.map((item,index)=>{ + data.monthProductionDets.forEach((item,index)=>{ let arrInner = []; arrInner.push(dayjs(item.recTime).format("YYYY/MM/DD"),item.inputNum,item.outputNum); arr3.push(arrInner); diff --git a/src/page/LinePage5-2/Right/RightUp.tsx b/src/page/LinePage5-2/Right/RightUp.tsx index df58c9e..0ec15dc 100644 --- a/src/page/LinePage5-2/Right/RightUp.tsx +++ b/src/page/LinePage5-2/Right/RightUp.tsx @@ -19,7 +19,7 @@ function RightUp() { // @ts-ignore if (data.sectionDet && data.sectionDet.length > 0) { // @ts-ignore - data.sectionDet.map((item, index) => { + data.sectionDet.forEach((item, index) => { let arrInner = [] arrInner.push(index + 1, item.lineName, item.inputNum, item.outputNum) arr.push(arrInner) diff --git a/src/store/UpdateData.tsx b/src/store/UpdateData.tsx index c8162ab..4b1a019 100644 --- a/src/store/UpdateData.tsx +++ b/src/store/UpdateData.tsx @@ -1,4 +1,4 @@ -import React, {useState} from "react"; +import {useState} from "react"; import {useAppDispatch} from "./hooks"; import axios from "axios";