#
luxiaotao1123
2024-03-13 4797b16426fe7d784b46bf93ddc360e7278c72f1
#
5个文件已修改
26 ■■■■ 已修改文件
zy-asrs-flow/src/locales/en-US.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/components/configSettings.jsx 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/components/mapSettings.jsx 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/index.jsx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/locales/en-US.ts
@@ -19,6 +19,8 @@
  'common.idcard':'ID Number',
  'common.introduction':'Introduction',
  'common.execute':'Execute',
  'common.success':'Success',
  'common.fail':'Fail',
  '':'',
  '':'',
  '':'',
zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { message, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
@@ -15,7 +15,17 @@
    const { curSprite, configForm: form } = props;
    useEffect(() => {
    }, []);
        form.resetFields();
        if (curSprite) {
            form.setFieldsValue({
                // shelf
                row: curSprite?.data?.row,
                bay: curSprite?.data?.bay,
                shelfNo: curSprite?.data?.shelfNo,
            })
        }
    }, [props, form]);
    const formValuesChange = (changeList) => {
        if (curSprite && changeList && changeList.length > 0) {
@@ -76,6 +86,7 @@
                        break;
                }
            }
            message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '操作成功' }));
        }
        props.onSubmit({ ...values }, confirmSettings);
zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
@@ -70,7 +70,7 @@
                        copyGap: 0,
                        autoIncrement: false,
                        incrementValue: 'row',
                        incrementMode: 'Ascending',
                        incrementMode: 'ascending',
                    }}
                    onFinish={handleFinish}
                    autoComplete="off"
zy-asrs-flow/src/pages/map/components/mapSettings.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { Col, Form, Input, Row, message, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
@@ -104,6 +104,7 @@
                switch (values.type) {
                    case Utils.SENSOR_TYPE.SHELF:
                        console.log(values);
                        console.log(curSprite);
                        break;
                    case Utils.SENSOR_TYPE.AGV:
                        break;
zy-asrs-flow/src/pages/map/index.jsx
@@ -198,8 +198,8 @@
    const settingsFinish = (values, fn) => {
        fn();
        setSettingsVisible(false);
        setSpriteBySettings(null);
        // setSettingsVisible(false);
        // setSpriteBySettings(null);
    }
    return (