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); - + return }) } @@ -98,16 +98,16 @@ function Detail(props) { function EffectiveDetail(props) { const { record } = props; - console.log(123); + console.log(123,record); return ( <> - {record.effective_date} + {record.date} - {record.time_part_arr.map((item, index) => { + {record.details.map((item, index) => { return ; })} @@ -145,34 +145,38 @@ function TimePartDetail(props) { <> - {`${record.time_part[0]}-${record.time_part[1]}`} + {`${record.start}-${record.end}`} - {(record.interval === 1 || record.interval === 2) && ( + {(record.type === 1 || record.type === 2) && ( - {record.time_max_money} + {record.limit} )} - {partName(record.interval)} + {partName(record.type)} - {record.interval === 1 && ( + {record.type === 1 && ( <> -
{`前:${record.time_before} 分钟,${record.time_before_money}元/${record.time_before_minute}分钟`}
+ {/*
{`前:${record.time_before} 分钟,${record.time_before_money}元/${record.time_before_minute}分钟`}
*/} +
{`前:${record.items&&record.items[0].segment} 分钟,${record.items&&record.items[0].unit}元/${record.items&&record.items[0].period}分钟`}
-
{`满:${record.time_before} 分钟后,${record.time_after_money}元/${record.time_after_minute}分钟`}
+ {/*
{`满:${record.time_before} 分钟后,${record.time_after_money}元/${record.time_after_minute}分钟`}
*/} + {record.items&&record.items[0].sub?
{`满:${record.items&&record.items[0].segment} 分钟后,${record.items[0].sub[0].unit}元/${record.items[0].sub[0]?.period}分钟`}
:null}
)} - {record.interval === 2 && ( + {record.type === 2 && ( -
{`${record.time_money}元/${record.time_minute}分钟`}
+ {/*
{`${record.time_money}元/${record.time_minute}分钟`}
*/} +
{`${record.items&&record.items[0].unit}元/${record.items&&record.items[0].period}分钟`}
)} - {record.interval === 3 && ( + {record.type === 3 && ( -
{`${record.money_per_time}元/次`}
+ {/*
{`${record.money_per_time}元/次`}
*/} +
{`${record.items&&record.items[0].unit}元/次`}
)}