Browse Source

fix:测试bug3

master
guoapeng 2 months ago
parent
commit
27c9c87fe8
  1. 5
      src/components/MeasurementItem.tsx
  2. 13
      src/pages/Measure.tsx
  3. 14
      src/pages/MeasureSave.tsx
  4. 1
      src/pages/Mine.scss

5
src/components/MeasurementItem.tsx

@ -27,9 +27,8 @@ export default function MeasurementItem({
</div>
)}
<main className="flex-1">
<header className="flex items-center gap-2">
<span className="text-sm text-[#606266]">{padNumber(item.todayNumber)}.</span>
<h1 className="text-[15px] font-medium ">{item.name}</h1>
<header className="flex items-center gap-1">
<h1 className="text-[15px] font-medium">{item.name}</h1>
{item.syncStatus === 'finish' && <span className="text-[#04CA17] text-xs"></span>}
</header>
<main className="flex mt-2">

13
src/pages/Measure.tsx

@ -148,6 +148,15 @@ export default function Measure() {
if (res.success) {
dispatch(updateMeasureFinish(res.data));
} else {
dispatch(updateMeasureFinish([]));
setState({
left_ready: 'none',
right_ready: 'none',
left_begin: 'none',
right_begin: 'none',
left_end: 'none',
right_end: 'none',
});
Toast.show(res.message);
}
}).finally(() => {
@ -634,14 +643,14 @@ export default function Measure() {
</button>
<button
className="btn-contained rounded-md text-sm h-10 flex-1"
disabled={measureState.taskState !== 'FINISH_RECORD'}
disabled={!measureState.measureFinishData.length}
onClick={onSaveClick}
>
</button>
<button
className="btn-contained rounded-md text-sm h-10 flex-1"
disabled={measureState.taskState !== 'FINISH_RECORD'}
disabled={!measureState.measureFinishData.length}
onClick={onCalibrationBtnClick}
>

14
src/pages/MeasureSave.tsx

@ -30,6 +30,17 @@ export default function MeasureSave() {
return year + (month < 10 ? "0" + month : month) + (day < 10 ? "0" + day : day); // 格式化日期为YYYY-MM-DD格式
}
const isToday = (date:string) => {
const currentDate = new Date(); // 获取当前时间
const targetDate = new Date(date); // 获取当前时间
return (
currentDate.getFullYear() === targetDate.getFullYear() &&
currentDate.getMonth() === targetDate.getMonth() &&
currentDate.getDate() === targetDate.getDate()
)
}
const loadData = useCallback(() => {
Bridge.getRecordList({ pageNum: 1, size: 1 }).then((res) => {
@ -37,8 +48,9 @@ export default function MeasureSave() {
if (res.success && res.data.list.length) {
console.log('res', res)
const data = res.data.list[0]?.records?.[0]
console.log(222, isToday(res.data.list[0]?.date))
console.log(data)
let num = data?.todayNumber || 0
let num = isToday(res.data.list[0]?.date) ? data?.todayNumber : 0
setName(`${tlj}-${gwd}-${xm}-${getDate()}${(Number(num) + 1).toString().padStart(4, '0') }`)
setBatch(data?.batch)
setMile(data?.mileage?.split('+')?.[0])

1
src/pages/Mine.scss

@ -3,4 +3,5 @@
}
.unUpload-list {
height: calc(100vh - var(--navBarHeight) - 80px - 52px - var(--tabBarHeight));
white-space: nowrap;
}
Loading…
Cancel
Save