From 3be0f2b8e2bb4eef6ead0b0776be3fe7b3384bbd Mon Sep 17 00:00:00 2001 From: guoapeng Date: Wed, 18 Jun 2025 11:05:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/MeasureSave.tsx | 17 +++++++++++++++-- src/pages/MeasurementList.tsx | 19 ++++++++++++++++++- src/utils/bridge.ts | 9 +++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/pages/MeasureSave.tsx b/src/pages/MeasureSave.tsx index d211167..be8558f 100644 --- a/src/pages/MeasureSave.tsx +++ b/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('保存成功'); diff --git a/src/pages/MeasurementList.tsx b/src/pages/MeasurementList.tsx index f6164cd..e23fc01 100644 --- a/src/pages/MeasurementList.tsx +++ b/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 = (
{/* navigate('/measure/search')} /> */} @@ -140,7 +149,15 @@ export default function MeasurementList() { + diff --git a/src/utils/bridge.ts b/src/utils/bridge.ts index 3674ba4..9fc7e68 100644 --- a/src/utils/bridge.ts +++ b/src/utils/bridge.ts @@ -314,6 +314,15 @@ export default class Bridge { params, }); } + + static downloadRecords(params: { ids: number[] }) { + return httpRequest({ + url: '/api/record/download', + method: 'POST', + params, + }); + } + static uploadRecords(params: { ids: number[] }) { return httpRequest({ url: '/api/sync/add',