From 9d1a08f92a1139dca9eb2f9bc1a85fd7269e46a6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 2 Nov 2023 11:33:33 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=B9=B4=E5=BA=A6=E6=80=BB=E9=A2=9D?=
 =?UTF-8?q?=E7=9A=84=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=A0=B7=E5=BC=8F;=20KPI?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/StatisticCard2.jsx  | 4 ++--
 src/components/kpi/KPISettings.jsx | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/StatisticCard2.jsx b/src/components/StatisticCard2.jsx
index ad32813..1216832 100644
--- a/src/components/StatisticCard2.jsx
+++ b/src/components/StatisticCard2.jsx
@@ -17,11 +17,11 @@ export default observer((props) => {
   // console.log(props, ';;;;');
   const [responsive, setResponsive] = useState(false);
   const showMulti = traditional.value && biz.value;
+  const rangeMax = Math.max(originVal, kpiVal);
   const bulletData = [
     {
       title: '',
-      // ranges: [0, kpiVal || (traditional.value + biz.value + 100 )],
-      ranges: [0, Math.ceil(originVal * 1.1)],
+      ranges: [0, Math.ceil(rangeMax / 0.95)], // 留一点进度条, 不填满
       measures: [traditional.value, biz.value],
       target: kpiVal || 0,
     },
diff --git a/src/components/kpi/KPISettings.jsx b/src/components/kpi/KPISettings.jsx
index 6abb666..1fa48d1 100644
--- a/src/components/kpi/KPISettings.jsx
+++ b/src/components/kpi/KPISettings.jsx
@@ -3,12 +3,11 @@ import { observer } from 'mobx-react';
 import { stores_Context } from './../../config';
 import { Typography, Row, Col, Tabs, } from 'antd';
 import SearchForm from './../search/SearchForm';
-import { bu, KPIObjects, KPISubjects } from './../../libs/ht';
-import { isEmpty, fixTo2Decimals, fixTo4Decimals, cloneDeep, numberFormatter, fixToInt, merge } from './../../utils/commons';
+import { KPIObjects } from './../../libs/ht';
+import { merge, pick } from './../../utils/commons';
 import ProfitTable from './SubjectTable/Profit';
 import Count from './SubjectTable/Count';
 import Rates from './SubjectTable/Rates';
-import { toJS } from 'mobx';
 
 const Todo = (props) => {
   return <h2>TODO</h2>;
@@ -32,7 +31,7 @@ export default observer((props) => {
   const { sort, initialValue, hides, shows, fieldProps: _fieldProps } = {
     sort: '',
     // initialValue: '',
-    initialValue: searchFormStore.formValues,
+    initialValue: pick(searchFormStore.formValues, ['DateType', 'year']),
     fieldProps: {},
     hides: [],
     shows: ['DateType', 'years'],