#

luxiaotao1123

2024-03-14 a9cdb450319833aba03812745623bfef7c8c9ec8

#

 zy-asrs-flow/src/pages/map/components/configSettings.jsx

@@ -22,7 +22,7 @@
                // shelf
                row: curSprite?.data?.row,
                bay: curSprite?.data?.bay,
                shelfNo: curSprite?.data?.shelfNo,
                no: curSprite?.data?.no,
            })
        }
    }, [props, form]);
@@ -37,11 +37,11 @@
                            const bay = form.getFieldValue('bay')
                            if (value && bay) {
                                form.setFieldsValue({
                                    shelfNo: Utils.pureNumStr(value) + '-' + Utils.pureNumStr(bay)
                                    no: Utils.pureNumStr(value) + '-' + Utils.pureNumStr(bay)
                                });
                            } else {
                                form.setFieldsValue({
                                    shelfNo: ''
                                    no: ''
                                });
                            }
                            break;
@@ -49,11 +49,11 @@
                            const row = form.getFieldValue('row')
                            if (value && row) {
                                form.setFieldsValue({
                                    shelfNo: Utils.pureNumStr(row) + '-' + Utils.pureNumStr(value)
                                    no: Utils.pureNumStr(row) + '-' + Utils.pureNumStr(value)
                                });
                            } else {
                                form.setFieldsValue({
                                    shelfNo: ''
                                    no: ''
                                });
                            }
                            break;
@@ -76,7 +76,7 @@
            if (curSprite && curSprite?.data?.type) {
                switch (curSprite.data.type) {
                    case Utils.SENSOR_TYPE.SHELF:
                        curSprite.data.shelfNo = values.shelfNo;
                        curSprite.data.no = values.no; // *
                        curSprite.data.row = values.row;
                        curSprite.data.bay = values.bay;
                        break;
@@ -169,7 +169,7 @@
                            />
                        </Form.Item>
                        <Form.Item
                            name='shelfNo'
                            name='no'
                            label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '货架号' })}
                            rules={[
                                {

 zy-asrs-flow/src/pages/map/components/mapSettings.jsx

@@ -118,7 +118,7 @@
                            }
                        }
                        if (copiedSprite.data.row && copiedSprite.data.bay) {
                            copiedSprite.data.shelfNo = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
                            copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
                        }
                        break;
                    case Utils.SENSOR_TYPE.AGV:

 zy-asrs-flow/src/pages/map/header/search.jsx

@@ -28,7 +28,7 @@

const MapSearch = (props) => {
    const intl = useIntl();
    const { curSprite : curSensor, setCurSPrite: setCurSensor } = props;
    const { curSprite: curSensor, setCurSPrite: setCurSensor } = props;

    const sensorTypeSelectOptions = Utils.sensorTypeSelectOptions(intl);

@@ -38,10 +38,10 @@
    const [curSensorLabel, setCurSensorLabel] = React.useState(null);

    useEffect(() => {
        setSensorList([]);
        setCurSensorUuid(null);
        setCurSensorLabel(null);
        setCurSensor(null);
        // setSensorList([]);
        // setCurSensorUuid(null);
        // setCurSensorLabel(null);
        // setCurSensor(null);
    }, [props]);

    React.useEffect(() => {
@@ -49,16 +49,13 @@
            return
        }
        setSensorList([]);
        setCurSensorUuid(null);
        setCurSensorLabel(null);
        setCurSensor(null);
        switch (curSensorType) {
            case Utils.SENSOR_TYPE.SHELF:
                Utils.getMapContainer().children.forEach(child => {
                    if (child?.data?.type === Utils.SENSOR_TYPE.SHELF) {
                    if (child?.data?.type === Utils.SENSOR_TYPE.SHELF && child?.data?.no) {
                        setSensorList(prevArr => [...prevArr, {
                            value: child.data.uuid,
                            label: renderTitle(child.data.shelfNo, child.data.uuid)
                            value: child.data.no,
                            label: renderTitle(child.data.no, child.data.uuid)
                        }]);
                    }
                })
@@ -69,11 +66,6 @@
                break;
        }
    }, [curSensorType])

    React.useEffect(() => {
        console.log(curSensorUuid);
        setCurSensor(Utils.findSpriteByUuid(curSensorUuid));
    }, [curSensorUuid])

    return (
        <>
@@ -100,29 +92,13 @@
                    clearIcon: <CloseOutlined />
                }}
                popupMatchSelectWidth={500}
                onSearch={() => { }}
                options={sensorList}
                value={curSensorLabel}
                onSelect={(value, option) => {
                    setCurSensorUuid(value);
                    let showLable = option.label?.props?.children?.[0].props.children;
                    if (showLable) {
                        setCurSensorLabel(showLable)
                    } else {
                        return setCurSensorLabel(value);
                    }
                    const uuid = option.label?.props?.children?.[1].props.children
                    setCurSensor(Utils.findSpriteByUuid(uuid));
                }}
                onChange={(value) => {
                    setCurSensorLabel(value);
                    if (!value) {
                        console.log(1);
                        setCurSensorUuid(null);
                        setCurSensorLabel(null);
                        setCurSensor(null);
                    } else {

                    }
                }}
                onChange={setCurSensorLabel}
            />
        </>
    )

 zy-asrs-flow/src/pages/map/index.jsx

@@ -209,7 +209,6 @@
    }

    React.useEffect(() => {
        console.log(curSprite);
    }, curSprite);

    return (
@@ -222,13 +221,13 @@
                                curSprite={curSprite}
                                setCurSPrite={setCurSPrite}
                            />
                            <span>
                                {curSprite?.data?.uuid}
                            </span>
                        </Col>
                        {/* 3C40C6 */}
                        <Col span={12} style={{ backgroundColor: '#4a69bd' }}>
                            <Flex className={styles.flex} gap={'large'} justify={'flex-end'} align={'center'}>
                                <span>
                                    {curSprite?.data?.uuid}
                                </span>
                                <Select
                                    className='map-header-select'
                                    size={'large'}