From 0fd1bceac2a826bdb7c4cc65b3355dbe9f3dadab Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Mon, 23 Oct 2023 18:11:53 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=AE=A1=E8=B4=B9?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E9=A1=B5=E9=9D=A2=E8=AF=A6=E6=83=85=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx  |  5 +++
 .../OutSegmentMgm/ChargeRulesMgm/Detail.jsx        | 36 ++++++++++++----------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
index 00ff86c..095a45f 100644
--- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
@@ -240,6 +240,7 @@ const OutRoadOverview = () => {
       .getOutRoadBaseInfo()
       .then((res) => {
         if (res.status === 20000) {
+          console.log('顶部数据',res.data)
           setHeaderNums(res.data.list);
         }
       })
@@ -254,6 +255,7 @@ const OutRoadOverview = () => {
       .getOutRoadPaymentTopInfo()
       .then((res) => {
         if (res.status === 20000) {
+          console.log('收入top5',res.data)
           setIncomeTop(res.data.list);
         }
       })
@@ -266,6 +268,7 @@ const OutRoadOverview = () => {
       .getOutRoadParkingTopInfo()
       .then((res) => {
         if (res.status === 20000) {
+          console.log('记录',res.data)
           setRecordTop(res.data.list);
         }
       })
@@ -279,6 +282,7 @@ const OutRoadOverview = () => {
       .getOutRoadParkingIncomeInfo()
       .then((res) => {
         if (res.status === 20000) {
+          console.log('收入概览',res.data)
           getRevenueOption(res.data.list);
         }
       })
@@ -291,6 +295,7 @@ const OutRoadOverview = () => {
       .getOutRoadParkingRecordsInfo()
       .then((res) => {
         if (res.status === 20000) {
+          console.log('记录概览',res.data)
           getRecordOption(res.data.list);
         }
       })
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
index 48c50fb..0ea0f62 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
@@ -88,7 +88,7 @@ function Detail(props) {
         {effectiveDateList &&
           effectiveDateList.map((item, index) => {
             console.log(item);
-            <EffectiveDetail record={effectiveDateList} />
+            return <EffectiveDetail record={item} key={index}/>
           })
         }
       </div>
@@ -98,16 +98,16 @@ function Detail(props) {
 
 function EffectiveDetail(props) {
   const { record } = props;
-  console.log(123);
+  console.log(123,record);
   return (
     <>
       <Descriptions column={2}>
         <Descriptions.Item label="生效日期" span={1}>
-          {record.effective_date}
+          {record.date}
         </Descriptions.Item>
         <Descriptions.Item span={2}>
           <Checkbox.Group
-            defaultValue={record.unit_fee_type_group}
+            defaultValue={[record.unitDelay?1:-1,record.unitUp?2:-1]}
             disabled
             options={[
               {
@@ -122,7 +122,7 @@ function EffectiveDetail(props) {
           ></Checkbox.Group>
         </Descriptions.Item>
       </Descriptions>
-      {record.time_part_arr.map((item, index) => {
+      {record.details.map((item, index) => {
         return <TimePartDetail index={index + 1} record={item} />;
       })}
     </>
@@ -145,34 +145,38 @@ function TimePartDetail(props) {
     <>
       <Descriptions column={2}>
         <Descriptions.Item label={`时段${index}`}>
-          {`${record.time_part[0]}-${record.time_part[1]}`}
+          {`${record.start}-${record.end}`}
         </Descriptions.Item>
-        {(record.interval === 1 || record.interval === 2) && (
+        {(record.type === 1 || record.type === 2) && (
           <Descriptions.Item label="时段最高金额">
-            {record.time_max_money}
+            {record.limit}
           </Descriptions.Item>
         )}
         <Descriptions.Item label={`区间${index}`} span={2}>
-          {partName(record.interval)}
+          {partName(record.type)}
         </Descriptions.Item>
-        {record.interval === 1 && (
+        {record.type === 1 && (
           <>
             <Descriptions.Item span={2}>
-              <div>{`前：${record.time_before} 分钟，${record.time_before_money}元/${record.time_before_minute}分钟`}</div>
+              {/* <div>{`前：${record.time_before} 分钟，${record.time_before_money}元/${record.time_before_minute}分钟`}</div> */}
+              <div>{`前：${record.items&&record.items[0].segment} 分钟，${record.items&&record.items[0].unit}元/${record.items&&record.items[0].period}分钟`}</div>
             </Descriptions.Item>
             <Descriptions.Item span={2}>
-              <div>{`满：${record.time_before} 分钟后，${record.time_after_money}元/${record.time_after_minute}分钟`}</div>
+              {/* <div>{`满：${record.time_before} 分钟后，${record.time_after_money}元/${record.time_after_minute}分钟`}</div> */}
+              {record.items&&record.items[0].sub?<div>{`满：${record.items&&record.items[0].segment} 分钟后，${record.items[0].sub[0].unit}元/${record.items[0].sub[0]?.period}分钟`}</div>:null}
             </Descriptions.Item>
           </>
         )}
-        {record.interval === 2 && (
+        {record.type === 2 && (
           <Descriptions.Item span={2}>
-            <div>{`${record.time_money}元/${record.time_minute}分钟`}</div>
+            {/* <div>{`${record.time_money}元/${record.time_minute}分钟`}</div> */}
+            <div>{`${record.items&&record.items[0].unit}元/${record.items&&record.items[0].period}分钟`}</div>
           </Descriptions.Item>
         )}
-        {record.interval === 3 && (
+        {record.type === 3 && (
           <Descriptions.Item span={2}>
-            <div>{`${record.money_per_time}元/次`}</div>
+            {/* <div>{`${record.money_per_time}元/次`}</div> */}
+            <div>{`${record.items&&record.items[0].unit}元/次`}</div>
           </Descriptions.Item>
         )}
       </Descriptions>