#

luxiaotao1123

2024-10-18 196ad66f41fe77fff13b15b05095dc7661251a5d

#

 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',

 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: '设置',

 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);
    })
}

 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) => {
        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,

 zy-acs-flow/src/map/insight/agv/index.jsx

@@ -54,6 +54,7 @@
                {activeTab === 1 && (
                    <AgvControl
                        data={sprite?.data}
                        curAgvNo={curAgvNo}
                    />
                )}
                {activeTab === 2 && (