From 1c2c7c28c69d2ea31d774f865ab8584fd07e9163 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 25 Oct 2023 14:56:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5:=20TOP:=20=E6=88=90?=
 =?UTF-8?q?=E4=BA=A4=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MixYnQ.jsx |  4 ++--
 src/stores/Trade.js       | 20 +++++++++-----------
 src/views/Home.jsx        |  4 ----
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/components/MixYnQ.jsx b/src/components/MixYnQ.jsx
index dc7b92d..953d8a0 100644
--- a/src/components/MixYnQ.jsx
+++ b/src/components/MixYnQ.jsx
@@ -133,7 +133,7 @@ export default observer((props) => {
           },
           yAxis: {
             type: 'linear',
-            tickCount: 4,
+            // tickCount: 4,
             min: 0,
             position: 'right',
             line: null,
@@ -171,7 +171,7 @@ export default observer((props) => {
             position: 'left',
             // min: -calcAxisC,
             // max: calcAxisC/4,
-            min: -2000,
+            min: -3000,
             max: 250,
             tickCount: 4,
           },
diff --git a/src/stores/Trade.js b/src/stores/Trade.js
index 473f31d..182d411 100644
--- a/src/stores/Trade.js
+++ b/src/stores/Trade.js
@@ -175,10 +175,8 @@ class Trade {
     Object.assign(queryData, { groupType: orderType, groupDateType: 'year' });
 
     const multiData = await this.fetchTradeDataAll(cloneDeep(queryData));
-    const { traditional, biz, summary } = multiData.result1;
-    // console.log(biz, orderType, 'mmmmmmmm', queryData, multiData);
-    // const mergeData = [].concat(traditional, biz);
-    // const dateKeyData = groupBy(mergeData, ele => ele.groupDateVal);
+    const { summary } = multiData.result1;
+    // console.log(orderType, summary, 'mmmmmmmm', queryData, multiData);
     runInAction(() => {
       this.topData[orderType].loading = false;
       this.topData[orderType].dataSource = summary;
@@ -285,8 +283,8 @@ export const parseMergeItem = ({traditional, biz}) => {
     };
     const mergeRes = [].concat(traditional[resKey], biz[resKey]);
     const groupsData = mergeRes.reduce((r, v) => {
-      if (v.groupsLabel ) {
-        (r[v.groupsLabel] || (r[v.groupsLabel] = [])).push(v);
+      if (v.groupsKey ) {
+        (r[v.groupsKey] || (r[v.groupsKey] = [])).push(v);
       }
       return r;
     }, {});
@@ -311,15 +309,15 @@ export const parseMergeItem = ({traditional, biz}) => {
     // 按对象汇总
     const TMapped = traditional[resKey].reduce((r, v) => ({...r, [v.groupsKey]: v}), {});
     const BMapped = biz[resKey].reduce((r, v) => ({...r, [v.groupsKey]: v}), {});
-    const summary = Object.keys(groupsData).map(groupsLabel => {
-      const _groupsKey = groupsData[groupsLabel]?.[0]?.groupsKey || '';
+    const summary = Object.keys(groupsData).map(groupsKey => {
+      const _groupsKey = groupsKey; // groupsData[groupsKey]?.[0]?.groupsKey || '';
       return ['ConfirmOrder', 'SumOrder', 'SumML', 'transactions', 'SumPersonNum'].reduce(
         (r, skey) => ({ ...r,
-          [skey]: groupsData[groupsLabel].reduce((a, c) => a + c[skey], 0),
-          // [`${skey}_arr`]: groupsData[groupsLabel].map(sv => sv[skey]),
+          [skey]: groupsData[groupsKey].reduce((a, c) => a + c[skey], 0),
+          // [`${skey}_arr`]: groupsData[groupsKey].map(sv => sv[skey]),
           [`${skey}_arr`]: [ _groupsKey ? TMapped?.[_groupsKey]?.[skey] || 0 : 0, _groupsKey ? BMapped?.[_groupsKey]?.[skey] || 0 : 0,],
         }),
-        groupsData[groupsLabel]?.[0] || {}
+        groupsData[groupsKey]?.[0] || {}
       );
     }).map(row => ({...row,
       ConfirmRates: row.SumOrder ? fixTo2Decimals((row.ConfirmOrder/row.SumOrder)*100) : 0,
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
index ef5512c..910b6df 100644
--- a/src/views/Home.jsx
+++ b/src/views/Home.jsx
@@ -3,12 +3,9 @@ import { observer } from 'mobx-react';
 import { Row, Col, Spin, Space, Radio, Table } from 'antd';
 import { CheckCircleTwoTone, MoneyCollectTwoTone, FlagTwoTone, SmileTwoTone } from '@ant-design/icons';
 import { stores_Context } from '../config';
-import { useNavigate } from 'react-router-dom';
-import StatisticCard from '../components/StatisticCard';
 import StatisticCard2 from '../components/StatisticCard2';
 import Bullet from '../components/BulletWithSort';
 import Waterfall from '../components/Waterfall';
-import LineWithKPI from '../components/LineWithKPI';
 import MixTBWithKPI from './../components/MixTBWithKPI';
 import Donut from './../components/Donut';
 import DataFieldRadio from '../components/DataFieldRadio';
@@ -16,7 +13,6 @@ import { datePartOptions } from './../components/DateGroupRadio/date';
 import SearchForm from './../components/search/SearchForm';
 import { empty, cloneDeep, isEmpty } from './../utils/commons';
 import { dataFieldAlias } from './../libs/ht';
-import { Line } from '@ant-design/charts';
 import './home.css';
 
 const topSeries = [