This commit is contained in:
lb 2023-12-15 11:16:54 +08:00
parent bb541962dd
commit 0b91868b4f
5 changed files with 54 additions and 51 deletions

View File

@ -94,69 +94,69 @@
/** center top **/ /** center top **/
.TE227 { .TE227 {
top: 128px; top: 128px;
left: 660px; left: 630px;
} }
.TE229 { .TE229 {
top: 128px; top: 128px;
left: 776px; /* +120px */ left: 746px; /* +120px */
} }
.TE231 { .TE231 {
top: 128px; top: 128px;
left: 896px; left: 866px;
} }
.TE233 { .TE233 {
top: 128px; top: 128px;
left: 1006px; left: 980px;
} }
.TE235 { .TE235 {
top: 128px; top: 128px;
left: 1119px; left: 1100px;
} }
.TE237 { .TE237 {
top: 128px; top: 128px;
left: 1236px; left: 1220px;
} }
.TE239 { .TE239 {
top: 128px; top: 128px;
left: 1346px; left: 1330px;
} }
.TE241 { .TE241 {
top: 128px; top: 128px;
left: 1456px; left: 1450px;
} }
/** center bottom **/ /** center bottom **/
.TE228 { .TE228 {
top: 620px; top: 620px;
left: 628px; left: 600px;
} }
.TE230 { .TE230 {
top: 620px; top: 620px;
left: 750px; left: 720px;
} }
.TE232 { .TE232 {
top: 620px; top: 620px;
left: 870px; left: 850px;
} }
.TE234 { .TE234 {
top: 620px; top: 620px;
left: 995px; left: 970px;
} }
.TE236 { .TE236 {
top: 620px; top: 620px;
left: 1120px; left: 1100px;
} }
.TE238 { .TE238 {
top: 620px; top: 620px;
left: 1245px; left: 1225px;
} }
.TE240 { .TE240 {
top: 620px; top: 620px;
left: 1370px; left: 1350px;
} }
.TE242 { .TE242 {
top: 620px; top: 620px;
left: 1480px; left: 1470px;
} }
/** center middle **/ /** center middle **/
@ -244,7 +244,7 @@
left: 2070px; left: 2070px;
} }
.TE218 { .TE218 {
top: 640px; top: 660px;
left: 2090px; left: 2090px;
} }
.TE219 { .TE219 {
@ -264,7 +264,7 @@
left: 2180px; left: 2180px;
} }
.TE223 { .TE223 {
top: 640px; top: 660px;
left: 2200px; left: 2200px;
} }
.TE224 { .TE224 {
@ -309,69 +309,69 @@
/** center top **/ /** center top **/
.TE333 { .TE333 {
top: 128px; top: 128px;
left: 620px; left: 670px;
} }
.TE335 { .TE335 {
top: 128px; top: 128px;
left: 735px; left: 785px;
} }
.TE337 { .TE337 {
top: 128px; top: 128px;
left: 855px; left: 890px;
} }
.TE339 { .TE339 {
top: 128px; top: 128px;
left: 975px; left: 1010px;
} }
.TE341 { .TE341 {
top: 128px; top: 128px;
left: 1090px; left: 1120px;
} }
.TE343 { .TE343 {
top: 128px; top: 128px;
left: 1205px; left: 1235px;
} }
.TE345 { .TE345 {
top: 128px; top: 128px;
left: 1325px; left: 1345px;
} }
.TE347 { .TE347 {
top: 128px; top: 128px;
left: 1440px; left: 1450px;
} }
/** center bottom **/ /** center bottom **/
.TE334 { .TE334 {
top: 620px; top: 620px;
left: 588px; left: 620px;
} }
.TE336 { .TE336 {
top: 620px; top: 620px;
left: 710px; left: 740px;
} }
.TE338 { .TE338 {
top: 620px; top: 620px;
left: 840px; left: 860px;
} }
.TE340 { .TE340 {
top: 620px; top: 620px;
left: 965px; left: 1000px;
} }
.TE342 { .TE342 {
top: 620px; top: 620px;
left: 1090px; left: 1120px;
} }
.TE344 { .TE344 {
top: 620px; top: 620px;
left: 1215px; left: 1245px;
} }
.TE346 { .TE346 {
top: 620px; top: 620px;
left: 1340px; left: 1370px;
} }
.TE348 { .TE348 {
top: 620px; top: 620px;
left: 1460px; left: 1490px;
} }
/** center middle **/ /** center middle **/

View File

@ -11,7 +11,7 @@ function FeederStatus(props) {
style={{ style={{
position: "absolute", position: "absolute",
bottom: "128px", bottom: "128px",
left: "800px", left: "740px",
width: "300px", width: "300px",
height: "80px", height: "80px",
zIndex: "-1", zIndex: "-1",

View File

@ -2,12 +2,13 @@ import { motion, AnimatePresence } from "framer-motion";
import { useRef, useEffect, useMemo, useCallback, useState } from "react"; import { useRef, useEffect, useMemo, useCallback, useState } from "react";
import FeederStatus from "../../../../Common/Feeder"; import FeederStatus from "../../../../Common/Feeder";
import TemperatureBottom from "../../../../Common/TemperatureBottom"; import TemperatureBottom from "../../../../Common/TemperatureBottom";
import TemperatureTop from "../../../../Common/TemperatureTop";
import { useSelector, useDispatch } from "react-redux";
function EnterToFloorOne(props) { function EnterToFloorOne(props) {
// const ctx = useContext(SocketContext); const fireInfo = useSelector((state) => state.fireInfo);
const ctx = null; const fireDir = fireInfo?.fireDirection || null;
const fireDir = ctx?.runState?.fireDirection || null;
const [fireCanPlay, setFireCanPlay] = useState(false); const [fireCanPlay, setFireCanPlay] = useState(false);
const vd = useRef(null); const vd = useRef(null);
const show = props.opacity || 0; const show = props.opacity || 0;
@ -69,10 +70,10 @@ function EnterToFloorOne(props) {
></video> ></video>
)} )}
<TemperatureBottom <TemperatureTop
style={{ style={{
top: "218px", top: "218px",
left: "688px", left: "678px",
width: "2380px", width: "2380px",
zIndex: 0, zIndex: 0,
}} }}

View File

@ -2,12 +2,13 @@ import { motion, AnimatePresence } from "framer-motion";
import { useRef, useEffect, useMemo, useState } from "react"; import { useRef, useEffect, useMemo, useState } from "react";
import FeederStatus from "../../../../Common/Feeder"; import FeederStatus from "../../../../Common/Feeder";
import TemperatureTop from "../../../../../components/Common/TemperatureTop"; import TemperatureTop from "../../../../../components/Common/TemperatureTop";
import TemperatureBottom from "../../../../Common/TemperatureBottom";
import { useSelector, useDispatch } from "react-redux";
function FloorOneToTwo(props) { function FloorOneToTwo(props) {
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 [fireCanPlay, setFireCanPlay] = useState(false);
const vd = useRef(null); const vd = useRef(null);
@ -72,7 +73,7 @@ function FloorOneToTwo(props) {
></video> ></video>
)} )}
<TemperatureTop <TemperatureBottom
style={{ style={{
top: "208px", top: "208px",
left: "638px", left: "638px",

View File

@ -2,11 +2,12 @@ import { motion, AnimatePresence } from "framer-motion";
import { useRef, useEffect, useMemo, useState } from "react"; import { useRef, useEffect, useMemo, useState } from "react";
import FeederStatus from "../../../../Common/Feeder"; import FeederStatus from "../../../../Common/Feeder";
import TemperatureBottom from "../../../../Common/TemperatureBottom"; import TemperatureBottom from "../../../../Common/TemperatureBottom";
import TemperatureTop from "../../../../Common/TemperatureTop";
import { useSelector, useDispatch } from "react-redux";
function FloorTwoToOne(props) { function FloorTwoToOne(props) {
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 [fireCanPlay, setFireCanPlay] = useState(false);
const vd = useRef(null); const vd = useRef(null);
@ -72,15 +73,15 @@ function FloorTwoToOne(props) {
></video> ></video>
)} )}
<TemperatureBottom <TemperatureTop
style={{ style={{
top: "208px", top: "200px",
left: "638px", left: "628px",
width: "2380px", width: "2380px",
zIndex: 0, zIndex: 0,
}} }}
/> />
<FeederStatus /> <FeederStatus style={{ left: "680px" }} />
</motion.div> </motion.div>
)} )}
</AnimatePresence> </AnimatePresence>