From 3bcd639efc51253cb4b6ce4a5efbc02cc76f08db Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 16 Apr 2025 13:59:53 +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

---
 .env                        |  3 ++-
 src/pages/Measure.tsx       |  5 +++--
 src/pages/MeasureRecord.tsx | 14 +++++++++++---
 src/services/apiTypes.ts    |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index bcf6e24..ce48e88 100644
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
-REACT_APP_WS_URL=127.1.1.0:8080/ws
+# REACT_APP_WS_URL=192.168.1.170:8080/ws
+REACT_APP_WS_URL=127.1.1.0:8080/ws
\ No newline at end of file
diff --git a/src/pages/Measure.tsx b/src/pages/Measure.tsx
index 694494b..128613c 100644
--- a/src/pages/Measure.tsx
+++ b/src/pages/Measure.tsx
@@ -103,6 +103,7 @@ export default function Measure() {
 			}
 			setCaloading(false)
     }).catch(e=>{
+      setCaloading(false)
       Toast.show({
         content: <span>服务器异常</span>,
         position: 'top',
@@ -287,8 +288,8 @@ export default function Measure() {
   	//旋转
 	let [measurementRotation, setMeasurementRotation] = useState<number>(0)
 	let [newMeasureData, setNewMeasureData] = useState<Point[]>()
-	let [angle, setAngle] = useState<number>(60);//角度单位 分
-	let [distance, setDistance] = useState<number>(1000)
+	let [angle, setAngle] = useState<number>(5);//角度单位 分
+	let [distance, setDistance] = useState<number>(100)
   const onRotationLine = (type:string) => {
     let mrValue = 0
 		if(type === 'left'){//逆时针
diff --git a/src/pages/MeasureRecord.tsx b/src/pages/MeasureRecord.tsx
index 1ea4257..1b527bd 100644
--- a/src/pages/MeasureRecord.tsx
+++ b/src/pages/MeasureRecord.tsx
@@ -20,9 +20,10 @@ export default function MeasureRecord() {
   const [measure, setMeasure] = useState<Measurement | undefined>(undefined);
   const canvasRef = useRef<MeasurementCanvasRef>(null);
   const back = () => navigate(-1);
-
+  
   useEffect(() => {
     Bridge.getMeasurementDetail({ id: +(params.recordId || '') }).then((res) => {
+      setshowCalibration(false)
       if (res.success) {
         setMeasure({ ...res.data, extraDescObj: JSON.parse(res.data.extraDesc) });
       } else {
@@ -44,14 +45,20 @@ export default function MeasureRecord() {
       canvasRef.current.setMeasurementDataRight(JSON.parse(rightPoints));
     }
   }
-
+  const [showCalibration, setshowCalibration] = useState(false)
   useEffect(() => {
     if (measure) {
       const r = baseState.railTypes.find((rail) => rail.code === measure.railSize);
       if (!r) return;
       if (!!r.points) {
         drawRailBaseLine(r.points);
-        drawMeasurePoints(measure.leftPoints, measure.rightPoints);
+        // drawMeasurePoints(measure.leftPoints, measure.rightPoints);
+        setshowCalibration(true)
+        if(measure.alignPoints){
+          let alignPoints = JSON.parse(measure.alignPoints)
+          canvasRef.current?.setMeasurementCalibrationData(alignPoints)
+        }
+        
         return;
       }
       Bridge.getTrackPoint({ code: r.code }).then((res) => {
@@ -97,6 +104,7 @@ export default function MeasureRecord() {
               showScale={false}
               scaleInterval={1}
               showCoordinates={false}
+              showCalibration={showCalibration}
               ref={canvasRef}
             />
           </div>
diff --git a/src/services/apiTypes.ts b/src/services/apiTypes.ts
index b343870..755938b 100644
--- a/src/services/apiTypes.ts
+++ b/src/services/apiTypes.ts
@@ -7,6 +7,7 @@ export type Measurement = MeasurementDTO & {
   rightPoints: string; // json: 坐标数组
   syncStatus: 'wait' | 'finish' | 'fail';
   extraDescObj?: ExtraDesc;
+  alignPoints:string;
 };
 
 export type SettingDTO = {