From 517e8ec7024d67263e2df543cc7c84ab8b294b24 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 02 三月 2024 09:51:56 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/components/edit.jsx | 5 ++++-
zy-asrs-flow/src/pages/map/index.jsx | 29 +++++++++++++++++++----------
zy-asrs-wcs/src/main/resources/application.yml | 7 +++++--
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/edit.jsx b/zy-asrs-flow/src/pages/map/components/edit.jsx
index acc2a69..7964292 100644
--- a/zy-asrs-flow/src/pages/map/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/map/components/edit.jsx
@@ -2,7 +2,6 @@
import { Col, Form, Modal, Row, Checkbox, Skeleton, Tree, Drawer, Space, Button, Card } from 'antd';
const Edit = (props) => {
-
return (
<>
<Drawer
@@ -10,6 +9,10 @@
onClose={() => {
props.onCancel();
}}
+ getContainer={props.refCurr}
+ rootStyle={{ position: "absolute" }}
+ mask={false}
+ width={378}
>
<Card>
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index abfbe68..41fe8dc 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -11,7 +11,7 @@
let dark = token.colorBgBase === '#000';
return {
layout: {
- // overflow: 'hidden',
+ overflow: 'hidden',
},
header: {
height: 64,
@@ -109,20 +109,29 @@
<Flex className={styles.flex} gap={'large'} justify={'flex-end'} align={'center'}>
<Button onClick={editHandle} size={'large'}><FormattedMessage id='map.edit' defaultMessage='缂栬緫鍦板浘' /></Button>
</Flex>
+
+ <Edit
+ open={editModalVisible}
+ onCancel={
+ () => {
+ setEditModalVisible(false);
+ }
+ }
+ refCurr={mapRef.current}
+ />
</Header>
<Content ref={contentRef} className={styles.content}>
- <div ref={mapRef}></div>
+ <div ref={mapRef} style={{ position: "relative" }}>
+
+ </div>
+
+
</Content>
+
+
</Layout>
- <Edit
- open={editModalVisible}
- onCancel={
- () => {
- setEditModalVisible(false);
- }
- }
- />
+
</>
)
}
diff --git a/zy-asrs-wcs/src/main/resources/application.yml b/zy-asrs-wcs/src/main/resources/application.yml
index 246a262..149e9c7 100644
--- a/zy-asrs-wcs/src/main/resources/application.yml
+++ b/zy-asrs-wcs/src/main/resources/application.yml
@@ -13,9 +13,12 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://47.97.1.152:3306/asrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# url: jdbc:mysql://47.97.1.152:3306/asrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: zy@123
+ url: jdbc:mysql://127.0.0.1:3306/asrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: zy@123
+ password: xltys1995
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs
# username: sa
--
Gitblit v1.9.1