Merge branch 'dev' of http://smartcost.in.8866.org:26903/outaozhen/cldV2react into dev

src/pages/Workbench/Dashboard/index.jsx

@@ -170,7 +170,12 @@ const Dashboard = ({ dispatch, departments = [] }) => {
         type: 'staff/fetchDepartments'
       })
     }
-  }, [state.params.businessGroupId, state.params.dataPermission, state.params.cyclical, state.params.staffIds])
+  }, [
+    state.params.businessGroupId,
+    state.params.dataPermission,
+    state.params.cyclical,
+    state.params.staffIds
+  ])
 
   const columns = [
     {
@@ -183,7 +188,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       render: (name, record) => (
         <span
           onClick={() => handleReminderList(record.type, '7day')}
-          className="text-primary cursor-pointer hover:text-hex-967bbd">
+          className="text-primary cursor-pointer hover:text-hex-967bbd"
+        >
           {name}
         </span>
       )
@@ -194,7 +200,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       render: (name, record) => (
         <span
           onClick={() => handleReminderList(record.type, '15day')}
-          className="text-primary cursor-pointer hover:text-hex-967bbd">
+          className="text-primary cursor-pointer hover:text-hex-967bbd"
+        >
           {name}
         </span>
       )
@@ -205,7 +212,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       render: (name, record) => (
         <span
           onClick={() => handleReminderList(record.type, '30day')}
-          className="text-primary cursor-pointer hover:text-hex-967bbd">
+          className="text-primary cursor-pointer hover:text-hex-967bbd"
+        >
           {name}
         </span>
       )
@@ -216,7 +224,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       render: (name, record) => (
         <span
           onClick={() => handleReminderList(record.type, '3month')}
-          className="text-primary cursor-pointer hover:text-hex-967bbd">
+          className="text-primary cursor-pointer hover:text-hex-967bbd"
+        >
           {name}
         </span>
       )
@@ -227,7 +236,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       render: (name, record) => (
         <span
           onClick={() => handleReminderList(record.type, '9month')}
-          className="text-primary cursor-pointer hover:text-hex-967bbd">
+          className="text-primary cursor-pointer hover:text-hex-967bbd"
+        >
           {name}
         </span>
       )
@@ -240,7 +250,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       render: (_, record) => (
         <span
           onClick={() => handleReminderList(record.type, 'expiry')}
-          className="text-primary cursor-pointer hover:text-hex-967bbd">
+          className="text-primary cursor-pointer hover:text-hex-967bbd"
+        >
           {record.remind.expiry}
         </span>
       )
@@ -251,7 +262,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       render: (_, record) => (
         <span
           onClick={() => handleReminderList(record.type, 'unexpired')}
-          className="text-primary cursor-pointer hover:text-hex-967bbd">
+          className="text-primary cursor-pointer hover:text-hex-967bbd"
+        >
           {record.remind.unexpired}
         </span>
       )
@@ -286,7 +298,7 @@ const Dashboard = ({ dispatch, departments = [] }) => {
   return (
     <div className={styles.dashboard}>
       <div>
-        {/* <div className="shadow-card">
+        <div className="shadow-card">
           <ProTable
             bordered
             loading={state.loading}
@@ -302,9 +314,9 @@ const Dashboard = ({ dispatch, departments = [] }) => {
             )}
             pagination={false}
           />
-        </div> */}
-        <Row gutter={[8, 8]}>
-          {/* <Col xs={24} sm={24} md={24} lg={18} xl={18}> */}
+        </div>
+        {/* <Row gutter={[8, 8]}>
+          <Col xs={24} sm={24} md={24} lg={18} xl={18}>
           <div className="shadow-card">
             <ProTable
               bordered
@@ -322,8 +334,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
               pagination={false}
             />
           </div>
-          {/* </Col> */}
-          {/* <Col xs={24} sm={24} md={24} lg={6} xl={6}>
+          </Col>
+          <Col xs={24} sm={24} md={24} lg={6} xl={6}>
             <div className="shadow-card">
               <ProTable
                 bordered
@@ -341,8 +353,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
                 pagination={false}
               />
             </div>
-          </Col> */}
-        </Row>
+          </Col>
+        </Row> */}
       </div>
 
       <div className="mt-4 flex flex-row ">
@@ -397,7 +409,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
                     'relative',
                     'cursor-pointer',
                     state.selectId === item.id ? styles.imgBg : styles.paddingBg
-                  ].join(' ')}>
+                  ].join(' ')}
+                >
                   <img
                     className="w-full max-w-30px h-30px border rounded-30px"
                     src={
@@ -432,8 +445,11 @@ const Dashboard = ({ dispatch, departments = [] }) => {
                       <span
                         className={[
                           'text-xl',
-                          state.clientChainRatio.percentage.startsWith('-') ? 'text-green-500' : 'text-red-500'
-                        ].join(' ')}>
+                          state.clientChainRatio.percentage.startsWith('-')
+                            ? 'text-green-500'
+                            : 'text-red-500'
+                        ].join(' ')}
+                      >
                         {state.clientChainRatio.percentage}
                       </span>
                     </div>
@@ -463,8 +479,11 @@ const Dashboard = ({ dispatch, departments = [] }) => {
                       <span
                         className={[
                           'text-xl',
-                          state.customerChainRatio.percentage.startsWith('-') ? 'text-green-500' : 'text-red-500'
-                        ].join(' ')}>
+                          state.customerChainRatio.percentage.startsWith('-')
+                            ? 'text-green-500'
+                            : 'text-red-500'
+                        ].join(' ')}
+                      >
                         {state.customerChainRatio.percentage}
                       </span>
                     </div>
@@ -533,8 +552,11 @@ const Dashboard = ({ dispatch, departments = [] }) => {
                       <span
                         className={[
                           'text-xl',
-                          state.serviceLogChainRatio.percentage.startsWith('-') ? 'text-green-500' : 'text-red-500'
-                        ].join(' ')}>
+                          state.serviceLogChainRatio.percentage.startsWith('-')
+                            ? 'text-green-500'
+                            : 'text-red-500'
+                        ].join(' ')}
+                      >
                         {state.serviceLogChainRatio.percentage}
                       </span>
                     </div>
@@ -566,7 +588,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
               title="数据汇总"
               className="shadow-card"
               bodyStyle={{ padding: state.loading ? '24px' : 0 }}
-              loading={state.loading}>
+              loading={state.loading}
+            >
               <ul>
                 <li className="px-12px py-16px border-b-1">
                   新增客户<b className="px-1">{state.aggregation.clientCount}</b>个，服务