From 31977c78455774cc5c1ae2fe2bc5578c014ad068 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 06 三月 2026 13:53:15 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/i18n/en.js | 6 +++---
zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx | 11 ++++++-----
zy-acs-flow/src/i18n/zh.js | 6 +++---
zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx | 15 ++++++++-------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 2 +-
5 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index c1c47d2..89a69d0 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -368,9 +368,9 @@
length: "length",
headOffset: "head (mm)",
tailOffset: "tail (mm)",
- width: "width",
- height: "height",
- liftHeight: "lift height",
+ width: "width (mm)",
+ height: "height (mm)",
+ liftHeight: "lift height (mm)",
diameter: "diameter",
password: "password",
backpack: "backpack",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index dfe7bd8..f44c842 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -368,9 +368,9 @@
length: "闀垮害",
headOffset: "杞﹀ご(姣背)",
tailOffset: "杞﹀熬(姣背)",
- width: "瀹藉害",
- height: "楂樺害",
- liftHeight: "涓惧崌楂樺害",
+ width: "瀹藉害(姣背)",
+ height: "楂樺害(姣背)",
+ liftHeight: "涓惧崌楂樺害(姣背)",
diameter: "鏃嬭浆鐩村緞",
password: "璁惧瀵嗙爜",
backpack: "鑳岀瘬鏁伴噺",
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
index 2b28c0e..7b95205 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
@@ -108,12 +108,12 @@
validate={required()}
/>
</Grid>
- <Grid item xs={4} display="flex" gap={1}>
+ {/* <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.agvModel.length"
source="length"
/>
- </Grid>
+ </Grid> */}
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.agvModel.headOffset"
@@ -132,6 +132,7 @@
<NumberInput
label="table.field.agvModel.width"
source="width"
+ validate={required()}
/>
</Grid>
<Grid item xs={4} display="flex" gap={1}>
@@ -140,19 +141,19 @@
source="height"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.agvModel.liftHeight"
source="liftHeight"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.agvModel.diameter"
source="diameter"
validate={required()}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.agvModel.password"
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx b/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
index ea16391..d93b153 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
@@ -84,10 +84,10 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <NumberInput
+ {/* <NumberInput
label="table.field.agvModel.length"
source="length"
- />
+ /> */}
<NumberInput
label="table.field.agvModel.headOffset"
source="headOffset"
@@ -98,27 +98,28 @@
source="tailOffset"
validate={required()}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<NumberInput
label="table.field.agvModel.width"
source="width"
+ validate={required()}
/>
+ </Stack>
+ <Stack direction='row' gap={2}>
<NumberInput
label="table.field.agvModel.height"
source="height"
/>
- </Stack>
- <Stack direction='row' gap={2}>
<NumberInput
label="table.field.agvModel.liftHeight"
source="liftHeight"
/>
+ </Stack>
+ {/* <Stack direction='row' gap={2}>
<NumberInput
label="table.field.agvModel.diameter"
source="diameter"
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<TextInput
label="table.field.agvModel.password"
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
index d90a532..0c4ce79 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -37,7 +37,7 @@
* Created by vincent on 2023/6/14
*/
@Slf4j
-@Component("mapService")
+@Component
public class MapService {
private static final double EPS = 1e-7;
--
Gitblit v1.9.1