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'],