#

luxiaotao1123

2024-03-13 11e9c8a8bcc15f38b71b404dbda743f8248c9d02

#

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

@@ -86,7 +86,7 @@
                    span: 4,
                }}
                wrapperCol={{
                    span: 14,
                    span: 20,
                }}
            >

@@ -109,22 +109,6 @@

                {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: '排' })}
@@ -155,6 +139,21 @@
                                }}
                            />
                        </Form.Item>
                        <Form.Item
                            name='shelfNo'
                            label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '货架号' })}
                            rules={[
                                {
                                    required: true,
                                },
                            ]}
                        >
                            <Input
                                style={{
                                    width: '50%',
                                }}
                            />
                        </Form.Item>
                    </>
                )}


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

@@ -141,28 +141,27 @@
                labelWrap   // label 换行
                disabled={false}
                layout='horizontal'
                labelCol={{
                    span: 4,
                }}
                wrapperCol={{
                    span: 20,
                }}
            >
                <Row gutter={[24, 16]}>

                    <Col span={24}>
                        <Row gutter={24}>
                            <Col span={18}>
                                <Form.Item
                                    label={intl.formatMessage({ id: 'map.settings.component', defaultMessage: '组件' })}
                                >
                                    <span>{curSprite?.data?.type}-{curSprite?.data?.uuid}</span>
                                </Form.Item>
                            </Col>
                        </Row>
                    </Col>

                    {/* position */}
                    <Col span={24}>
                        <Row gutter={24}>
                            <Col span={18}>
                                <Form.Item
                                    label={intl.formatMessage({ id: 'map.settings.position', defaultMessage: '坐标' })}
                                    labelCol={{ span: 4 }}
                                >
                                    <Space.Compact>
                                        <Form.Item
@@ -200,17 +199,13 @@
                                    </Space.Compact>
                                </Form.Item>
                            </Col>
                        </Row>
                    </Col>

                    {/* scale */}
                    <Col span={24}>
                        <Row gutter={24}>
                            <Col span={18}>
                                <Form.Item
                                    label={intl.formatMessage({ id: 'map.settings.scale', defaultMessage: '缩放' })}
                                    name="scaleSlider"
                                    labelCol={{ span: 4 }}
                            label={intl.formatMessage({ id: 'map.settings.scale', defaultMessage: '缩放' })}
                            labelCol={{ span: 5 }}
                                >
                                    <Slider
                                        min={0.1}
@@ -221,13 +216,15 @@
                                            1: '1',
                                            10: '10',
                                        }}
                                style={{
                                    width: '100%'
                                }}
                                    />
                                </Form.Item>
                            </Col>
                            <Col span={6}>
                                <Form.Item
                                    name="scale"
                                    labelCol={{ span: 4 }}
                                >
                                    <InputNumber
                                        changeOnWheel
@@ -240,17 +237,13 @@
                                    />
                                </Form.Item>
                            </Col>
                        </Row>
                    </Col>

                    {/* rotation */}
                    <Col span={24}>
                        <Row gutter={24}>
                            <Col span={18}>
                                <Form.Item
                                    label={intl.formatMessage({ id: 'map.settings.rotation', defaultMessage: '角度' })}
                                    name="rotationSlider"
                                    labelCol={{ span: 4 }}
                            label={intl.formatMessage({ id: 'map.settings.rotation', defaultMessage: '角度' })}
                            labelCol={{ span: 5 }}
                                >
                                    <Slider
                                        min={0}
@@ -263,13 +256,15 @@
                                            270: '270°',
                                            360: '360°',
                                        }}
                                style={{
                                    width: '100%'
                                }}
                                    />
                                </Form.Item>
                            </Col>
                            <Col span={6}>
                                <Form.Item
                                    name="rotation"
                                    labelCol={{ span: 4 }}
                                >
                                    <InputNumber
                                        changeOnWheel
@@ -281,8 +276,6 @@
                                        ]}
                                    />
                                </Form.Item>
                            </Col>
                        </Row>
                    </Col>

                    {/* copy */}