From 178a37482a20648ba0a0a4f983b4b2299592bb73 Mon Sep 17 00:00:00 2001
From: licuizhu <1065490369@qq.com>
Date: Wed, 6 Sep 2023 20:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                |  4 ++--
 src/index.less                           |  7 +++++--
 src/pages/BaseMap/index.js               | 11 ++++++-----
 src/pages/Login/index.js                 |  2 +-
 src/pages/Login/passwordLogin.js         |  6 ++++--
 src/pages/Login/verificationCodeLogin.js |  5 ++++-
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 09d8c91e..0f995982 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN
 
 #### 使用说明
 
-1.  xxxx
-2.  xxxx
+1.  yarn install
+2.  yarn add
 3.  xxxx
 
 #### 参与贡献
diff --git a/src/index.less b/src/index.less
index 34fa9312..9a8ce6d9 100644
--- a/src/index.less
+++ b/src/index.less
@@ -20,7 +20,7 @@ body {
 #login_page .ant-tabs {
     transform: translateY(-50%);
     position: fixed;
-    top: 50%;
+    top: 45%;
     right: 0px;
     width: 38%;
 }
@@ -70,7 +70,7 @@ body {
   line-height: 32px;
 }
 #login_page .ant-form-item-required {
-  margin-bottom: 8px;
+  margin-bottom: 20px;
 }
 #login_page .ant-form-item-required::before {
   display: none;
@@ -81,6 +81,9 @@ body {
   margin-top: 18px;
   font-size: 18px;
 }
+#login_page .form-item {
+  margin-bottom: 45px;
+}
 // 左侧导航栏
 :where(.css-dev-only-do-not-override-9ntgx0).ant-layout .ant-layout-sider-light {
     background-image: url(./assets/images/nav-bg.png) !important;
diff --git a/src/pages/BaseMap/index.js b/src/pages/BaseMap/index.js
index 971f26a0..dbd7ed69 100644
--- a/src/pages/BaseMap/index.js
+++ b/src/pages/BaseMap/index.js
@@ -89,7 +89,7 @@ class BaseMap extends React.Component{
     }
 
     // 获取图层明细点位数据/热力图数据
-    getLayerPoints = (layerId, selected, nodeType) => {debugger
+    getLayerPoints = (layerId, selected, nodeType) => {
         if (selected) {
             return axios.get('/api/basicMap/getLayerPoints', {
                 params: {
@@ -138,7 +138,8 @@ class BaseMap extends React.Component{
         let self = this;
         let map = this.state.map;
         let LabelsData = data || [];
-        
+        let logoImage = data.length > 0 && data[0].logoImage;
+        map.addImage = (layerId, logoImage);
         const pointLayer = new PointLayer({name: layerId})
             .source(LabelsData, {
                 parser: {
@@ -147,8 +148,8 @@ class BaseMap extends React.Component{
                     y: 'lat',
                 }
             })
-            .shape('simple')
-            .size(15)
+            .shape(layerId)
+            .size(30)
             .color('mag', mag => {
                 return mag > 4.5 ? '#5B8FF9' : '#5CCEA1';
             })
@@ -555,7 +556,7 @@ class BaseMap extends React.Component{
                 <LayerData ref="getLayerDataFun" getLayerPoints = {this.getLayerPoints} getLayerShapes = {this.getLayerShapes}/>
                 {/* 地图 */}
                 <div className={styles.mapWrap}>
-                    <div style={{width: '100%', height: 880}} id="container" />
+                    <div style={{width: '100%', height: '100vh'}} id="container" />
                 </div>
             </div>
         )
diff --git a/src/pages/Login/index.js b/src/pages/Login/index.js
index 6cf30ed0..1734454a 100644
--- a/src/pages/Login/index.js
+++ b/src/pages/Login/index.js
@@ -11,7 +11,7 @@ function Login (e) {
           <Tabs.TabPane tab="密码登录" key="1">
             <PasswordLogin></PasswordLogin>
           </Tabs.TabPane>
-          <Tabs.TabPane tab="验证码登陆" key="2">
+          <Tabs.TabPane tab="验证码登录" key="2">
             <VerificationCodeLogin></VerificationCodeLogin>
           </Tabs.TabPane>
         </Tabs>
diff --git a/src/pages/Login/passwordLogin.js b/src/pages/Login/passwordLogin.js
index 92e40b4d..f7cec6dc 100644
--- a/src/pages/Login/passwordLogin.js
+++ b/src/pages/Login/passwordLogin.js
@@ -60,6 +60,7 @@ function Login (e) {
             message: '账户名称不能为空!',
         },
         ]}
+        style={{marginBottom: '45px'}}
     >
         <Input placeholder='请输入账户'/>
     </Form.Item>
@@ -81,13 +82,14 @@ function Login (e) {
     <Form.Item
         name="remember"
         valuePropName="checked"
+        style={{marginTop: '38px'}}
     >
       <Checkbox style={{fontSize: '18px'}}>同意<a>服务条款</a></Checkbox>
       <a style={{float: 'right', fontSize: '18px'}}>忘记密码？</a>
     </Form.Item>
 
-    <Form.Item >
-        <Button type="primary" htmlType="submit" style={{height: '46px'}} block>密码登录</Button>
+    <Form.Item style={{marginTop: '68px'}}>
+        <Button type="primary" htmlType="submit" style={{height: '72px'}} block>密码登录</Button>
         <a className='new-user'>新用户注册</a>
     </Form.Item>
     </Form>
diff --git a/src/pages/Login/verificationCodeLogin.js b/src/pages/Login/verificationCodeLogin.js
index 1099a95b..4982be30 100644
--- a/src/pages/Login/verificationCodeLogin.js
+++ b/src/pages/Login/verificationCodeLogin.js
@@ -74,6 +74,7 @@ function VerificationCodeLogin (e) {
             message: '账户名称不能为空!',
             },
         ]}
+        style={{marginBottom: '45px'}}
         >
             <Input placeholder='请输入账户'/>
         </Form.Item>
@@ -102,6 +103,7 @@ function VerificationCodeLogin (e) {
             offset: 4,
             span: 16,
         }}
+        style={{marginTop: '38px'}}
         >
             <Checkbox style={{fontSize: '18px'}}>同意<a>服务条款</a></Checkbox>
         
@@ -112,8 +114,9 @@ function VerificationCodeLogin (e) {
             offset: 4,
             span: 16,
         }}
+        style={{marginTop: '68px'}}
         >
-            <Button type="primary" htmlType="submit" style={{height: '46px'}} block>
+            <Button type="primary" htmlType="submit" style={{height: '72px'}} block>
                 验证码登录
             </Button>
             <a className='new-user'>新用户注册</a>