From 0296a04eb1bbf94d521b917622f37a87ae29f844 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Mon, 9 Jun 2025 01:25:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=9D=E5=AD=98=E5=90=8E=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Measure.tsx              | 22 +++++++++++-----------
 src/pages/MeasureSave.tsx          |  3 ++-
 src/store/features/measureSlice.ts |  9 ++++++++-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/pages/Measure.tsx b/src/pages/Measure.tsx
index 21edf09..0dabcf0 100644
--- a/src/pages/Measure.tsx
+++ b/src/pages/Measure.tsx
@@ -55,17 +55,17 @@ export default function Measure() {
     }
   }
 
-  useEffect(() => {
-   setTimeout(() => {
-     setShowStandard(false)
-     setMeasurementCanvasKey(measurementCanvasKey + 1)
-   }, 1000)
-
-    return () =>{
-      console.log(111)
-      setMeasurementCanvasKey(measurementCanvasKey + 1)
-    }
-  }, []);
+  // useEffect(() => {
+  //  // setTimeout(() => {
+  //  //   setShowStandard(false)
+  //  //   setMeasurementCanvasKey(measurementCanvasKey + 1)
+  //  // }, 1000)
+  //
+  //   return () =>{
+  //     console.log(111)
+  //     setMeasurementCanvasKey(measurementCanvasKey + 1)
+  //   }
+  // }, []);
 
 
 
diff --git a/src/pages/MeasureSave.tsx b/src/pages/MeasureSave.tsx
index 5221966..d211167 100644
--- a/src/pages/MeasureSave.tsx
+++ b/src/pages/MeasureSave.tsx
@@ -6,7 +6,7 @@ import { useAppDispatch, useAppSelector } from '../utils/hooks';
 import { DATA_SOURCE, LINE_CLASSIFY, UNIT_TYPES, XB_CODES } from '../utils/constant';
 import { ExtraDesc, MeasurementDTO } from '../services/apiTypes';
 import Bridge from '../utils/bridge';
-import { resetState } from '../store/features/measureSlice';
+import {clearData, resetState} from '../store/features/measureSlice';
 import { selectOrgTextArr } from '../store';
 
 export default function MeasureSave() {
@@ -161,6 +161,7 @@ export default function MeasureSave() {
         setTimeout(() => {
           navigate('/home/measure');
           dispatch(resetState());
+          dispatch(clearData());
         }, 300);
       } else {
         Toast.show(res.message);
diff --git a/src/store/features/measureSlice.ts b/src/store/features/measureSlice.ts
index f5475af..50e0191 100644
--- a/src/store/features/measureSlice.ts
+++ b/src/store/features/measureSlice.ts
@@ -34,6 +34,13 @@ export const measureSlice = createSlice({
   name: 'measure',
   initialState,
   reducers: {
+    clearData: (state) => {
+      state.measureFinishData = [];
+      state.leftPoints = [];
+      state.rightPoints = [];
+      state.measureData = [];
+      state.measureStatus = '';
+    },
     updateMeasureStatus: (state, action: PayloadAction<string>) => {
       state.measureStatus = action.payload
     },
@@ -92,5 +99,5 @@ export const measureSlice = createSlice({
   },
 });
 
-export const { updateTaskState, addNewPoint, resetState, updateMeasureData,updateMeasureStatus,  updateMeasureFinish } = measureSlice.actions;
+export const { updateTaskState, addNewPoint, resetState, updateMeasureData,updateMeasureStatus,  updateMeasureFinish, clearData } = measureSlice.actions;
 export default measureSlice.reducer;