From d0d0cb897f0885151e3bc0180cb7f94cb62cdc38 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 27 Dec 2023 17:18:22 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=9C=B0=E5=9B=BE:=20=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MapCountry.jsx | 40 +++++++++++++++++++++++------------
 src/views/Home.jsx            | 15 +++++++++----
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/components/MapCountry.jsx b/src/components/MapCountry.jsx
index c2fea33..144c68f 100644
--- a/src/components/MapCountry.jsx
+++ b/src/components/MapCountry.jsx
@@ -48,19 +48,33 @@ export default observer((props) => {
       color: {
         field: valueField || 'value',
         value: [
-          '#001D70',
-          '#0047A5',
-          '#1A4397',
-          '#2555B7',
-          '#3165D1',
-          '#3D76DD',
-          '#467BE8',
-          '#6296FE',
-          '#7EA6F9',
-          '#98B7F7',
-          '#BDD0F8',
-          '#DDE6F7',
-          '#F2F5FC'].reverse(),
+          '#820C1B',
+          '#a31022',
+          '#ac2738',
+          '#b53f4e',
+          '#be5764',
+          '#c76f7a',
+          '#d18790',
+          '#da9fa6',
+          '#e3b7bc',
+          '#eccfd2',
+          '#f5e7e8',
+          '#fde7ea',
+
+          // '#001D70',
+          // '#0047A5',
+          // '#1A4397',
+          // '#2555B7',
+          // '#3165D1',
+          // '#3D76DD',
+          // '#467BE8',
+          // '#6296FE',
+          // '#7EA6F9',
+          // '#98B7F7',
+          // '#BDD0F8',
+          // '#DDE6F7',
+          // '#F2F5FC'
+        ].reverse(),
         scale: { type: 'quantile' },
       },
       viewLevel: {
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
index 1ff8575..84c396f 100644
--- a/src/views/Home.jsx
+++ b/src/views/Home.jsx
@@ -25,7 +25,7 @@ const topSeries = [
   { key: 'country', value: 'country', label: '国籍', graphVisible: true },
   { key: 'webcode', value: 'webcode', label: '站点', graphVisible: false },
   { key: 'bizarea', value: 'bizarea', label: '国境', graphVisible: false },
-  { key: 'destinationcountry', value: 'destinationcountry', label: '目的地国籍', graphVisible: false },
+  { key: 'destinationcountry', value: 'destinationcountry', label: '目的地国籍', graphVisible: true },
 ];
 
 const allGroupTypes = [
@@ -320,7 +320,7 @@ export default observer(() => {
               </Col>
             ) : null
           )}
-          <Col key={'mapG'}  span={24}>
+          <Col key={'mapG'}  span={22}>
             <hr />
             <h3>来源国籍分布</h3>
             <Spin spinning={topData?.country?.loading || false}>
@@ -329,15 +329,22 @@ export default observer(() => {
               </div>
             </Spin>
           </Col>
-          <Col key={'mapDestinationCountry'}  span={24}>
+          <Col key={'mapG-r'}  span={1}></Col>
+          <Col key={'mapDestinationCountry'}  span={22}>
             <hr />
             <h3>目的地国籍分布</h3>
-            <Spin spinning={DistributionStore.pageLoading || false}>
+            {/* <Spin spinning={DistributionStore.pageLoading || false}>
               <div id="mapDestinationCountry" style={{ height: '700px' }}>
                 <MapCountry sourceField={'label'} valueField={BUConfig.measureField} dataSource={DistributionStore.destinationCountry.originData || []} containerNode='#mapDestinationCountry' />
               </div>
+            </Spin> */}
+            <Spin spinning={topData?.destinationcountry?.loading || false}>
+              <div id="mapDestinationCountry" style={{ height: '700px' }}>
+                <MapCountry sourceField={'groupsLabel'} valueField={BUConfig.measureField} dataSource={topData?.destinationcountry?.dataSource || []} containerNode='#mapDestinationCountry' />
+              </div>
             </Spin>
           </Col>
+          <Col key={'mapGc-r'}  span={1}></Col>
         </Row>
       </section>
     </>