From 9d2d04cdc596aba0f540a61fa9b7e440c4c557d2 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 24 Oct 2023 13:40:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=9F=E8=AE=A1=E5=88=86=E5=B8=83:?=
 =?UTF-8?q?=20+=E5=AE=A2=E4=BA=BA=E5=9B=BD=E7=B1=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MixYnQ.jsx  | 7 +++++++
 src/stores/Distribution.js | 3 +++
 src/views/Distribution.jsx | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/MixYnQ.jsx b/src/components/MixYnQ.jsx
index eb2ab67..1c79c5a 100644
--- a/src/components/MixYnQ.jsx
+++ b/src/components/MixYnQ.jsx
@@ -65,6 +65,7 @@ export default observer((props) => {
     },];
   const MixConfig = {
     appendPadding: 15,
+    height: 600,
     syncViewPadding: true,
     tooltip: {
       shared: true,
@@ -99,6 +100,12 @@ export default observer((props) => {
             max: calcAxis,
             title: { text: '团数', autoRotate: false, position: 'end' },
           },
+          xAxis: {
+            label: {
+              autoHide: false,
+              autoRotate: true,
+            },
+          },
           label: false,
         },
       },
diff --git a/src/stores/Distribution.js b/src/stores/Distribution.js
index ebf66e1..0e92697 100644
--- a/src/stores/Distribution.js
+++ b/src/stores/Distribution.js
@@ -13,6 +13,7 @@ const modelMapper = {
   'destination': { url: '/service-Analyse2/GetTradeApartByDestination', keySort: false },
   'GlobalDestination': { url: '/service-Analyse2/GetTradeApartByGlobalDestination', keySort: false },
   'destinationCountry': { url: '/service-Analyse2/GetTradeApartByDestinationCountry', keySort: false },
+  'guestCountry': { url: '/service-Analyse2/GetTradeApartByGuestCountry', keySort: false },
 };
 class Distribution {
   constructor(appStore) {
@@ -83,6 +84,7 @@ class Distribution {
     this.destination = { loading: false, dataSource: [] };
     this.GlobalDestination = { loading: false, dataSource: [] };
     this.destinationCountry = { loading: false, dataSource: [] };
+    this.guestCountry = { loading: false, dataSource: [] };
   };
 
   curTab = 'tourDays';
@@ -114,6 +116,7 @@ class Distribution {
   destination = { loading: false, dataSource: [] };
   GlobalDestination = { loading: false, dataSource: [] };
   destinationCountry = { loading: false, dataSource: [] };
+  guestCountry = { loading: false, dataSource: [] };
 }
 
 /**
diff --git a/src/views/Distribution.jsx b/src/views/Distribution.jsx
index c678c78..b7477b3 100644
--- a/src/views/Distribution.jsx
+++ b/src/views/Distribution.jsx
@@ -21,7 +21,8 @@ const apartOptions = [
   { key: 'PersonNum', value: 'PersonNum', label: '人等' },
   { key: 'destination', value: 'destination', label: '国内目的地' },
   { key: 'GlobalDestination', value: 'GlobalDestination', label: '海外目的地' },
-  { key: 'destinationCountry', value: 'GlobalDestination', label: '目的地国籍' },
+  { key: 'destinationCountry', value: 'destinationCountry', label: '目的地国籍' },
+  { key: 'guestCountry', value: 'guestCountry', label: '客人国籍' },
 ];
 
 export default observer(() => {