diff --git a/src/components/Header.tsx b/src/components/Header.tsx index 85358b4..edb3ad0 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -66,7 +66,7 @@ export default function Header() { setNickname(userData.nickname); } } - },[userInfo.nickname]); + }, [userInfo.nickname]); const [messageApi, contextHolder] = message.useMessage(); const [nickname, setNickname] = useState(); @@ -152,20 +152,24 @@ export default function Header() { return ( <> {contextHolder} -
-
- 温度:{deviceInfo.temperature.toFixed(1)}℃ - X轴倾斜:{deviceInfo.inclinatorX} - Y轴倾斜:{deviceInfo.inclinatorY} -
-
- -

{deviceInfo.power.toFixed()}%

-
+
+ {deviceInfo.isConnected && ( + <> +
+ 温度:{deviceInfo.temperature.toFixed(1)}℃ + X轴倾斜:{deviceInfo.inclinatorX} + Y轴倾斜:{deviceInfo.inclinatorY} +
+
+ +

{deviceInfo.power.toFixed()}%

+
+ + )} {/*
icon
*/} diff --git a/src/pages/measure/components/MeasureAction.tsx b/src/pages/measure/components/MeasureAction.tsx index b5b36bb..d312b97 100644 --- a/src/pages/measure/components/MeasureAction.tsx +++ b/src/pages/measure/components/MeasureAction.tsx @@ -96,7 +96,7 @@ export default function MeasureAction() { // 开始/重新测量按钮点击事件 const onStart = () => { if (startBtnText === "新测量") { - navigate("../newMeasure"); + navigate("../config"); return; } // 重置测量相关状态