From b7db54524a527501d16e555fccb145dbc6c08f00 Mon Sep 17 00:00:00 2001
From: licuizhu <1065490369@qq.com>
Date: Tue, 17 Oct 2023 20:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Guide/Guide.tsx |  6 ------
 src/pages/BaseMap/index.js     | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/Guide/Guide.tsx b/src/components/Guide/Guide.tsx
index 1a5e327d..26395e93 100644
--- a/src/components/Guide/Guide.tsx
+++ b/src/components/Guide/Guide.tsx
@@ -107,12 +107,6 @@ const Guide: React.FC<Props> = (props) => {
   
   return (
     <Layout>
-      {/* <Row>
-        <Typography.Title level={3} className={styles.title}>
-          欢迎使用 <strong>{name}</strong> ！
-        </Typography.Title>
-      </Row> */}
-
       {/* 顶部信息 */}
       <div className={styles.homepageMsg}>
         <div className={styles.homepageMsgItem}>您已注册<span className={styles.homepageMsgItemSpan}>{registerDays}</span>天</div>
diff --git a/src/pages/BaseMap/index.js b/src/pages/BaseMap/index.js
index faf297b7..538e659a 100644
--- a/src/pages/BaseMap/index.js
+++ b/src/pages/BaseMap/index.js
@@ -356,9 +356,13 @@ class BaseMap extends React.Component{
         this.getCityByProvince(`${provinceAdcode}`);
         this.hideHeatMap();
         this.setState ({
-            provinceAdcode: `${provinceAdcode}`,
-            provinceLabel: data.label,
+            provinceAdcode: provinceAdcode ? `${provinceAdcode}` : '',
+            provinceLabel: data ? data.label : '',
             zoom: 4,
+            districtList: [],//区
+            cityAdcode:'',//选中的市
+            cityLabel: '',
+            districtAdcode: '',
         })
     }
      // 获取市
@@ -399,11 +403,13 @@ class BaseMap extends React.Component{
         this.refs.getLayerDataFun.getBasicLayerMenu(`${cityAdcode}`);
         data && this.gotoCity(data);
         this.hideHeatMap();
+    
         this.setState ({
-            cityAdcode: `${cityAdcode}`,
-            cityLabel: data.label,
+            cityAdcode: cityAdcode ? `${cityAdcode}` : '',
+            cityLabel: data ? data.label : '',
             center: data && [parseFloat(data.lat), parseFloat(data.len)],
             zoom: 10,
+            districtAdcode: ''
         })
     }
      // 获取区
@@ -444,7 +450,7 @@ class BaseMap extends React.Component{
         data && this.gotoCity(data);
         this.hideHeatMap();
         this.setState({
-            districtAdcode: `${provinceAdcode}`,
+            districtAdcode: provinceAdcode ? `${provinceAdcode}` : '',
             center: data && [parseFloat(data.lat), parseFloat(data.len)],
             zoom: 13,
         })
@@ -522,9 +528,9 @@ class BaseMap extends React.Component{
                         <Col span={12}>
                             <Input.Group compact style={{display:"inline"}}>
                                 <label className={styles.labelForm}>行政区域：</label>
-                                <Select style={{width: 120, marginLeft: 18}} onChange={this.onProvinceChange} options={this.state.provinceList} allowClear/>
-                                <Select style={{width: 120, marginLeft: 18}} onChange={this.onCityChange} options={this.state.cityList} allowClear/>
-                                <Select style={{width: 120, marginLeft: 18}} onChange={this.onDistrictChange} options={this.state.districtList} allowClear/>
+                                <Select style={{width: 120, marginLeft: 18}} onChange={this.onProvinceChange} options={this.state.provinceList} value={this.state.provinceAdcode} allowClear/>
+                                <Select style={{width: 120, marginLeft: 18}} onChange={this.onCityChange} options={this.state.cityList} value={this.state.cityAdcode} allowClear/>
+                                <Select style={{width: 120, marginLeft: 18}} onChange={this.onDistrictChange} options={this.state.districtList} value={this.state.districtAdcode} allowClear/>
                             </Input.Group>
                         </Col>
                         <Col span={12}>