#

luxiaotao1123

2024-03-06 3726651ed7530392c191856086401745e3b1a6c1

#

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

@@ -27,7 +27,7 @@
                getContainer={props.refCurr}
                rootStyle={{ position: "absolute" }}
                mask={false}
                width={578}
                width={570}
                extra={
                    <Space>
                        <Button onClick={() => props.onCancel()}><FormattedMessage id='common.cancel' defaultMessage='取消' /></Button>

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

@@ -235,19 +235,24 @@

                        <FloatButton.Group
                            hidden={model === MapModel.OBSERVER_MODEL}
                            // trigger="hover"
                            style={{
                                right: 35,
                                bottom: 35
                                left: 35,
                                bottom: window.innerHeight / 2
                            }}
                            icon={<AppstoreAddOutlined />}
                        >
                            <FloatButton
                                hidden={model === MapModel.OBSERVER_MODEL}
                                type={deviceVisible ? 'primary' : 'default'}
                                tooltip={<div><FormattedMessage id='map.device.add' defaultMessage='添加设备' /></div>}
                                icon={<FileAddOutlined />}
                                onClick={() => {
                                    setDeviceVisible(true);
                                    if (deviceVisible) {
                                        setDeviceVisible(false);
                                    } else {
                                        setDeviceVisible(true);
                                        setModel(MapModel.MOVABLE_MODEL);
                                    }
                                }}
                            />
                            <FloatButton
@@ -267,7 +272,7 @@
            <Edit
                open={deviceVisible}
                onCancel={() => {
                    setDeviceVisible(false);
                    // setDeviceVisible(false);
                }}
                refCurr={mapRef.current}
                onDrop={onDrop}