diff --git a/src/index.css b/src/index.css
index a8b0b29..837a33b 100644
--- a/src/index.css
+++ b/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); /* 轻微缩小 */
+}
diff --git a/src/pages/Measure.tsx b/src/pages/Measure.tsx
index 9488932..5a41ac0 100644
--- a/src/pages/Measure.tsx
+++ b/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="顺时针旋转"
/>
diff --git a/src/pages/MeasureSave.tsx b/src/pages/MeasureSave.tsx
index 63d20df..0b1a570 100644
--- a/src/pages/MeasureSave.tsx
+++ b/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])
diff --git a/src/pages/Mine2.tsx b/src/pages/Mine2.tsx
index 661ded1..7c091f1 100644
--- a/src/pages/Mine2.tsx
+++ b/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() {
)}
- {measureState.version.sn && (
+
+ {measureState.version.hfwVersion && (
- 设备SN码:
+ 设备硬件版本:
- {measureState.version.sn}
+ {measureState.version.hfwVersion}
)}
- {measureState.version.hfwVersion && (
+ {measureState.version.sfwVersion && (
- 设备硬件版本:
+ 设备软件版本:
- {measureState.version.hfwVersion}
+ {measureState.version.sfwVersion}
)}
- {measureState.version.sfwVersion && (
+
+ {measureState.version.sn && (
- 设备软件版本:
+ 设备SN码:
- {measureState.version.sfwVersion}
+ {measureState.version.sn}
)}
diff --git a/src/utils/helper.ts b/src/utils/helper.ts
index 34af101..c0311c1 100644
--- a/src/utils/helper.ts
+++ b/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];
}