#

luxiaotao1123

2024-03-02 517e8ec7024d67263e2df543cc7c84ab8b294b24

#

 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>


 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,11 +109,6 @@
                    <Flex className={styles.flex} gap={'large'} justify={'flex-end'} align={'center'}>
                        <Button onClick={editHandle} size={'large'}><FormattedMessage id='map.edit' defaultMessage='编辑地图' /></Button>
                    </Flex>
                </Header>
                <Content ref={contentRef} className={styles.content}>
                    <div ref={mapRef}></div>
                </Content>
            </Layout>

            <Edit
                open={editModalVisible}
@@ -122,7 +117,21 @@
                        setEditModalVisible(false);
                    }
                }
                        refCurr={mapRef.current}
            />
                </Header>
                <Content ref={contentRef} className={styles.content}>
                    <div ref={mapRef} style={{ position: "relative" }}>

                    </div>


                </Content>


            </Layout>


        </>
    )
}

 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