2 Commits

Author SHA1 Message Date
zhangjiming cd26c5d055 提示等待同步完成 4 months ago
zhangjiming 9e069a54ef 同步完成后获取局/段/线 4 months ago
  1. 21
      src/App.tsx
  2. 20
      src/pages/Measure.tsx

21
src/App.tsx

@ -73,21 +73,24 @@ function App() {
return Toast.show(res.message);
}
if (res.data.needSync) {
dispatch(syncBaseData())
.unwrap()
.then((res) => {
if (res.success) {
dispatch(fetchOrgTree());
} else {
Toast.show(res.message);
}
});
dispatch(syncBaseData());
} else {
dispatch(fetchOrgTree());
}
});
}, [dispatch]);
// 同步完成后,重新获取局/段/线信息
useEffect(() => {
if (
baseState.syncBaseProgress.finish &&
!baseState.syncBaseProgress.error &&
baseState.syncBaseProgress.progress === 100
) {
dispatch(fetchOrgTree());
}
}, [baseState.syncBaseProgress, dispatch]);
// 预获取车站信息
useEffect(() => {
if (contextState.currXMCode) {

20
src/pages/Measure.tsx

@ -13,7 +13,7 @@ import { useAppDispatch, useAppSelector } from '../utils/hooks';
import { updateTaskState } from '../store/features/measureSlice';
import Bridge from '../utils/bridge';
import { selectLabeledKtjOrgs, updateRailPoints } from '../store/features/baseData';
import { refreshStationList, updateOrg } from '../store/features/contextSlice';
import { updateOrg } from '../store/features/contextSlice';
import { selectOrgTextArr } from '../store';
export default function Measure() {
@ -91,6 +91,15 @@ export default function Measure() {
});
return;
}
if (baseState.ktjOrgs.length === 0) {
Dialog.alert({
content: '请在基础数据同步完成后重试',
onConfirm: () => {
navigate('/home/mine');
},
});
return;
}
if (!contextState.currOrgCode) {
Dialog.alert({
content: '请选择铁路局/工务段/线路',
@ -110,6 +119,15 @@ export default function Measure() {
};
const onOrgBarClick = async () => {
if (baseState.ktjOrgs.length === 0) {
Dialog.alert({
content: '请在基础数据同步完成后重试',
onConfirm: () => {
navigate('/home/mine');
},
});
return;
}
const value = await Cascader.prompt({
options: labeledKtjOrgs,
placeholder: '请选择',

Loading…
Cancel
Save