From 196ad66f41fe77fff13b15b05095dc7661251a5d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 18 十月 2024 13:27:28 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/http.js | 20 ++++++++++ zy-acs-flow/src/i18n/en.js | 18 +++++++++ zy-acs-flow/src/map/insight/agv/AgvControl.jsx | 48 ++++++++++++----------- zy-acs-flow/src/i18n/zh.js | 20 +++++++++ zy-acs-flow/src/map/insight/agv/index.jsx | 1 5 files changed, 83 insertions(+), 24 deletions(-) diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js index 2d323df..2f2e653 100644 --- a/zy-acs-flow/src/i18n/en.js +++ b/zy-acs-flow/src/i18n/en.js @@ -661,6 +661,24 @@ outbound: 'Outbound', updateStatus: 'Update Status', }, + control: { + type: { + MOVE: 'MOVE', + TO_CHARGE: 'TO_CHARGE', + TO_STANDBY: 'TO_STANDBY', + TO_CHARGE: 'TO_CHARGE', + LOC_TO_LOC: 'LOC_TO_LOC', + LOC_TO_STA: 'LOC_TO_STA', + STA_TO_LOC: 'STA_TO_LOC', + STA_TO_STA: 'STA_TO_STA', + }, + startCode: 'Source Point', + endCode: 'Destination Point', + startLoc: 'Source Loc', + endLoc: 'Destination Loc', + startSta: 'Source Station', + endSta: 'Destination Station', + } }, settings: { title: 'Settings', diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js index 2e0175f..9f64ca9 100644 --- a/zy-acs-flow/src/i18n/zh.js +++ b/zy-acs-flow/src/i18n/zh.js @@ -630,7 +630,7 @@ title: '鍥炬爣搴�', shelf: '璐ф灦', charge: '鍏呯數妗�', - station: '杈撻�佺嚎', + station: '绔欑偣', direction: '鏂瑰悜', agv: '杞﹁締', point: '瀹氫綅鐐�', @@ -660,6 +660,24 @@ outbound: '鍑哄簱', updateStatus: '淇敼鐘舵��', }, + control: { + type: { + MOVE: '绉诲姩', + TO_CHARGE: '鍘诲厖鐢�', + TO_STANDBY: '鍘诲緟鏈轰綅', + TO_CHARGE: '鍘诲厖鐢�', + LOC_TO_LOC: '搴撲綅鍒板簱浣�', + LOC_TO_STA: '搴撲綅鍒扮珯鐐�', + STA_TO_LOC: '绔欑偣鍒板簱浣�', + STA_TO_STA: '绔欑偣鍒扮珯鐐�', + }, + startCode: '璧峰瀹氫綅鐐�', + endCode: '鐩爣瀹氫綅鐐�', + startLoc: '璧峰搴撲綅', + endLoc: '鐩爣搴撲綅', + startSta: '璧峰绔欑偣', + endSta: '鐩爣绔欑偣', + } }, settings: { title: '璁剧疆', diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js index 663e064..5ee59a0 100644 --- a/zy-acs-flow/src/map/http.js +++ b/zy-acs-flow/src/map/http.js @@ -144,3 +144,23 @@ console.error(error.message); }) } + +export const handleControlAgv = async (agvNo, form, callback) => { + await request.post('/map/agv/info', { + agvNo: agvNo, + }, { + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } + }).then((res) => { + const { code, msg, data } = res.data; + if (code === 200) { + if (callback) { + callback(data) + } + } else { + notify.error(msg); + } + }).catch((error) => { + notify.error(error.message); + console.error(error.message); + }) +} diff --git a/zy-acs-flow/src/map/insight/agv/AgvControl.jsx b/zy-acs-flow/src/map/insight/agv/AgvControl.jsx index c90adf0..6b98bdd 100644 --- a/zy-acs-flow/src/map/insight/agv/AgvControl.jsx +++ b/zy-acs-flow/src/map/insight/agv/AgvControl.jsx @@ -18,8 +18,10 @@ import CheckOutlinedIcon from '@mui/icons-material/CheckOutlined'; import RestartAltIcon from '@mui/icons-material/RestartAlt'; import useCoolHook from './useCoolHook'; +import { handleControlAgv } from '../../http'; function AgvControl(props) { + const { curAgvNo } = props; const theme = useTheme(); const translate = useTranslate(); @@ -36,17 +38,20 @@ }); const taskModes = [ - { value: 'MOVE', label: '绉诲姩' }, - { value: 'TO_CHARGE', label: '鍘诲厖鐢�' }, - { value: 'TO_STANDBY', label: '鍘诲緟鏈轰綅' }, - { value: 'LOC_TO_LOC', label: '搴撲綅鍒板簱浣�' }, - { value: 'LOC_TO_STA', label: '搴撲綅鍒扮珯鐐�' }, - { value: 'STA_TO_LOC', label: '绔欑偣鍒板簱浣�' }, - { value: 'STA_TO_STA', label: '绔欑偣鍒扮珯鐐�' }, + { value: 'MOVE', label: translate('page.map.insight.control.type.MOVE') }, + { value: 'TO_CHARGE', label: translate('page.map.insight.control.type.TO_CHARGE') }, + { value: 'TO_STANDBY', label: translate('page.map.insight.control.type.TO_STANDBY') }, + { value: 'LOC_TO_LOC', label: translate('page.map.insight.control.type.LOC_TO_LOC') }, + { value: 'LOC_TO_STA', label: translate('page.map.insight.control.type.LOC_TO_STA') }, + { value: 'STA_TO_LOC', label: translate('page.map.insight.control.type.STA_TO_LOC') }, + { value: 'STA_TO_STA', label: translate('page.map.insight.control.type.STA_TO_STA') }, ]; const onSubmit = (data) => { - console.log(data); + if (curAgvNo) { + console.log(data); + handleControlAgv(curAgvNo, data); + } }; const taskMode = watch('taskMode'); @@ -145,12 +150,12 @@ <Controller name="startCode" control={control} - rules={{ required: '璧峰鍦伴潰鐮佷笉鑳戒负绌�' }} + rules={{ required: translate('ra.validation.required') }} render={({ field, fieldState }) => ( <TextField {...field} fullWidth - label="璧峰鍦伴潰鐮�" + label={translate('page.map.insight.control.startCode')} error={!!fieldState.error} helperText={fieldState.error?.message} /> @@ -164,7 +169,7 @@ <Controller name="endCode" control={control} - rules={{ required: '鐩爣鍦伴潰鐮佷笉鑳戒负绌�' }} + rules={{ required: translate('ra.validation.required') }} render={({ field, fieldState }) => { const selectedOption = endCodeOptions.find(option => option.id === field.value) || null; return ( @@ -182,7 +187,7 @@ renderInput={(params) => ( <TextField {...params} - label="鐩爣鍦伴潰鐮�" + label={translate('page.map.insight.control.endCode')} error={!!fieldState.error} helperText={fieldState.error?.message} /> @@ -199,7 +204,7 @@ <Controller name="startLocNo" control={control} - rules={{ required: '璧峰搴撲綅涓嶈兘涓虹┖' }} + rules={{ required: translate('ra.validation.required') }} render={({ field, fieldState }) => { const selectedOption = startLocOptions.find(option => option.id === field.value) || null; return ( @@ -217,7 +222,7 @@ renderInput={(params) => ( <TextField {...params} - label="璧峰搴撲綅" + label={translate('page.map.insight.control.startLoc')} error={!!fieldState.error} helperText={fieldState.error?.message} /> @@ -234,7 +239,7 @@ <Controller name="endLocNo" control={control} - rules={{ required: '鐩爣搴撲綅涓嶈兘涓虹┖' }} + rules={{ required: translate('ra.validation.required') }} render={({ field, fieldState }) => { const selectedOption = endLocOptions.find(option => option.id === field.value) || null; return ( @@ -252,7 +257,7 @@ renderInput={(params) => ( <TextField {...params} - label="鐩爣搴撲綅" + label={translate('page.map.insight.control.endLoc')} error={!!fieldState.error} helperText={fieldState.error?.message} /> @@ -269,7 +274,7 @@ <Controller name="startStaNo" control={control} - rules={{ required: '璧峰绔欑偣涓嶈兘涓虹┖' }} + rules={{ required: translate('ra.validation.required') }} render={({ field, fieldState }) => { const selectedOption = startStaOptions.find(option => option.id === field.value) || null; return ( @@ -287,7 +292,7 @@ renderInput={(params) => ( <TextField {...params} - label="璧峰绔欑偣" + label={translate('page.map.insight.control.startSta')} error={!!fieldState.error} helperText={fieldState.error?.message} /> @@ -304,7 +309,7 @@ <Controller name="endStaNo" control={control} - rules={{ required: '鐩爣绔欑偣涓嶈兘涓虹┖' }} + rules={{ required: translate('ra.validation.required') }} render={({ field, fieldState }) => { const selectedOption = endStaOptions.find(option => option.id === field.value) || null; return ( @@ -322,7 +327,7 @@ renderInput={(params) => ( <TextField {...params} - label="鐩爣绔欑偣" + label={translate('page.map.insight.control.endSta')} error={!!fieldState.error} helperText={fieldState.error?.message} /> @@ -350,9 +355,6 @@ variant="outlined" color="primary" type="submit" - onClick={() => { - - }} sx={{ borderColor: theme => theme.palette.primary.main, color: theme => theme.palette.primary.main, diff --git a/zy-acs-flow/src/map/insight/agv/index.jsx b/zy-acs-flow/src/map/insight/agv/index.jsx index d8ee938..2351c85 100644 --- a/zy-acs-flow/src/map/insight/agv/index.jsx +++ b/zy-acs-flow/src/map/insight/agv/index.jsx @@ -54,6 +54,7 @@ {activeTab === 1 && ( <AgvControl data={sprite?.data} + curAgvNo={curAgvNo} /> )} {activeTab === 2 && ( -- Gitblit v1.9.1