Browse Source

fix: bug修复2

master
guoapeng 1 month ago
parent
commit
5e2c793165
  1. 11
      src/index.css
  2. 14
      src/pages/Measure.tsx
  3. 2
      src/pages/MeasureSave.tsx
  4. 21
      src/pages/Mine2.tsx
  5. 6
      src/utils/helper.ts

11
src/index.css

@ -68,6 +68,7 @@
}
}
body {
user-select: none;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
@ -87,3 +88,13 @@ code {
.adm-tab-bar-wrap {
height: var(--tabBarHeight);
}
.icon-button {
transition: all 0.1s ease;
opacity: 1;
}
.icon-button:active {
opacity: 0.6; /* 按下变暗 */
transform: scale(0.9); /* 轻微缩小 */
}

14
src/pages/Measure.tsx

@ -419,7 +419,7 @@ export default function Measure() {
timerRef.current = setInterval(() => {
console.log('111!');
onHandleMove(type);
}, 500);
}, 100);
console.log(timerRef.current)
};
@ -576,7 +576,7 @@ export default function Measure() {
onTouchStart={() => handlePressStart('left')}
onTouchEnd={handlePressEnd}
onContextMenu={handleContextMenu}
className="text-[20px] ml-[5px]"
className="text-[20px] ml-[5px] icon-button"
alt="左移"
/>
@ -587,7 +587,7 @@ export default function Measure() {
onTouchStart={() => handlePressStart('right')}
onTouchEnd={handlePressEnd}
onContextMenu={handleContextMenu}
className="text-[20px] ml-[5px]"
className="text-[20px] ml-[5px] icon-button"
alt="右移"
/>
@ -598,7 +598,7 @@ export default function Measure() {
onTouchStart={() => handlePressStart('up')}
onTouchEnd={handlePressEnd}
onContextMenu={handleContextMenu}
className="text-[20px] ml-[5px]"
className="text-[20px] ml-[5px] icon-button"
alt="上移"
/>
@ -609,7 +609,7 @@ export default function Measure() {
onTouchStart={() => handlePressStart('down')}
onTouchEnd={handlePressEnd}
onContextMenu={handleContextMenu}
className="text-[20px] ml-[5px]"
className="text-[20px] ml-[5px] icon-button"
alt="下移"
/>
@ -620,7 +620,7 @@ export default function Measure() {
onTouchStart={() => handleRotationPressStart('left')}
onTouchEnd={handlePressEnd}
onContextMenu={handleContextMenu}
className="text-[20px] ml-[5px]"
className="text-[20px] ml-[5px] icon-button"
alt="逆时针旋转"
/>
@ -631,7 +631,7 @@ export default function Measure() {
onTouchStart={() => handleRotationPressStart('right')}
onTouchEnd={handlePressEnd}
onContextMenu={handleContextMenu}
className="text-[20px] ml-[5px]"
className="text-[20px] ml-[5px] icon-button"
alt="顺时针旋转"
/>
</section>

2
src/pages/MeasureSave.tsx

@ -49,7 +49,7 @@ export default function MeasureSave() {
console.log('res', res)
const data = res.data.list[0]?.records?.[0]
let num = isToday(res.data.list[0]?.date) ? data?.todayNumber : 0
setName(`${tlj}-${gwd}-${xm}-${getDate()}${(Number(num) + 1).toString().padStart(4, '0') }`)
setName(`${tlj ? tlj+ '-' : ''}${gwd ? gwd + '-' : ''}${xm ? xm + '-' : ''}${getDate()}${(Number(num) + 1).toString().padStart(4, '0') }`)
setBatch(data?.batch)
setMile(data?.mileage?.split('+')?.[0])
setMeter(data?.mileage?.split('+')?.[1])

21
src/pages/Mine2.tsx

@ -32,7 +32,6 @@ export default function Mine2() {
Toast.show(res.message);
}
}
};
return (
@ -91,33 +90,35 @@ export default function Mine2() {
</Grid.Item>
</Grid>
)}
{measureState.version.sn && (
{measureState.version.hfwVersion && (
<Grid columns={2} gap={2}>
<Grid.Item>
<span style={{ display: 'inline-block', textAlign: 'right', minWidth: '100px' }}>SN码</span>
<span style={{ display: 'inline-block',textAlign: 'right', minWidth: '100px' }}></span>
</Grid.Item>
<Grid.Item>
<span>{measureState.version.sn}</span>
<span>{measureState.version.hfwVersion}</span>
</Grid.Item>
</Grid>
)}
{measureState.version.hfwVersion && (
{measureState.version.sfwVersion && (
<Grid columns={2} gap={2}>
<Grid.Item>
<span style={{ display: 'inline-block',textAlign: 'right', minWidth: '100px' }}></span>
<span style={{ display: 'inline-block', textAlign: 'right', minWidth: '100px' }}></span>
</Grid.Item>
<Grid.Item>
<span>{measureState.version.hfwVersion}</span>
<span>{measureState.version.sfwVersion}</span>
</Grid.Item>
</Grid>
)}
{measureState.version.sfwVersion && (
{measureState.version.sn && (
<Grid columns={2} gap={2}>
<Grid.Item>
<span style={{ display: 'inline-block', textAlign: 'right', minWidth: '100px' }}></span>
<span style={{ display: 'inline-block', textAlign: 'right', minWidth: '100px' }}>SN码</span>
</Grid.Item>
<Grid.Item>
<span>{measureState.version.sfwVersion}</span>
<span>{measureState.version.sn}</span>
</Grid.Item>
</Grid>
)}

6
src/utils/helper.ts

@ -32,12 +32,12 @@ export function labeledKtjOrgs(ktjOrgs: KTJOrg[]): LabelKTJOrg[] {
});
}
export function textsOfKeys(keys: string[], orgs: LabelKTJOrg[]): string[] {
export function textsOfKeys(keys: string[], orgs: LabelKTJOrg[]): (string | undefined)[] {
const l1 = orgs.find((item) => item.value === keys[0]);
if (!l1) return [];
const l2 = l1.children.find((item) => item.value === keys[1]);
if (!l2) return [];
const l3 = l2.children.find((item) => item.value === keys[2]);
if (!l3) return [];
return [l1.label, l2.label, l3.label];
// if (!l3) return [];
return [l1.label, l2.label, l3?.label];
}
Loading…
Cancel
Save