diff --git a/src/App.tsx b/src/App.tsx index 19a1ef4..bd5288d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -34,7 +34,6 @@ function App() { // 监听推送消息,更新store useEffect(() => { const subscription = bridgeOb.subscribe((datagram) => { - // console.log('datagram.type--', datagram.type) if (datagram.type === 'measure-event') { dispatch(updateTaskState(datagram.data)); } else if (datagram.type === 'measure-point') { diff --git a/src/pages/Measure.tsx b/src/pages/Measure.tsx index 5cb4c21..4e54c76 100644 --- a/src/pages/Measure.tsx +++ b/src/pages/Measure.tsx @@ -89,13 +89,13 @@ export default function Measure() { // 左右两测量完成,转换后的测量线(两线合一线) useEffect(() => { - if (canvasRef.current) { - canvasRef.current?.setMeasurementCalibrationData(measureState.measureData); + if (canvasRef.current && measureState.measureFinishData.length) { + canvasRef.current?.setMeasurementCalibrationData(measureState.measureFinishData); // setshowCalibration(true); setShowMeasureFinish(true) setCaloading(false) } - }, [measureState.measureData]) + }, [measureState.measureFinishData]) useEffect(() => { if(measureState.measureStatus === 'FINISH_RECORD'){ @@ -137,6 +137,7 @@ export default function Measure() { const [initStart, setInitStart] = useState(false); const onStartClick = () => { setshowCalibration(false); + setShowMeasureFinish(false) dispatch(updateMeasureData([])); if (!contextState.device.connected) { Dialog.alert({ diff --git a/src/store/features/measureSlice.ts b/src/store/features/measureSlice.ts index 4934a9f..f9a9cf0 100644 --- a/src/store/features/measureSlice.ts +++ b/src/store/features/measureSlice.ts @@ -7,7 +7,8 @@ export interface MeasureState { leftPoints: TrackRecordSig['data'][]; rightPoints: TrackRecordSig['data'][]; measureData:[], - measureStatus: string + measureStatus: string, + measureFinishData: [] } const initialState: MeasureState = { taskState: undefined, @@ -16,6 +17,7 @@ const initialState: MeasureState = { rightPoints: [], measureData: [], measureStatus: '', + measureFinishData: [], }; function isLeftFinished(state: MeasureState) { @@ -82,7 +84,7 @@ export const measureSlice = createSlice({ // if(payload.outline2 && payload.outline2.length){ // state.leftPoints = payload.outline2 // } - state.measureData = payload + state.measureFinishData = payload }, }, });