Browse Source

fix:loading修改2

master
guoapeng 2 months ago
parent
commit
fba6649c14
  1. 12
      src/pages/Measure.tsx
  2. 5
      src/store/features/measureSlice.ts

12
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');

5
src/store/features/measureSlice.ts

@ -34,6 +34,9 @@ export const measureSlice = createSlice({
name: 'measure',
initialState,
reducers: {
updateMeasureStatus: (state, action: PayloadAction<string>) => {
state.measureStatus = action.payload
},
updateTaskState: (state, action: PayloadAction<TaskState['data']>) => {
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;
Loading…
Cancel
Save