diff --git a/src/components/Modules/KilnInner/Center/videoComponents/EnterToFloor1.jsx b/src/components/Modules/KilnInner/Center/videoComponents/EnterToFloor1.jsx
index 8c755d5..5d27719 100644
--- a/src/components/Modules/KilnInner/Center/videoComponents/EnterToFloor1.jsx
+++ b/src/components/Modules/KilnInner/Center/videoComponents/EnterToFloor1.jsx
@@ -2,12 +2,13 @@ import { motion, AnimatePresence } from "framer-motion";
import { useRef, useEffect, useMemo, useCallback, useState } from "react";
import FeederStatus from "../../../../Common/Feeder";
import TemperatureBottom from "../../../../Common/TemperatureBottom";
+import TemperatureTop from "../../../../Common/TemperatureTop";
+import { useSelector, useDispatch } from "react-redux";
function EnterToFloorOne(props) {
- // const ctx = useContext(SocketContext);
- const ctx = null;
+ const fireInfo = useSelector((state) => state.fireInfo);
+ const fireDir = fireInfo?.fireDirection || null;
- const fireDir = ctx?.runState?.fireDirection || null;
const [fireCanPlay, setFireCanPlay] = useState(false);
const vd = useRef(null);
const show = props.opacity || 0;
@@ -69,10 +70,10 @@ function EnterToFloorOne(props) {
>
)}
-
state.fireInfo);
+ const fireDir = fireInfo?.fireDirection || null;
- const fireDir = ctx?.runState?.fireDirection || null;
const [fireCanPlay, setFireCanPlay] = useState(false);
const vd = useRef(null);
@@ -72,7 +73,7 @@ function FloorOneToTwo(props) {
>
)}
- state.fireInfo);
+ const fireDir = fireInfo?.fireDirection || null;
const [fireCanPlay, setFireCanPlay] = useState(false);
const vd = useRef(null);
@@ -72,15 +73,15 @@ function FloorTwoToOne(props) {
>
)}
-
-
+
)}
diff --git a/src/hooks/useSlider.js b/src/hooks/useSlider.js
index eae1d87..bb23c59 100644
--- a/src/hooks/useSlider.js
+++ b/src/hooks/useSlider.js
@@ -40,7 +40,7 @@ export default function useSlider(defaultSize) {
return () => {
document.removeEventListener('keydown', fn);
- document.getElementById('slider').removeEventListener('mouseleave', fn2);
+ document.getElementById('slider')?.removeEventListener('mouseleave', fn2);
};
}, [value]);
diff --git a/src/index.css b/src/index.css
index b969eb0..844937d 100644
--- a/src/index.css
+++ b/src/index.css
@@ -60,6 +60,8 @@ body {
background: url(./assets/moxing.png) no-repeat;
background-position: 50% 50%;
background-size: 170% 200%;
+ position: relative;
+ z-index: -1;
}
#FullScreen .Main .Center .Button {
diff --git a/src/pages/Home/index.jsx b/src/pages/Home/index.jsx
index 3b2383d..557d0c4 100644
--- a/src/pages/Home/index.jsx
+++ b/src/pages/Home/index.jsx
@@ -49,7 +49,7 @@ export default function Home({ active }) {
-
+
{fireDir && fireDir == "东火" && (
)}
@@ -69,7 +74,12 @@ export default function Home({ active }) {
autoPlay
loop
width={4200}
- style={{ position: "absolute", top: "-180px", left: "-910px" }}
+ style={{
+ position: "absolute",
+ top: "-180px",
+ left: "-910px",
+ zIndex: -1,
+ }}
>
)}
diff --git a/src/store/features/QualityIsraSlice.js b/src/store/features/QualityIsraSlice.js
index 9904b91..abc6e38 100644
--- a/src/store/features/QualityIsraSlice.js
+++ b/src/store/features/QualityIsraSlice.js
@@ -1,7 +1,7 @@
import { createSlice } from "@reduxjs/toolkit";
export const initialState = {
- checkTypeList: [],
+ checkType: [],
dayStatistic: [],
monthStatistic: [],
yearStatistic: [],
@@ -12,8 +12,8 @@ const israSlice = createSlice({
name: "isra",
initialState,
reducers: {
- setCheckTypeList: (state, action) => {
- state.checkTypeList = action.payload;
+ setCheckType: (state, action) => {
+ state.checkType = action.payload;
},
setDayStatistic: (state, action) => {
state.dayStatistic = action.payload;
@@ -32,7 +32,7 @@ const israSlice = createSlice({
export default israSlice.reducer;
export const {
- setCheckTypeList,
+ setCheckType,
setDayStatistic,
setWeekStatistic,
setMonthStatistic,
diff --git a/src/store/features/cuttingSlice.js b/src/store/features/cuttingSlice.js
new file mode 100644
index 0000000..05ccc68
--- /dev/null
+++ b/src/store/features/cuttingSlice.js
@@ -0,0 +1,41 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+export const initialState = {
+ table: [],
+ chart: {
+ year: [],
+ week: [],
+ month: [],
+ day: [],
+ },
+};
+
+const cuttingSlice = createSlice({
+ name: "cutting",
+ initialState,
+ reducers: {
+ setCuttingTable: (state, action) => {
+ console.log("setting cuttting table...");
+ state.table = action.payload;
+ },
+ setCuttingChart: (state, action) => {
+ switch (action.payload.dateType) {
+ case "year":
+ state.chart.year = action.payload.detData;
+ break;
+ case "weekly":
+ state.chart.week = action.payload.detData;
+ break;
+ case "month":
+ state.chart.month = action.payload.detData;
+ break;
+ case "day":
+ state.chart.day = action.payload.detData;
+ break;
+ }
+ },
+ },
+});
+
+export default cuttingSlice.reducer;
+export const { setCuttingTable, setCuttingChart } = cuttingSlice.actions;
diff --git a/src/store/features/kilnSlice.js b/src/store/features/kilnSlice.js
index 8f163ed..78a5bf4 100644
--- a/src/store/features/kilnSlice.js
+++ b/src/store/features/kilnSlice.js
@@ -19,7 +19,7 @@ export const stateNameMap = {
combustionAirPressure: "助燃风压力",
topTemp: "碹顶加权温度",
compressedAirPressure: "压缩气压力",
- meltTemp: "融化加权温度",
+ meltTemp: "熔化加权温度",
};
const kilnSlice = createSlice({
diff --git a/src/store/index.js b/src/store/index.js
index 7a782b4..4cfac66 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -12,6 +12,7 @@ import energySlice from "./features/EnergySlice";
import israReducer from "./features/QualityIsraSlice";
import annealFanFrequenceReducer from "./features/annealFanFrequenceSlice";
import annealFanInfoReducer from "./features/annealFanInfoSlice";
+import cuttingReducer from "./features/cuttingSlice";
export const store = configureStore({
reducer: {
@@ -41,5 +42,7 @@ export const store = configureStore({
energy: energySlice,
// 能耗
isra: israReducer,
+ // 切割
+ cutting: cuttingReducer
},
});
diff --git a/src/utils/checkTypeHelper.ts b/src/utils/checkTypeHelper.ts
index 8883644..4271223 100644
--- a/src/utils/checkTypeHelper.ts
+++ b/src/utils/checkTypeHelper.ts
@@ -14,7 +14,7 @@ type ProductLineItem = {
};
export type MessageItem = {
- checkTypeList: string[];
+ checkType: string[];
dayStatistic?: ProductLineItem[];
weekStatistic?: ProductLineItem[];
monthStatistic?: ProductLineItem[];
diff --git a/src/utils/index.ts b/src/utils/index.ts
index f7076f3..824d016 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -214,11 +214,15 @@ new XClient(
} catch (error) {
console.log("[*] websocket: [unable to serialize] ---> ", msg);
}
+
+ console.log("[ISRA DATA] ---> ", serializedData);
+
if (serializedData == null) return;
+
// 处理 checkTypeList
store.dispatch({
- type: "isra/setCheckTypeList",
- payload: serializedData.checkTypeList,
+ type: "isra/setCheckType",
+ payload: serializedData.checkType,
});
// for (const checkType of serializedData.checkTypeList) {
// store.dispatch({
@@ -251,3 +255,50 @@ new XClient(
}
}
);
+
+type TableDataType = {
+ name: "table";
+ type: "cutting";
+ data: any[];
+};
+type ChartDataType = {
+ name: "chart";
+ type: "cutting";
+ nightPushData: any[];
+ dayPushData: any[];
+ allPushData: any[];
+ dateType: "day" | "week" | "month" | "year";
+};
+// 良品率相关数据
+new XClient(
+ // "ws://10.70.27.122:8080/websocket/message?userId=CUTTING",
+ "ws://10.70.2.2:8080/websocket/message?userId=CUTTING",
+ "CUTTING_DATA",
+ (msg) => {
+ let serializedData: TableDataType | ChartDataType | null = null;
+ try {
+ serializedData = JSON.parse(msg.data);
+ } catch (error) {
+ console.log("[*] websocket: [unable to serialize] ---> ", msg);
+ }
+
+ console.log("[CUTTING DATA] ---> ", serializedData);
+
+ if (serializedData == null) return;
+
+ switch (serializedData.name) {
+ case "table":
+ store.dispatch({
+ type: "cutting/setCuttingTable",
+ payload: serializedData.data,
+ });
+ break;
+ case "chart":
+ store.dispatch({
+ type: "cutting/setCuttingChart",
+ payload: serializedData,
+ });
+ break;
+ }
+ }
+);