From 1864f916e0359d0814416cf94feda3a3662ed193 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期五, 05 九月 2025 16:39:29 +0800 Subject: [PATCH] 1 --- zy-acs-flow/src/map/insight/agv/AgvControl.jsx | 114 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 74 insertions(+), 40 deletions(-) diff --git a/zy-acs-flow/src/map/insight/agv/AgvControl.jsx b/zy-acs-flow/src/map/insight/agv/AgvControl.jsx index 380835c..b9f5bf5 100644 --- a/zy-acs-flow/src/map/insight/agv/AgvControl.jsx +++ b/zy-acs-flow/src/map/insight/agv/AgvControl.jsx @@ -53,8 +53,9 @@ const onSubmit = (data) => { if (curAgvNo) { - console.log(data); - handleControlAgv(curAgvNo, data); + handleControlAgv({ agvNo: curAgvNo, ...data }, () => { + + }); } }; @@ -83,38 +84,71 @@ const { options: endCodeOptions, setInputValue: setEndCodeInputValue, + resetInput: resetEndCodeInput, } = useCoolHook('/code/page', 'data'); const { options: startLocOptions, setInputValue: setStartLocInputValue, + resetInput: resetStartLocInput, } = useCoolHook('/loc/page', 'locNo'); const { options: endLocOptions, setInputValue: setEndLocInputValue, + resetInput: resetEndLocInput, } = useCoolHook('/loc/page', 'locNo'); const { options: startStaOptions, setInputValue: setStartStaInputValue, + resetInput: resetStartStaInput, } = useCoolHook('/sta/page', 'staNo'); const { options: endStaOptions, setInputValue: setEndStaInputValue, + resetInput: resetEndStaInput, } = useCoolHook('/sta/page', 'staNo'); useEffect(() => { - const fieldsToClear = ['startCode', 'endCode', 'startLocNo', 'endLocNo', 'startStaNo', 'endStaNo']; + const fieldsToClear = ['endCode', 'startLocNo', 'endLocNo', 'startStaNo', 'endStaNo']; fieldsToClear.forEach(field => { if (!showField(field)) { setValue(field, ''); + + switch (field) { + case 'endCode': + resetEndCodeInput(); + break; + case 'startLocNo': + resetStartLocInput(); + break; + case 'endLocNo': + resetEndLocInput(); + break; + case 'startStaNo': + resetStartStaInput(); + break; + case 'endStaNo': + resetEndStaInput(); + break; + default: + break; + } } }); - }, [taskMode, setValue, showField]); - + }, [ + taskMode, + setValue, + showField, + resetEndCodeInput, + resetStartLocInput, + resetEndLocInput, + resetStartStaInput, + resetEndStaInput + ]); return ( <> <form onSubmit={handleSubmit(onSubmit)}> @@ -247,41 +281,6 @@ </Grid> )} - {showField('endLocNo') && ( - <Grid item xs={12}> - <Controller - name="endLocNo" - control={control} - rules={{ required: translate('ra.validation.required') }} - render={({ field, fieldState }) => { - const selectedOption = endLocOptions.find(option => option.id === field.value) || null; - return ( - <Autocomplete - options={endLocOptions} - getOptionLabel={(option) => option.label} - isOptionEqualToValue={(option, value) => option.id === value.id} - value={selectedOption} - onInputChange={(event, value) => { - setEndLocInputValue(value); - }} - onChange={(event, value) => { - field.onChange(value ? value.id : null); - }} - renderInput={(params) => ( - <TextField - {...params} - label={translate('page.map.insight.control.endLoc')} - error={!!fieldState.error} - helperText={fieldState.error?.message} - /> - )} - /> - ); - }} - /> - </Grid> - )} - {showField('startStaNo') && ( <Grid item xs={12}> <Controller @@ -317,6 +316,41 @@ </Grid> )} + {showField('endLocNo') && ( + <Grid item xs={12}> + <Controller + name="endLocNo" + control={control} + rules={{ required: translate('ra.validation.required') }} + render={({ field, fieldState }) => { + const selectedOption = endLocOptions.find(option => option.id === field.value) || null; + return ( + <Autocomplete + options={endLocOptions} + getOptionLabel={(option) => option.label} + isOptionEqualToValue={(option, value) => option.id === value.id} + value={selectedOption} + onInputChange={(event, value) => { + setEndLocInputValue(value); + }} + onChange={(event, value) => { + field.onChange(value ? value.id : null); + }} + renderInput={(params) => ( + <TextField + {...params} + label={translate('page.map.insight.control.endLoc')} + error={!!fieldState.error} + helperText={fieldState.error?.message} + /> + )} + /> + ); + }} + /> + </Grid> + )} + {showField('endStaNo') && ( <Grid item xs={12}> <Controller -- Gitblit v1.9.1