From ed1359a9814a0909222f9d9f52241548a14d5260 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 17 十二月 2025 09:28:16 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/areaSettings/AreaAdvancedTab.jsx | 22 +++++-----
zy-acs-flow/src/i18n/core/zhMap.js | 9 ----
zy-acs-flow/src/i18n/en.js | 30 ++++++++++++++
zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx | 18 ++++----
zy-acs-flow/src/i18n/zh.js | 28 ++++++++++++++
zy-acs-flow/src/map/areaSettings/index.jsx | 4 +-
zy-acs-flow/src/i18n/core/enMap.js | 9 ----
7 files changed, 79 insertions(+), 41 deletions(-)
diff --git a/zy-acs-flow/src/i18n/core/enMap.js b/zy-acs-flow/src/i18n/core/enMap.js
index ad59ddf..102b921 100644
--- a/zy-acs-flow/src/i18n/core/enMap.js
+++ b/zy-acs-flow/src/i18n/core/enMap.js
@@ -1,15 +1,6 @@
const enMap = {
page: {
map: {
- action: {
- addArea: 'Add Area',
- },
- prompt: {
- areaName: 'Please enter area name',
- },
- msg: {
- areaCreated: 'Area "%{name}" created',
- },
},
},
}
diff --git a/zy-acs-flow/src/i18n/core/zhMap.js b/zy-acs-flow/src/i18n/core/zhMap.js
index 4c07dfd..f77b28d 100644
--- a/zy-acs-flow/src/i18n/core/zhMap.js
+++ b/zy-acs-flow/src/i18n/core/zhMap.js
@@ -1,15 +1,6 @@
const zhMap = {
page: {
map: {
- action: {
- addArea: '娣诲姞鍖哄煙',
- },
- prompt: {
- areaName: '璇疯緭鍏ュ尯鍩熷悕绉�',
- },
- msg: {
- areaCreated: '鍖哄煙 "%{name}" 宸插垱寤�',
- },
},
},
}
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 81cbeb8..06e1e1e 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -758,9 +758,37 @@
},
},
area: {
- title: 'AREA',
+ title: 'Area Settings',
+ tabs: {
+ basic: 'Basic',
+ advanced: 'Advanced',
+ },
+ form: {
+ name: 'Name',
+ agv: 'Assign AGVs',
+ agvPlaceholder: 'Select AGVs',
+ codes: 'Codes in area (%{count})',
+ codesEmpty: 'No codes',
+ code: 'Area Code',
+ maxQty: 'Maximum Quantity',
+ speedLimit: 'Speed Limit',
+ startX: 'Start X',
+ startY: 'Start Y',
+ endX: 'End X',
+ endY: 'End Y',
+ memo: 'Memo',
+ priority: 'Priority',
+ },
+ confirm: {
+ save: 'Save current changes?',
+ delete: 'This action cannot be undone. Delete this area?',
+ },
prompt: {
nameInput: 'Please enter area name',
+ areaName: 'Please enter area name',
+ },
+ msg: {
+ areaCreated: 'Area "%{name}" created',
},
},
},
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 2919f32..28cb7bc 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -759,8 +759,36 @@
},
area: {
title: '鍖哄煙璁剧疆',
+ tabs: {
+ basic: '鍩虹',
+ advanced: '楂樼骇',
+ },
+ form: {
+ name: '鍚嶇О',
+ agv: '閫夋嫨AGV灏忚溅',
+ agvPlaceholder: '璇烽�夋嫨AGV',
+ codes: '鍖哄煙鍐呮潯鐮侀泦鍚� (%{count})',
+ codesEmpty: '鏆傛棤鏉＄爜',
+ code: '鍖哄煙缂栫爜',
+ maxQty: '鏈�澶ф暟閲�',
+ speedLimit: '閫熷害闄愬埗',
+ startX: '璧风偣 X',
+ startY: '璧风偣 Y',
+ endX: '缁堢偣 X',
+ endY: '缁堢偣 Y',
+ memo: '澶囨敞',
+ priority: '浼樺厛绾�',
+ },
+ confirm: {
+ save: '纭淇濆瓨褰撳墠淇敼锛�',
+ delete: '鍒犻櫎鍚庡皢鏃犳硶鎭㈠锛岀‘璁ゅ垹闄わ紵',
+ },
prompt: {
nameInput: '璇疯緭鍏ュ尯鍩熷悕绉�',
+ areaName: '璇疯緭鍏ュ尯鍩熷悕绉�',
+ },
+ msg: {
+ areaCreated: '鍖哄煙 "%{name}" 宸插垱寤�',
},
},
},
diff --git a/zy-acs-flow/src/map/areaSettings/AreaAdvancedTab.jsx b/zy-acs-flow/src/map/areaSettings/AreaAdvancedTab.jsx
index 2c5644c..4d58ca1 100644
--- a/zy-acs-flow/src/map/areaSettings/AreaAdvancedTab.jsx
+++ b/zy-acs-flow/src/map/areaSettings/AreaAdvancedTab.jsx
@@ -31,7 +31,7 @@
const handleSubmit = (e) => {
e.preventDefault();
- const confirmMsg = translate('page.map.area.saveConfirm', { _: '纭淇濆瓨褰撳墠淇敼锛�' });
+ const confirmMsg = translate('page.map.area.confirm.save');
if (window.confirm(confirmMsg)) {
onSave?.();
}
@@ -42,7 +42,7 @@
<Grid container spacing={2}>
<Grid item xs={12}>
<TextField
- label={translate('page.map.area.code', { _: '鍖哄煙缂栫爜' })}
+ label={translate('page.map.area.form.code')}
fullWidth
value={areaCode}
onChange={(e) => setAreaCode(e.target.value)}
@@ -50,7 +50,7 @@
</Grid>
<Grid item xs={6}>
<TextField
- label={translate('page.map.area.maxQty', { _: '鏈�澶ф暟閲�' })}
+ label={translate('page.map.area.form.maxQty')}
fullWidth
type="number"
value={maxQty}
@@ -59,7 +59,7 @@
</Grid>
<Grid item xs={6}>
<TextField
- label={translate('page.map.area.speedLimit', { _: '閫熷害闄愬埗' })}
+ label={translate('page.map.area.form.speedLimit')}
fullWidth
type="number"
value={speedLimit}
@@ -68,7 +68,7 @@
</Grid>
<Grid item xs={12} sm={6}>
<TextField
- label={translate('page.map.area.startX', { _: '璧风偣 X' })}
+ label={translate('page.map.area.form.startX')}
fullWidth
value={formatCoord(startPoint?.x)}
InputProps={{ readOnly: true }}
@@ -76,7 +76,7 @@
</Grid>
<Grid item xs={12} sm={6}>
<TextField
- label={translate('page.map.area.startY', { _: '璧风偣 Y' })}
+ label={translate('page.map.area.form.startY')}
fullWidth
value={formatCoord(startPoint?.y)}
InputProps={{ readOnly: true }}
@@ -84,7 +84,7 @@
</Grid>
<Grid item xs={12} sm={6}>
<TextField
- label={translate('page.map.area.endX', { _: '缁堢偣 X' })}
+ label={translate('page.map.area.form.endX')}
fullWidth
value={formatCoord(endPoint?.x)}
InputProps={{ readOnly: true }}
@@ -92,7 +92,7 @@
</Grid>
<Grid item xs={12} sm={6}>
<TextField
- label={translate('page.map.area.endY', { _: '缁堢偣 Y' })}
+ label={translate('page.map.area.form.endY')}
fullWidth
value={formatCoord(endPoint?.y)}
InputProps={{ readOnly: true }}
@@ -100,7 +100,7 @@
</Grid>
<Grid item xs={12}>
<TextField
- label={translate('page.map.area.priority', { _: '浼樺厛绾�' })}
+ label={translate('page.map.area.form.priority')}
fullWidth
type="number"
value={priority}
@@ -109,7 +109,7 @@
</Grid>
<Grid item xs={12}>
<TextField
- label={translate('page.map.area.shape', { _: '澶囨敞' })}
+ label={translate('page.map.area.form.memo')}
fullWidth
multiline
minRows={3}
@@ -119,7 +119,7 @@
</Grid>
<Grid item xs={12}>
<Button variant="contained" type="submit">
- {translate('common.action.save', { _: '淇濆瓨' })}
+ {translate('ra.action.save')}
</Button>
</Grid>
</Grid>
diff --git a/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx b/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
index 1ae729a..c024488 100644
--- a/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
+++ b/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
@@ -52,7 +52,7 @@
if (disableSave) {
return;
}
- const confirmMsg = translate('page.map.area.saveConfirm', { _: '纭淇濆瓨褰撳墠淇敼锛�' });
+ const confirmMsg = translate('page.map.area.confirm.save');
if (window.confirm(confirmMsg)) {
onSave?.();
}
@@ -62,7 +62,7 @@
if (!canDelete) {
return;
}
- const confirmMsg = translate('page.map.area.deleteConfirm', { _: '鍒犻櫎鍚庡皢鏃犳硶鎭㈠锛岀‘璁ゅ垹闄わ紵' });
+ const confirmMsg = translate('page.map.area.confirm.delete');
if (window.confirm(confirmMsg)) {
onDelete?.();
}
@@ -72,7 +72,7 @@
<Stack spacing={3} sx={{ mt: 1 }}>
<Stack direction="row" spacing={1} alignItems="center">
<TextField
- label={translate('page.map.area.name', { _: '鍚嶇О' })}
+ label={translate('page.map.area.form.name')}
size="small"
fullWidth
variant="outlined"
@@ -83,7 +83,7 @@
<Box >
<Typography variant="subtitle2" gutterBottom>
- {translate('page.map.area.agv', { _: '閫夋嫨AGV灏忚溅' })}
+ {translate('page.map.area.form.agv')}
</Typography>
<Autocomplete
multiple
@@ -143,7 +143,7 @@
{...params}
size="small"
variant="outlined"
- placeholder={translate('page.map.area.agv.placeholder', { _: '' })}
+ placeholder={translate('page.map.area.form.agvPlaceholder')}
/>
)}
/>
@@ -151,7 +151,7 @@
<Box>
<Typography variant="subtitle2" gutterBottom>
- {translate('page.map.area.barcodes', { _: '鍖哄煙鍐呮潯鐮侀泦鍚�' }) + " (" + codeList.length + ")"}
+ {translate('page.map.area.form.codes', { count: codeList.length })}
</Typography>
<Paper
variant="outlined"
@@ -176,7 +176,7 @@
))
) : (
<Typography variant="body2" color="text.secondary">
- {translate('page.map.area.barcodes.empty', { _: '鏆傛棤鏉＄爜' })}
+ {translate('page.map.area.form.codesEmpty')}
</Typography>
)}
</Paper>
@@ -184,10 +184,10 @@
<Box display="flex" justifyContent="space-between" alignItems="center">
<Button variant="contained" onClick={handleSaveClick} disabled={disableSave}>
- {translate('common.action.save', { _: '淇濆瓨' })}
+ {translate('ra.action.save')}
</Button>
<Button variant="text" color="error" onClick={handleDeleteClick} disabled={!canDelete}>
- {translate('common.action.delete', { _: '鍒犻櫎' })}
+ {translate('ra.action.delete')}
</Button>
</Box>
</Stack>
diff --git a/zy-acs-flow/src/map/areaSettings/index.jsx b/zy-acs-flow/src/map/areaSettings/index.jsx
index 6af4c33..d86d5be 100644
--- a/zy-acs-flow/src/map/areaSettings/index.jsx
+++ b/zy-acs-flow/src/map/areaSettings/index.jsx
@@ -238,8 +238,8 @@
variant="fullWidth"
sx={{ mb: 0 }}
>
- <Tab label={translate('page.map.area.basic', { _: '鍩虹' })} />
- <Tab label={translate('page.map.area.advanced', { _: '楂樼骇' })} />
+ <Tab label={translate('page.map.area.tabs.basic')} />
+ <Tab label={translate('page.map.area.tabs.advanced')} />
</Tabs>
<Divider />
--
Gitblit v1.9.1