From 17194840e7719b1e2cddae46f314c8a98a002d83 Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Thu, 30 Nov 2023 23:50:25 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ParkingBusinessAly/CarTypeAly/loadable.jsx | 16 ++++++++--------
.../ParkingBusinessAly/NightParkStat/loadable.jsx | 16 ++++++++--------
.../ParkingBusinessAly/ParkBerthAly/loadable.jsx | 13 +++++++------
.../ParkingBusinessAly/ParkTurnoverAly/loadable.jsx | 18 +++++++++---------
.../ParkingBusinessAly/ParkUsageAly/loadable.jsx | 4 ++--
.../ParkingBusinessAly/ParkingAlyDuration/loadable.jsx | 6 +++---
.../ParkingBusinessAly/ParkingAlyOverview/loadable.jsx | 16 ++++++++--------
.../ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx | 4 ++--
.../ParkingBusinessAly/TemporaryParkStat/loadable.jsx | 4 ++--
9 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
index 8e2467e..ea539a5 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
@@ -300,12 +300,12 @@ function CarTypeAly() {
postData = { ...holdData };
}
setDefaultParams({ ...postData, ...pageInfo });
- // if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
- // message.error("时间范围限制为31天！")
- // setLoading(false);
- // setTabLoading(false);
- // return
- // }
+ if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
+ message.error("时间范围限制为31天！")
+ setLoading(false);
+ setTabLoading(false);
+ return
+ }
//setTabLoading(true);
setLoading(false);
let params = { ...postData, ...v, ...pageInfo }
@@ -484,7 +484,7 @@ function CarTypeAly() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -524,7 +524,7 @@ function CarTypeAly() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
index df1b730..e7a7c09 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
@@ -254,12 +254,12 @@ function NightParkStat() {
postData = { ...holdData };
}
setDefaultParams({ ...postData, ...pageInfo });
- // if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
- // message.error("时间范围限制为31天！")
- // setLoading(false);
- // setTabLoading(false);
- // return
- // }
+ if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
+ message.error("时间范围限制为31天！")
+ setLoading(false);
+ setTabLoading(false);
+ return
+ }
setLoading(false);
setTabLoading(false);
let params = { ...postData, ...v, ...pageInfo }
@@ -466,7 +466,7 @@ function NightParkStat() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -506,7 +506,7 @@ function NightParkStat() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
index 3b6de3b..1b044d8 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
@@ -105,7 +105,7 @@ function ParkBerthAly() {
dataIndex: 'name',
key: 'name',
render: (text, record, index) => {
- return <div onClick={() => { setBaseData(record); getParkingIncome(formData) }}>{text}</div>
+ return <div onClick={() => { setBaseData(record); getParkingIncome({ ...formData, road_id: record.road_id }) }}>{text}</div>
}
},
{
@@ -114,7 +114,7 @@ function ParkBerthAly() {
key: 'utilization_rate',
//width: 200,
render: (text, record, index) => {
- return <div onClick={() => { setBaseData(record); getParkingIncome(formData) }}>{text}</div>
+ return <div onClick={() => { setBaseData(record); getParkingIncome({ ...formData, road_id: record.road_id }) }}>{text}</div>
}
},
{
@@ -122,7 +122,7 @@ function ParkBerthAly() {
dataIndex: 'label',
key: 'label',
render: (text, record, index) => {
- return <div onClick={() => { setBaseData(record); getParkingIncome(formData) }}>{text}</div>
+ return <div onClick={() => { setBaseData(record); getParkingIncome({ ...formData, road_id: record.road_id }) }}>{text}</div>
}
},
@@ -305,6 +305,7 @@ function ParkBerthAly() {
setResultData(res?.data || {});
if (res.data?.list?.length > 0) {
setBaseData(res?.data?.list[0])
+ getParkingIncome({ ...postData, ...v, ...pageInfo, road_id: res?.data?.list[0].road_id })
}
let maker = []
res.data?.list?.map((item) => {
@@ -341,7 +342,7 @@ function ParkBerthAly() {
setTabLoading(true);
let params = { ...postData, ...v, ...pageInfo }
//请求接口
- getParkingIncome(params)
+ //getParkingIncome(params)
getData(params)
};
// 检索数据
@@ -418,7 +419,7 @@ function ParkBerthAly() {
label: "冷门车场",
},
]}
- onChange={(e) => { setFormData({ ...formData.label }) }}
+ onChange={(e) => { setFormData({ ...formData, label: e }) }}
></Select>
</div>
<div className="search-btn" onClick={() => { handleSearch(); getParkingIncome(formData) }}>查询</div>
@@ -460,7 +461,7 @@ function ParkBerthAly() {
<div className="result-header rec">
<div className="result-content">
<div className="title">平均停车时长</div>
- <div className="num">{baseData.average_day || "--"}</div>
+ <div className="num">{baseData.average_duration || "--"}</div>
</div>
</div>
</div>
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
index c7bfac3..314ce7b 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
@@ -288,12 +288,12 @@ function ParkTurnoverAly() {
postData = { ...holdData };
}
setDefaultParams({ ...postData, ...pageInfo });
- // if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
- // message.error("时间范围限制为31天！")
- // setLoading(false);
- // setTabLoading(false);
- // return
- // }
+ if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
+ message.error("时间范围限制为31天！")
+ setLoading(false);
+ setTabLoading(false);
+ return
+ }
setTabLoading(true);
setLoading(false);
let params = { ...postData, ...v, ...pageInfo }
@@ -443,7 +443,7 @@ function ParkTurnoverAly() {
}
/>
</div> */}
- <div className="yisa-search">
+ <div className="yisa-search">
<label>日期
<div className="daf">
<Select
@@ -499,7 +499,7 @@ function ParkTurnoverAly() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -539,7 +539,7 @@ function ParkTurnoverAly() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
index 9ea705e..0a1574d 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
@@ -445,7 +445,7 @@ function ParkUsageAly() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -485,7 +485,7 @@ function ParkUsageAly() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
index 113e46c..51b5936 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
@@ -993,7 +993,7 @@ function ParkingAlyDuration() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -1033,7 +1033,7 @@ function ParkingAlyDuration() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}
@@ -1173,7 +1173,7 @@ function ParkingAlyDuration() {
</div>
<div className="result-box duration-right">
<div className="result-box-title">平均停车时长排行榜</div>
- <div className="export-btn" onClick={() => { handleExportCar }}>导出</div>
+ <div className="export-btn" onClick={() => { handleExportCar() }}>导出</div>
<Tabs
defaultActiveKey="2"
activeKey={tabCarKey}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
index 9bb8262..32b893b 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
@@ -370,12 +370,12 @@ function ParkingAlyOverview() {
postData = { ...holdData };
}
setDefaultParams({ ...postData, ...pageInfo });
- // if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
- // message.error("时间范围限制为31天！")
- // setLoading(false);
- // setTabLoading(false);
- // return
- // }
+ if (moment(formData.end_time) - moment(formData.start_time) > 1000 * 31 * 24 * 3600) {
+ message.error("时间范围限制为31天！")
+ setLoading(false);
+ setTabLoading(false);
+ return
+ }
setTabLoading(true);
let params = { ...postData, ...v, ...pageInfo }
//请求接口
@@ -554,7 +554,7 @@ function ParkingAlyOverview() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -594,7 +594,7 @@ function ParkingAlyOverview() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
index d48f57e..677ae77 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
@@ -585,7 +585,7 @@ function ParkingAlyPeriod() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -625,7 +625,7 @@ function ParkingAlyPeriod() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
index c0e9d57..ef1c915 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
@@ -408,7 +408,7 @@ function TemporaryParkStat() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), });
+ setFormData({ ...formData, start_time: moment(date).format("YYYY-MM-DD"), end_time: moment(date).endOf("month").format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, start_time: dateString });
}
@@ -448,7 +448,7 @@ function TemporaryParkStat() {
});
}
} else if (TimeChange().str == "month") {
- setFormData({ ...formData, end_time: moment(date).format("YYYY-MM-DD") });
+ setFormData({ ...formData, start_time: moment(date).startOf('month').format("YYYY-MM-DD"), end_time: moment(date).format("YYYY-MM-DD") });
} else {
setFormData({ ...formData, end_time: dateString });
}