From 72a500e58438d51c6a7b5d9efef5eb8981498459 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 16 Apr 2025 14:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E9=87=8F=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.tsx                      | 5 +++--
 src/index.tsx                                  | 4 ++--
 src/pages/measure/components/MeasureAction.tsx | 6 ++++++
 src/pages/measure/components/MeasureDetail.tsx | 7 +++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 529dc79..0c13eaf 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -36,12 +36,13 @@ export default function Header() {
 
 	useEffect(() => {
 		if (userInfo.nickname || userInfo.account) {
-			setNickname(userInfo.nickname || userInfo.account);
+			let name = userInfo.nickname || userInfo.account
+			setNickname(name);
 		} else {
 			const user = localStorage.getItem("user");
 			if (user) {
 				let userData = JSON.parse(user || "");
-				setNickname(userData.nickname);
+				setNickname(userData.nickname || userData.account);
 			}
 		}
 	}, [userInfo.nickname, userInfo.account]);
diff --git a/src/index.tsx b/src/index.tsx
index 31d216a..5b5ff51 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import "./index.css";
-import {createBrowserRouter, redirect, RouterProvider} from "react-router-dom";
+import {createHashRouter, redirect, RouterProvider} from "react-router-dom";
 import Login from "./pages/login/Login";
 import Measure from "./pages/measure/Measure";
 import MeasureConfig from "./pages/measure/components/MeasureConfig";
@@ -24,7 +24,7 @@ import store from "./store/index";
 import { ConfigProvider } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
 
-const router = createBrowserRouter([
+const router = createHashRouter([
     {
         path: "/",
         element: <App/>,
diff --git a/src/pages/measure/components/MeasureAction.tsx b/src/pages/measure/components/MeasureAction.tsx
index e8a3845..6499bfc 100644
--- a/src/pages/measure/components/MeasureAction.tsx
+++ b/src/pages/measure/components/MeasureAction.tsx
@@ -32,6 +32,7 @@ const wsClient = createWebSocket(sharedWsUrl);
 export default function MeasureAction() {
 	const dispatch = useAppDispatch();
 	const navigate = useNavigate();
+	const deviceInfo = useAppSelector(store => store.context.device);
 	const measureState = useAppSelector((store) => store.measureState);
 	const [gxCode, setGxCode] = useState<string>(GX_CODE)
 	
@@ -118,6 +119,11 @@ export default function MeasureAction() {
 
 	// 开始/重新测量按钮点击事件
 	const onStart = useCallback(() => {
+		//电量低于20%时不可进行测量
+		if(deviceInfo.power < 20){
+			message.error('电量低于20%，请充电后再测量！')
+			return
+		}
 		// 重置测量相关状态
 		setMeasurementFinished(false);
 		setAnalysisReport(null);
diff --git a/src/pages/measure/components/MeasureDetail.tsx b/src/pages/measure/components/MeasureDetail.tsx
index b362548..129204b 100644
--- a/src/pages/measure/components/MeasureDetail.tsx
+++ b/src/pages/measure/components/MeasureDetail.tsx
@@ -221,8 +221,11 @@ export default function MeasureDetail() {
 	const getMeasurePoints = (recordItem:DetailTable) => {
 		getPointsById({id:recordItem.id}).then(res=>{
 			if (canvasRef.current) {
-				canvasRef.current.setMeasurementDataLeft(res.data.leftPoints)
-				canvasRef.current.setMeasurementDataRight(res.data.rightPoints)
+				// canvasRef.current.setMeasurementDataLeft(res.data.leftPoints)
+				// canvasRef.current.setMeasurementDataRight(res.data.rightPoints)
+				
+				setshowCalibration(true)
+				canvasRef.current?.setMeasurementCalibrationData(res.data.alignPoints)
 			}
 		})
 	}