diff --git a/src/pages/Measure.tsx b/src/pages/Measure.tsx index a130a29..54df86f 100644 --- a/src/pages/Measure.tsx +++ b/src/pages/Measure.tsx @@ -11,7 +11,7 @@ import { useEffect, useRef, useState } from 'react'; import RailTypeBtn from '../components/RailTypeBtn'; import { Cascader, Dialog, Mask, Picker, SpinLoading, Toast } from 'antd-mobile'; import { useAppDispatch, useAppSelector } from '../utils/hooks'; -import { updateMeasureData, updateTaskState } from '../store/features/measureSlice'; +import { updateMeasureData, updateTaskState, updateMeasureStatus } from '../store/features/measureSlice'; import Bridge from '../utils/bridge'; import { selectLabeledKtjOrgs, updateRailPoints } from '../store/features/baseData'; import { updateOrg } from '../store/features/contextSlice'; @@ -104,11 +104,15 @@ export default function Measure() { if(measureState.measureStatus === 'FINISH_RECORD'){ setCaloading(true) } - else { - setCaloading(false) - } }, [measureState.measureStatus]) + + useEffect(() => { + return () => { + dispatch(updateMeasureStatus('')) + } + }, []) + const onSaveClick = () => { dispatch(updateMeasureData(newMeasureData)); navigate('/measure/save'); diff --git a/src/store/features/measureSlice.ts b/src/store/features/measureSlice.ts index f9a9cf0..f5475af 100644 --- a/src/store/features/measureSlice.ts +++ b/src/store/features/measureSlice.ts @@ -34,6 +34,9 @@ export const measureSlice = createSlice({ name: 'measure', initialState, reducers: { + updateMeasureStatus: (state, action: PayloadAction) => { + state.measureStatus = action.payload + }, updateTaskState: (state, action: PayloadAction) => { console.log('action.payload---', action.payload) if ( @@ -89,5 +92,5 @@ export const measureSlice = createSlice({ }, }); -export const { updateTaskState, addNewPoint, resetState, updateMeasureData, updateMeasureFinish } = measureSlice.actions; +export const { updateTaskState, addNewPoint, resetState, updateMeasureData,updateMeasureStatus, updateMeasureFinish } = measureSlice.actions; export default measureSlice.reducer;