Browse Source

fix:导出

master
guoapeng 2 months ago
parent
commit
3be0f2b8e2
  1. 17
      src/pages/MeasureSave.tsx
  2. 19
      src/pages/MeasurementList.tsx
  3. 9
      src/utils/bridge.ts

17
src/pages/MeasureSave.tsx

@ -19,13 +19,25 @@ export default function MeasureSave() {
const measureState = useAppSelector((state) => state.measure);
const orgTextArr = useAppSelector(selectOrgTextArr);
const getDate = () => {
const currentDate = new Date(); // 获取当前时间
const year = currentDate.getFullYear(); // 获取完整的年份
const month = currentDate.getMonth() + 1; // 获取月份(0-11),需要加1
const day = currentDate.getDate(); // 获取日
// @ts-ignore
return year + (month < 10 ? "0" + month : month) + (day < 10 ? "0" + day : day); // 格式化日期为YYYY-MM-DD格式
}
const loadData = useCallback(() => {
Bridge.getRecordList({ pageNum: 1, size: 1 }).then((res) => {
if (res.success && res.data.list.length) {
const data = res.data.list[0]?.records?.[0]
const data = (sessionStorage.getItem('measureData') ? JSON.parse(sessionStorage.getItem('measureData')!) : false) || res.data.list[0]?.records?.[0]
console.log(data)
setName(data?.name)
let num = data?.todayNumber || 0
setName(`${data?.tljCode}-${data.gwdCode}-${data.xmCode}-${getDate()}${(Number(num) + 1).toString().padStart(4, '0') }`)
setBatch(data?.batch)
setMile(data?.mileage?.split('+')?.[0])
setMeter(data?.mileage?.split('+')?.[1])
@ -155,6 +167,7 @@ export default function MeasureSave() {
if(measureData && measureData.length){
dto.alignPoints = measureData
}
sessionStorage.setItem('measureData', JSON.stringify(measureData))
Bridge.saveMeasure(dto).then((res) => {
if (res.success) {
Toast.show('保存成功');

19
src/pages/MeasurementList.tsx

@ -100,6 +100,15 @@ export default function MeasurementList() {
});
};
const onDownloadClick = async () => {
const res = await Bridge.downloadRecords({ ids: selectedIds });
if (res.success) {
Toast.show('已经开始导出');
} else {
Toast.show(res.message);
}
}
const right = (
<div className="flex justify-end gap-x-2" style={{ fontSize: 24 }}>
{/* <SearchOutline onClick={() => navigate('/measure/search')} /> */}
@ -140,7 +149,15 @@ export default function MeasurementList() {
<button
disabled={selectedIds.length === 0}
className="btn-contained rounded-md flex-1"
onClick={onDeleteClick}
onClick={onDownloadClick}
>
</button>
<button
disabled={selectedIds.length === 0}
className="btn-contained rounded-md flex-1"
style={{backgroundColor: 'red'}}
onClick={onDeleteClick}
>
</button>

9
src/utils/bridge.ts

@ -314,6 +314,15 @@ export default class Bridge {
params,
});
}
static downloadRecords(params: { ids: number[] }) {
return httpRequest<BridgeBaseResult>({
url: '/api/record/download',
method: 'POST',
params,
});
}
static uploadRecords(params: { ids: number[] }) {
return httpRequest<BridgeBaseResult>({
url: '/api/sync/add',

Loading…
Cancel
Save