mt-fe-group/luoyang-screen
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

改变链接位置，改成在每个页面链接

Browse Source
This commit is contained in:
朱菊兰
2025-03-06 08:27:31 +08:00
parent 45c8563892
commit 40791bc619
57 changed files with 657 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/page/LinePage1-2/Center/CenterDown.tsx
View File

@@ -29,7 +29,7 @@ function CenterDown() {
{ name: "周", ename: "week" },
{ name: "月", ename: "month" },
];
const [activeName, setActiveName] = useState<string>(nameList[1].ename);
const [activeName] = useState<string>(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() {
{<ReactECharts option={options} style={{ height: "100%" }} />}
</div>
)}
{chartData.xData.length==0 && (
{chartData.xData.length===0 && (
<p
style={{
color: "#cccf",

6
src/page/LinePage1-2/Left/LeftDown.tsx
View File

@@ -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);

12
src/page/LinePage1-2/Left/LeftUp.tsx
View File

@@ -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

6
src/page/LinePage1-2/Right/RightDown.tsx
View File

@@ -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);

2
src/page/LinePage1-2/Right/RightUp.tsx
View File

@@ -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)

24
src/page/LinePage1-2/index.tsx
View File

@@ -5,7 +5,31 @@ import Right from "./Right";
import Center from "./Center";
import {useEffect} from 'react';
import {useNavigate} from "react-router-dom";
import { useDispatch } from 'react-redux';
import { UpdateLine1After } from "../../store/LinePageSlice";
function LinePage() {
const dispatch = useDispatch();
// const myUrl = "192.168.8.22"
const myUrl = window.location.host;
useEffect(() => {
let websocket1_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=1-2-" + Date.now());
// @ts-ignore
websocket1_2.onmessage = function (event) {
let msgData = event.data
try {
msgData = JSON.parse(event.data);
} catch (error) {
console.log("websocket: [unable to msgData] : ", event.data);
}
if (!Object.prototype.toString.call(msgData).includes('Object')) return;
dispatch(UpdateLine1After(msgData));
}
// 清理函数
return () => {
websocket1_2.close();
};
}, [dispatch]);
const navigate = useNavigate();
useEffect(() => {
const handleKeyDown = (event:any) => {