#
luxiaotao1123
2024-03-13 c6c11cb039799afa90089bfd9c6ad8dd99198a66
#
2个文件已修改
175 ■■■■■ 已修改文件
zy-asrs-flow/src/pages/map/components/configSettings.jsx 167 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/utils.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -22,8 +22,31 @@
            changeList.forEach(change => {
                const { name: nameList, value } = change;
                nameList.forEach(name => {
                    console.log(name, value);
                    switch (name) {
                        case 'row':
                            const bay = form.getFieldValue('bay')
                            if (value && bay) {
                                form.setFieldsValue({
                                    shelfNo: Utils.pureNumStr(value) + '-' + Utils.pureNumStr(bay)
                                });
                            } else {
                                form.setFieldsValue({
                                    shelfNo: ''
                                });
                            }
                            break;
                        case 'bay':
                            const row = form.getFieldValue('row')
                            if (value && row) {
                                form.setFieldsValue({
                                    shelfNo: Utils.pureNumStr(row) + '-' + Utils.pureNumStr(value)
                                });
                            } else {
                                form.setFieldsValue({
                                    shelfNo: ''
                                });
                            }
                            break;
                        default:
                            break;
                    }
@@ -38,7 +61,6 @@
    };
    const handleFinish = async (values) => {
        console.log(values); return
        props.onSubmit({ ...values });
    }
@@ -55,85 +77,88 @@
                style={{
                    maxWidth: 600,
                }}
                size='default'    // small | default | large
                size='defalargeult'    // small | default | large
                variant='filled'    // outlined | borderless | filled
                labelWrap   // label 换行
                disabled={false}
                layout='horizontal'
                labelCol={{
                    span: 4,
                }}
                wrapperCol={{
                    span: 14,
                }}
            >
                <Row gutter={[24, 16]}>
                <Form.Item
                    label={intl.formatMessage({ id: 'map.settings.type', defaultMessage: '类型' })}
                >
                    <span>{curSprite?.data?.type}</span>
                </Form.Item>
                <Form.Item
                    label={intl.formatMessage({ id: 'map.settings.uuid', defaultMessage: '编号' })}
                >
                    <span>{curSprite?.data?.uuid}</span>
                </Form.Item>
                    <Col span={24}>
                        <Row gutter={24}>
                            <Col span={12}>
                                <Form.Item
                                    label={intl.formatMessage({ id: 'map.settings.type', defaultMessage: '类型' })}
                                    labelCol={{ span: 6 }}
                                >
                                    <span>{curSprite?.data?.type}</span>
                                </Form.Item>
                            </Col>
                            <Col span={12}>
                                <Form.Item
                                    label={intl.formatMessage({ id: 'map.settings.uuid', defaultMessage: '编号' })}
                                    labelCol={{ span: 6 }}
                                >
                                    <span>{curSprite?.data?.uuid}</span>
                                </Form.Item>
                            </Col>
                        </Row>
                    </Col>
                {curSprite?.data?.type === Utils.SENSOR_TYPE.AGV && (
                    <>
                    {curSprite?.data?.type === Utils.SENSOR_TYPE.AGV && (
                        <>
                    </>
                )}
                        </>
                    )}
                {curSprite?.data?.type === Utils.SENSOR_TYPE.SHELF && (
                    <>
                        <Form.Item
                            name='shelfNo'
                            label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '货架号' })}
                            rules={[
                                {
                                    required: true,
                                },
                            ]}
                        >
                            <Input
                                style={{
                                    width: '50%',
                                }}
                                disabled
                            />
                        </Form.Item>
                        <Form.Item
                            name='row'
                            label={intl.formatMessage({ id: 'map.settings.shelf.row', defaultMessage: '排' })}
                            rules={[
                                {
                                    required: true,
                                },
                            ]}
                        >
                            <InputNumber
                                style={{
                                    width: '50%',
                                }}
                            />
                        </Form.Item>
                        <Form.Item
                            name='bay'
                            label={intl.formatMessage({ id: 'map.settings.shelf.bay', defaultMessage: '列' })}
                            rules={[
                                {
                                    required: true,
                                },
                            ]}
                        >
                            <InputNumber
                                style={{
                                    width: '50%',
                                }}
                            />
                        </Form.Item>
                    </>
                )}
                    {curSprite?.data?.type === Utils.SENSOR_TYPE.SHELF && (
                        <>
                            <Col span={24}>
                                <Form.Item
                                    name='shelfNo'
                                    label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '货架号' })}
                                >
                                    <Input
                                        style={{
                                            width: '50%',
                                        }}
                                    />
                                </Form.Item>
                            </Col>
                            <Col span={24}>
                                <Form.Item
                                    name='row'
                                    label={intl.formatMessage({ id: 'map.settings.shelf.row', defaultMessage: '排' })}
                                >
                                    <InputNumber
                                        style={{
                                            width: '50%',
                                        }}
                                    />
                                </Form.Item>
                            </Col>
                            <Col span={24}>
                                <Form.Item
                                    name='bay'
                                    label={intl.formatMessage({ id: 'map.settings.shelf.bay', defaultMessage: '列' })}
                                >
                                    <InputNumber
                                        style={{
                                            width: '50%',
                                        }}
                                    />
                                </Form.Item>
                            </Col>
                        </>
                    )}
                </Row>
            </Form>
            </Form >
        </>
    )
}
zy-asrs-flow/src/pages/map/utils.js
@@ -240,4 +240,12 @@
export const deepCopy = (data) => {
    return JSON.parse(JSON.stringify(data));
}
export const pureNumStr = (param) => {
    if (param) {
        return Number(param);
    } else {
        return '';
    }
}