From 437fc8c01699896301d08c7f0afc34809d65c7e4 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 20 Oct 2023 14:21:37 +0800
Subject: [PATCH] =?UTF-8?q?style:=20KPI=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6;=20=E9=94=80=E5=94=AE=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/kpi/SubjectTable/Count.jsx  |  4 +++-
 src/components/kpi/SubjectTable/Profit.jsx |  4 +++-
 src/components/kpi/SubjectTable/Rates.jsx  |  4 +++-
 src/libs/ht.js                             |  2 +-
 src/views/Sale_KPI.jsx                     | 18 +++++++++++++++++-
 src/views/kpi.css                          |  3 +++
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/components/kpi/SubjectTable/Count.jsx b/src/components/kpi/SubjectTable/Count.jsx
index 2f1f69d..7f01784 100644
--- a/src/components/kpi/SubjectTable/Count.jsx
+++ b/src/components/kpi/SubjectTable/Count.jsx
@@ -83,12 +83,14 @@ export default observer((props) => {
       title: curObjectItem.label,
       dataIndex: 'object_id',
       editable: false,
+      width: '5em',
       render: (_, r) => r.object_name,
     },
     {
       title: '年度目标',
       dataIndex: 'yearValue',
       valueType: 'digit',
+      width: '6em',
       fieldProps: { style: { width: '100%' }, step: 10000 * 1 },
       formItemProps: {
         style: { width: '100%' },
@@ -112,7 +114,7 @@ export default observer((props) => {
         </Space>
       ),
       valueType: 'option',
-      // width: 250,
+      width: '5em',
       render: () => {
         return null;
       },
diff --git a/src/components/kpi/SubjectTable/Profit.jsx b/src/components/kpi/SubjectTable/Profit.jsx
index 6e2007e..68bc77e 100644
--- a/src/components/kpi/SubjectTable/Profit.jsx
+++ b/src/components/kpi/SubjectTable/Profit.jsx
@@ -82,6 +82,7 @@ export default observer((props) => {
       title: curObjectItem.label,
       dataIndex: 'object_id',
       editable: false,
+      width: '5em',
       render: (_, r) => r.object_name,
     },
     {
@@ -89,6 +90,7 @@ export default observer((props) => {
       dataIndex: 'yearValue',
       valueType: 'digit',
       fieldProps: { style: { width: '100%' }, step: 10000 * 100 },
+      width: '6em',
       formItemProps: {
         style: { width: '100%' },
       },
@@ -111,7 +113,7 @@ export default observer((props) => {
         </Space>
       ),
       valueType: 'option',
-      // width: 250,
+      width: '5em',
       render: () => {
         return null;
       },
diff --git a/src/components/kpi/SubjectTable/Rates.jsx b/src/components/kpi/SubjectTable/Rates.jsx
index ab7d727..6de4235 100644
--- a/src/components/kpi/SubjectTable/Rates.jsx
+++ b/src/components/kpi/SubjectTable/Rates.jsx
@@ -77,12 +77,14 @@ export default observer((props) => {
       title: curObjectItem.label,
       dataIndex: 'object_id',
       editable: false,
+      width: '5em',
       render: (_, r) => r.object_name,
     },
     {
       title: '年度目标',
       dataIndex: 'yearValue',
       valueType: 'percent',
+      width: '6em',
       formItemProps: {
         style: { width: '100%' },
       },
@@ -106,7 +108,7 @@ export default observer((props) => {
         </Space>
       ),
       valueType: 'option',
-      // width: 250,
+      width: '5em',
       render: () => {
         return null;
       },
diff --git a/src/libs/ht.js b/src/libs/ht.js
index fc7b137..eb5905b 100644
--- a/src/libs/ht.js
+++ b/src/libs/ht.js
@@ -158,7 +158,7 @@ export const KPIObjects = [
 export const KPISubjects = [
   { key: 'sum_profit', value: 'sum_profit', label: '毛利' },
   { key: 'in_order_count', value: 'in_order_count', label: '订单数' },
-  { key: 'confirm_order_count', value: 'confirm_order_count', label: '成团' },
+  { key: 'confirm_order_count', value: 'confirm_order_count', label: '成团数' },
   // { key: 'depart_order_count', value: 'depart_order_count', label: '走团' },  // 根据日期类型
   { key: 'confirm_rates', value: 'confirm_rates', label: '成行率' },
   // { key: 'praise_rates', value: 'praise_rates', label: '表扬率' },
diff --git a/src/views/Sale_KPI.jsx b/src/views/Sale_KPI.jsx
index 652d058..2790c08 100644
--- a/src/views/Sale_KPI.jsx
+++ b/src/views/Sale_KPI.jsx
@@ -45,6 +45,13 @@ const Sale_KPI = () => {
               percent={row.mData[`month_${String(index + 1).padStart(2, '0')}`]?.MLKPIrates || 0}
               size="small"
               format={(percent) => `${row.mData[`month_${String(index + 1).padStart(2, '0')}`]?.MLKPIrates || 0}%`}
+              status={
+                row.mData[`month_${String(index + 1).padStart(2, '0')}`].MLKPIrates < 80
+                  ? 'exception'
+                  : row.mData[`month_${String(index + 1).padStart(2, '0')}`].MLKPIrates < 100
+                  ? 'normal'
+                  : 'success'
+              }
             />
           ) : (
             '-'
@@ -76,7 +83,16 @@ const Sale_KPI = () => {
             <span style={{ marginRight: '.5em' }}>完成</span>
             {dataFieldAlias.SumML.formatter(row.yData?.SumML || 0)}
           </div>
-          {row.yData?.MLKPIrates || 0 ? <Progress percent={row.yData?.MLKPIrates || 0} size="small" format={(percent) => `${row.yData?.MLKPIrates || 0}%`} /> : '-'}
+          {row.yData?.MLKPIrates || 0 ? (
+            <Progress
+              percent={row.yData?.MLKPIrates || 0}
+              size={'small'}
+              format={(percent) => `${row.yData?.MLKPIrates || 0}%`}
+              status={row.yData.MLKPIrates < 80 ? 'exception' : row.yData.MLKPIrates < 100 ? 'normal' : 'success'}
+            />
+          ) : (
+            '-'
+          )}
         </Space>
       ),
     },
diff --git a/src/views/kpi.css b/src/views/kpi.css
index ac1d799..e19a9a5 100644
--- a/src/views/kpi.css
+++ b/src/views/kpi.css
@@ -15,3 +15,6 @@
     padding-left: 4px;
     padding-right: 4px;
 }
+.ant-tabs-left > .ant-tabs-nav .ant-tabs-tab{
+    padding: 8px;
+}