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

Compare commits

merge into: mt-fe-group:zjl
Branches Tags
mt-fe-group:master mt-fe-group:zjl
...
pull from: mt-fe-group:master
Branches Tags
mt-fe-group:master mt-fe-group:zjl

7 Commits
zjl ... master

Author SHA1 Message Date
zwq
025366bb65 更新折线图显示数值 2025-08-26 16:04:56 +08:00
gtz
aaa420822d 1 2025-08-25 15:33:01 +08:00
朱菊兰
5feeded363 Merge pull request '改变链接位置，改成在每个页面链接' (#7) from zjl into master 
Reviewed-on: #7
 2025-03-06 08:29:19 +08:00
朱菊兰
60786f59b8 Merge pull request '接口后面加随机数' (#6) from zjl into master 
Reviewed-on: #6
 2025-02-27 08:57:40 +08:00
朱菊兰
bff87fbcee Merge pull request 'zjl' (#5) from zjl into master 
Reviewed-on: #5
 2025-02-21 16:04:53 +08:00
juzi
c12c0e72e9 Merge pull request 'zjl' (#4) from zjl into master 
Reviewed-on: #4
 2024-09-11 10:18:49 +08:00
juzi
5355d9f99b Merge pull request 'zjl' (#1) from zjl into master 
Reviewed-on: #1
 2024-08-27 15:49:13 +08:00
32 changed files with 336 additions and 326 deletions
Expand all files Collapse all files

10
src/page/Component/LineChartRight/chart.config.ts
View File

@@ -80,6 +80,11 @@ export default function getOptions(tempData: any) {
symbol: "circle", symbol: "circle",
symbolSize: 4, symbolSize: 4,
data: tempData.input, data: tempData.input,
label: {
show: true,
position: 'top',
color:'inherit'
},
}, },
{ {
name: "产出", name: "产出",
@@ -87,6 +92,11 @@ export default function getOptions(tempData: any) {
symbol: "circle", symbol: "circle",
symbolSize: 4, symbolSize: 4,
data: tempData.output, data: tempData.output,
label: {
show: true,
position: 'top',
color:'inherit'
},
}, },
], ],
tooltip: { tooltip: {

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

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

84
src/page/LinePage1-1/Left/LeftUp.tsx
View File

@@ -82,20 +82,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.day.series.push({ // dataSource.day.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.day.xData = [] dataSource.day.xData = []
dataSource.day.series = [] dataSource.day.series = []
@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage1-1/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine1Before } from "../../store/LinePageSlice"; import { UpdateLine1Before } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket1_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=1-1-" + Date.now()); let websocket1_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=1-1-" + Date.now());
// @ts-ignore // @ts-ignore

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

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

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

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

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

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine1After } from "../../store/LinePageSlice"; import { UpdateLine1After } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket1_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=1-2-" + Date.now()); let websocket1_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=1-2-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage2-1/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage2-1/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage2-1/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine2Before } from "../../store/LinePageSlice"; import { UpdateLine2Before } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket2_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=2-1-" + Date.now()); let websocket2_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=2-1-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage2-2/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage2-2/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage2-2/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine2After } from "../../store/LinePageSlice"; import { UpdateLine2After } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket2_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=2-2-" + Date.now()); let websocket2_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=2-2-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage3-1/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage3-1/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage3-1/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine3Before } from "../../store/LinePageSlice"; import { UpdateLine3Before } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket3_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=3-1-" + Date.now()); let websocket3_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=3-1-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage3-2/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage3-2/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage3-2/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine3After } from "../../store/LinePageSlice"; import { UpdateLine3After } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket3_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=3-2-" + Date.now()); let websocket3_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=3-2-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage4-1/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage4-1/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage4-1/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine4Before } from "../../store/LinePageSlice"; import { UpdateLine4Before } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket4_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=4-1-" + Date.now()); let websocket4_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=4-1-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage4-2/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage4-2/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage4-2/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine4After } from "../../store/LinePageSlice"; import { UpdateLine4After } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket4_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=4-2-" + Date.now()); let websocket4_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=4-2-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage5-1/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage5-1/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -219,20 +219,20 @@ function LeftUp() {
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage5-1/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine5Before } from "../../store/LinePageSlice"; import { UpdateLine5Before } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket5_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=5-1-" + Date.now()); let websocket5_1 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=5-1-" + Date.now());
// @ts-ignore // @ts-ignore

2
src/page/LinePage5-2/Center/CenterDown.tsx
View File

@@ -102,7 +102,7 @@ function CenterDown() {
// @ts-ignore // @ts-ignore
data.weekProductionRates[keys[0]].forEach((item,index)=>{ data.weekProductionRates[keys[0]].forEach((item,index)=>{
// @ts-ignore // @ts-ignore
dataSource.week.xData.push(dayjs(item.recTime).format("HH:mm")) dataSource.week.xData.push(dayjs(item.recTime).format("MM-DD"))
}) })
keys.forEach((item,index)=>{ keys.forEach((item,index)=>{
let obj = { let obj = {

56
src/page/LinePage5-2/Left/LeftUp.tsx
View File

@@ -150,20 +150,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.week.series.push({ //dataSource.week.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.week.xData = [] dataSource.week.xData = []
dataSource.week.series = [] dataSource.week.series = []
@@ -218,20 +218,20 @@ function LeftUp() {
} }
sum.push(sumIner) sum.push(sumIner)
} }
dataSource.month.series.push({ // dataSource.month.series.push({
data: sum, // data: sum,
type: "bar", // type: "bar",
stack: "a", // stack: "a",
name: "", // name: "",
label: { // label: {
show: true, // show: true,
position: "top", // position: "top",
color: "#fff", // color: "#fff",
formatter: function (params: any) { // formatter: function (params: any) {
return sum[params.dataIndex]; // return sum[params.dataIndex];
}, // },
}, // },
}) // })
}else{ }else{
dataSource.month.xData = [] dataSource.month.xData = []
dataSource.month.series = [] dataSource.month.series = []

4
src/page/LinePage5-2/index.tsx
View File

@@ -9,8 +9,8 @@ import { useDispatch } from 'react-redux';
import { UpdateLine5After } from "../../store/LinePageSlice"; import { UpdateLine5After } from "../../store/LinePageSlice";
function LinePage() { function LinePage() {
const dispatch = useDispatch(); const dispatch = useDispatch();
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
useEffect(() => { useEffect(() => {
let websocket5_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=5-2-" + Date.now()); let websocket5_2 = new WebSocket("ws://" + myUrl + "/websocket/message?userId=5-2-" + Date.now());
// @ts-ignore // @ts-ignore

4
src/store/UpdateData.tsx
View File

@@ -21,8 +21,8 @@ function UpdateData() {
// .then((r) => { // .then((r) => {
// setUrl(r.data.url) // setUrl(r.data.url)
// }) // })
// const myUrl = "192.168.8.22" const myUrl = "192.168.8.22"
const myUrl = window.location.host; // const myUrl = window.location.host;
let websocketAllLine = null; let websocketAllLine = null;
// let websocket1_1 = null; // let websocket1_1 = null;
// let websocket1_2 = null; // let websocket1_2 = null;