From 3726651ed7530392c191856086401745e3b1a6c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 06 三月 2024 17:04:51 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/components/settings.jsx | 2 +-
zy-asrs-flow/src/pages/map/index.jsx | 15 ++++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index fe3bca2..314c734 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/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>
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 0a16c21..a102917 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/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}
--
Gitblit v1.9.1