From 7eb33a6168a370db57af50caa9d4f3bbb59a78e6 Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Wed, 6 Dec 2023 16:20:06 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E8=90=A5=E6=94=B6=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Export/ExportBtnNew/index.jsx                 |  1 +
 .../ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx        |  2 +-
 .../ParkingIncomeAly/CityArrearageAly/loadable.jsx           |  2 +-
 .../ParkingIncomeAly/OrderArrearageAly/loadable.jsx          | 12 +++++++-----
 .../ParkingIncomeAly/PriceAly/loadable.jsx                   |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/Export/ExportBtnNew/index.jsx b/src/components/Export/ExportBtnNew/index.jsx
index 048b657..fbd18eb 100644
--- a/src/components/Export/ExportBtnNew/index.jsx
+++ b/src/components/Export/ExportBtnNew/index.jsx
@@ -160,6 +160,7 @@ function ExportBtn(props) {
     //当前页
     else if (checkedType == 1) {
       const { pn, length } = postdata.formData
+      console.log(postdata.formData)
       startExport((pn - 1) * length + 1, pn * length, exportType == "hasImg" ? 1 : 0)
     }
     //全部
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx
index 6227754..e7eadf3 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx
@@ -107,7 +107,7 @@ function ArrearageRecoverAly(props) {
                     list: res.data.list,
                     totalRecords: res.totalRecords || 0
                 })
-                initTrendLineChart([...res.data.trend])
+                initTrendLineChart([...res.data.trend].reverse())
                 setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss"))
             }
             setLoading(false)
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx
index 8cd0e23..cb4a0e6 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx
@@ -107,7 +107,7 @@ function CityArrearageAly(props) {
                     list: res.data.list,
                     totalRecords: res.totalRecords || 0
                 })
-                initTrendLineChart([...res.data.trend])
+                initTrendLineChart([...res.data.trend].reverse())
                 setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss"))
             }
             setLoading(false)
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx
index f847375..70601a0 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx
@@ -26,8 +26,10 @@ function OrderArrearageAly(props) {
         pay_merchant_id: 0,
         park_text: "",
         date_type: "day",
-        start_time: moment().startOf("day").format('YYYY-MM-DD'),
-        end_time: moment().format('YYYY-MM-DD')
+        // start_time: moment().startOf("day").format('YYYY-MM-DD'),
+        // end_time: moment().format('YYYY-MM-DD'),
+        start_time: moment().subtract(1, 'days').startOf("day").format('YYYY-MM-DD'),
+        end_time: moment().subtract(1, 'days').format('YYYY-MM-DD')
     }
     const [formData, setFormData] = useState({
         ...defaultFormData
@@ -118,10 +120,10 @@ function OrderArrearageAly(props) {
     }
     const ajaxGetListData = (isLine=false, newPageInfo={}) => {
         setLoading(true)
-        ajax.getArrearOrderTrendData(Object.assign({...formData, ...newPageInfo}, isLine ? {} : {...pageInfo})).then(res => {
+        ajax.getArrearOrderTrendData(Object.assign({...formData, ...newPageInfo})).then(res => {
             if (res.status == 20000) {
                 // if (isLine) {
-                    initTrendLineChart([...res.data])
+                    initTrendLineChart([...res.data].reverse())
                     setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss"))
                 // } else {
                     setResultDate({
@@ -507,7 +509,7 @@ function OrderArrearageAly(props) {
                         // exportUrl="/api/dataAnalysis/arrearsCity"
                         exportUrl="/api/ana/arrearage/arrears_order"
                         postdata={{
-                            formData: {...formData, ...{is_excel: 1}}
+                            formData: {...formData, ...{is_excel: 1}, ...pageInfo}
                         }}
                         imgno={false}
                     />
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx
index f870cba..3c2cbe5 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx
@@ -115,7 +115,7 @@ function PriceAly(props) {
                     list: res.data.list,
                     totalRecords: res.totalRecords || 0
                 })
-                initTrendLineChart([...res.data.trend])
+                initTrendLineChart([...res.data.trend].reverse())
             }
             setLoading(false)
         })