zy-asrs-master.git

parent: 1c76fc52 | 补丁 | 提交 | ignore whitespace

luxiaotao1123

2024-03-20 c11252c16325fe62d28ea2b49e2d6a25b32dca14

3个文件已修改

	zy-asrs-flow/src/locales/en-US/map.ts	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx	64 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zy-asrs-flow/src/pages/map/components/mapSettings.jsx	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 zy-asrs-flow/src/locales/en-US/map.ts

@@ -52,8 +52,8 @@
    '': '',
    '': '',
    '': '',
    'map.settings.point.horizontal': 'Horizontal',
    'map.settings.point.vertical': 'Vertical',
    'map.settings.point.horizontal': 'Horizontal',
    '': '',
    '': '',
    '': '',
@@ -66,8 +66,8 @@
    'map.settings.sub.copy.count': 'Count',
    'map.settings.sub.copy.gap': 'Gap',
    'map.settings.sub.copy.id': 'ID',
    'map.settings.sub.copy.shelf.auto-increment': 'Auto Increment',
    'map.settings.sub.copy.shelf.increment-value': 'Increment Value',
    'map.settings.sub.copy.auto-increment': 'Auto Increment',
    'map.settings.sub.copy.increment-value': 'Increment Value',
    'map.settings.sub.copy.increment.mode': 'Increment Mode',
    'map.settings.sub.copy.ascend': 'Ascending',
    'map.settings.sub.copy.descend': 'Descending',
@@ -75,6 +75,7 @@
    '': '',
    '': '',
    'map.settings.sub.copy.warn.config.shelf': 'Please set the shelf parameters first!',
    'map.settings.sub.copy.warn.config.point': 'Please set the point parameters first!',
    '': '',
    '': '',
    '': '',

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

@@ -37,6 +37,13 @@
                        setAutoIncrementError(null);
                    }
                    break;
                case Utils.SENSOR_TYPE.POINT:
                    if (!curSprite.data?.vertical || !curSprite.data?.horizontal) {
                        setAutoIncrementError(intl.formatMessage({ id: 'map.settings.sub.copy.warn.config.point', defaultMessage: '请先设置定位点参数！' }));
                    } else {
                        setAutoIncrementError(null);
                    }
                    break;
                default:
                    break;
            }
@@ -139,7 +146,7 @@
                        {/* switch auto increment  */}
                        <Col span={24}>
                            <Form.Item
                                label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.auto-increment', defaultMessage: '自增长' })}
                                label={intl.formatMessage({ id: 'map.settings.sub.copy.auto-increment', defaultMessage: '自增长' })}
                                labelCol={{ span: 8 }}
                                help={autoIncrementError}
                                validateStatus={autoIncrementError ? "error" : null}
@@ -153,7 +160,7 @@
                                <Col span={24}>
                                    <Form.Item
                                        name='incrementValue'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '自增长值' })}
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '自增长值' })}
                                        labelCol={{ span: 8 }}
                                        initialValue='no'
                                    >
@@ -201,7 +208,7 @@
                                <Col span={24}>
                                    <Form.Item
                                        name='incrementValue'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '自增长值' })}
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '自增长值' })}
                                        labelCol={{ span: 8 }}
                                        initialValue='row'
                                    >
@@ -248,6 +255,57 @@
                            </>
                        )}

                        {autoIncrement && curSprite?.data?.type === Utils.SENSOR_TYPE.POINT && (
                            <>
                                <Col span={24}>
                                    <Form.Item
                                        name='incrementValue'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '自增长值' })}
                                        labelCol={{ span: 8 }}
                                        initialValue='vertical'
                                    >
                                        <Segmented
                                            block
                                            options={[
                                                {
                                                    label: intl.formatMessage({ id: 'map.settings.point.vertical', defaultMessage: '纵向' }),
                                                    value: 'vertical'
                                                },
                                                {
                                                    label: intl.formatMessage({ id: 'map.settings.point.horizontal', defaultMessage: '横向' }),
                                                    value: 'horizontal'
                                                },
                                            ]}
                                            onChange={(value) => {
                                            }}
                                        />
                                    </Form.Item>
                                </Col>
                                <Col span={24}>
                                    <Form.Item
                                        name='incrementMode'
                                        label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '增长方式' })}
                                        labelCol={{ span: 8 }}
                                    >
                                        <Segmented
                                            block
                                            options={[
                                                {
                                                    label: intl.formatMessage({ id: 'map.settings.sub.copy.ascend', defaultMessage: '升序' }),
                                                    value: 'ascending'
                                                },
                                                {
                                                    label: intl.formatMessage({ id: 'map.settings.sub.copy.descend', defaultMessage: '降序' }),
                                                    value: 'descending'
                                                },
                                            ]}
                                            onChange={(value) => {
                                            }}
                                        />
                                    </Form.Item>
                                </Col>
                            </>
                        )}
                    </Row>
                </Form>
            </Drawer>

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

@@ -121,6 +121,25 @@
                            copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
                        }
                        break;
                    case Utils.SENSOR_TYPE.POINT:
                        if (values.incrementValue === 'vertical') {
                            if (values.incrementMode === 'descending') {
                                copiedSprite.data.vertical = curSprite.data.vertical - i - 1;
                            } else {
                                copiedSprite.data.vertical = curSprite.data.vertical + i + 1;
                            }
                        }
                        if (values.incrementValue === 'horizontal') {
                            if (values.incrementMode === 'descending') {
                                copiedSprite.data.horizontal = curSprite.data.horizontal - i - 1;
                            } else {
                                copiedSprite.data.horizontal = curSprite.data.horizontal + i + 1;
                            }
                        }
                        if (copiedSprite.data.vertical && copiedSprite.data.horizontal) {
                            copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.vertical) + '-' + Utils.pureNumStr(copiedSprite.data.horizontal);
                        }
                        break;
                    case Utils.SENSOR_TYPE.AGV:
                        if (values.incrementValue === 'no') {
                            if (values.incrementMode === 'descending') {

			@@ -52,8 +52,8 @@
			'': '',
			'': '',
			'': '',
			'map.settings.point.horizontal': 'Horizontal',
			'map.settings.point.vertical': 'Vertical',
			'map.settings.point.horizontal': 'Horizontal',
			'': '',
			'': '',
			'': '',
			@@ -66,8 +66,8 @@
			'map.settings.sub.copy.count': 'Count',
			'map.settings.sub.copy.gap': 'Gap',
			'map.settings.sub.copy.id': 'ID',
			'map.settings.sub.copy.shelf.auto-increment': 'Auto Increment',
			'map.settings.sub.copy.shelf.increment-value': 'Increment Value',
			'map.settings.sub.copy.auto-increment': 'Auto Increment',
			'map.settings.sub.copy.increment-value': 'Increment Value',
			'map.settings.sub.copy.increment.mode': 'Increment Mode',
			'map.settings.sub.copy.ascend': 'Ascending',
			'map.settings.sub.copy.descend': 'Descending',
			@@ -75,6 +75,7 @@
			'': '',
			'': '',
			'map.settings.sub.copy.warn.config.shelf': 'Please set the shelf parameters first!',
			'map.settings.sub.copy.warn.config.point': 'Please set the point parameters first!',
			'': '',
			'': '',
			'': '',

			@@ -37,6 +37,13 @@
			setAutoIncrementError(null);
			}
			break;
			case Utils.SENSOR_TYPE.POINT:
			if (!curSprite.data?.vertical \|\| !curSprite.data?.horizontal) {
			setAutoIncrementError(intl.formatMessage({ id: 'map.settings.sub.copy.warn.config.point', defaultMessage: '请先设置定位点参数！' }));
			} else {
			setAutoIncrementError(null);
			}
			break;
			default:
			break;
			}
			@@ -139,7 +146,7 @@
			{/* switch auto increment */}
			<Col span={24}>
			<Form.Item
			label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.auto-increment', defaultMessage: '自增长' })}
			label={intl.formatMessage({ id: 'map.settings.sub.copy.auto-increment', defaultMessage: '自增长' })}
			labelCol={{ span: 8 }}
			help={autoIncrementError}
			validateStatus={autoIncrementError ? "error" : null}
			@@ -153,7 +160,7 @@
			<Col span={24}>
			<Form.Item
			name='incrementValue'
			label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '自增长值' })}
			label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '自增长值' })}
			labelCol={{ span: 8 }}
			initialValue='no'
			>
			@@ -201,7 +208,7 @@
			<Col span={24}>
			<Form.Item
			name='incrementValue'
			label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '自增长值' })}
			label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '自增长值' })}
			labelCol={{ span: 8 }}
			initialValue='row'
			>
			@@ -248,6 +255,57 @@
			</>
			)}

			{autoIncrement && curSprite?.data?.type === Utils.SENSOR_TYPE.POINT && (
			<>
			<Col span={24}>
			<Form.Item
			name='incrementValue'
			label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '自增长值' })}
			labelCol={{ span: 8 }}
			initialValue='vertical'
			>
			<Segmented
			block
			options={[
			{
			label: intl.formatMessage({ id: 'map.settings.point.vertical', defaultMessage: '纵向' }),
			value: 'vertical'
			},
			{
			label: intl.formatMessage({ id: 'map.settings.point.horizontal', defaultMessage: '横向' }),
			value: 'horizontal'
			},
			]}
			onChange={(value) => {
			}}
			/>
			</Form.Item>
			</Col>
			<Col span={24}>
			<Form.Item
			name='incrementMode'
			label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '增长方式' })}
			labelCol={{ span: 8 }}
			>
			<Segmented
			block
			options={[
			{
			label: intl.formatMessage({ id: 'map.settings.sub.copy.ascend', defaultMessage: '升序' }),
			value: 'ascending'
			},
			{
			label: intl.formatMessage({ id: 'map.settings.sub.copy.descend', defaultMessage: '降序' }),
			value: 'descending'
			},
			]}
			onChange={(value) => {
			}}
			/>
			</Form.Item>
			</Col>
			</>
			)}
			</Row>
			</Form>
			</Drawer>

			@@ -121,6 +121,25 @@
			copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.row) + '-' + Utils.pureNumStr(copiedSprite.data.bay);
			}
			break;
			case Utils.SENSOR_TYPE.POINT:
			if (values.incrementValue === 'vertical') {
			if (values.incrementMode === 'descending') {
			copiedSprite.data.vertical = curSprite.data.vertical - i - 1;
			} else {
			copiedSprite.data.vertical = curSprite.data.vertical + i + 1;
			}
			}
			if (values.incrementValue === 'horizontal') {
			if (values.incrementMode === 'descending') {
			copiedSprite.data.horizontal = curSprite.data.horizontal - i - 1;
			} else {
			copiedSprite.data.horizontal = curSprite.data.horizontal + i + 1;
			}
			}
			if (copiedSprite.data.vertical && copiedSprite.data.horizontal) {
			copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.vertical) + '-' + Utils.pureNumStr(copiedSprite.data.horizontal);
			}
			break;
			case Utils.SENSOR_TYPE.AGV:
			if (values.incrementValue === 'no') {
			if (values.incrementMode === 'descending') {