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
{ setBaseData(record); getParkingIncome(formData) }}>{text}
+ return { setBaseData(record); getParkingIncome({ ...formData, road_id: record.road_id }) }}>{text}
}
},
{
@@ -114,7 +114,7 @@ function ParkBerthAly() {
key: 'utilization_rate',
//width: 200,
render: (text, record, index) => {
- return { setBaseData(record); getParkingIncome(formData) }}>{text}
+ return { setBaseData(record); getParkingIncome({ ...formData, road_id: record.road_id }) }}>{text}
}
},
{
@@ -122,7 +122,7 @@ function ParkBerthAly() {
dataIndex: 'label',
key: 'label',
render: (text, record, index) => {
- return { setBaseData(record); getParkingIncome(formData) }}>{text}
+ return { setBaseData(record); getParkingIncome({ ...formData, road_id: record.road_id }) }}>{text}
}
},
@@ -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 }) }}
>
{ handleSearch(); getParkingIncome(formData) }}>查询
@@ -460,7 +461,7 @@ function ParkBerthAly() {
平均停车时长
-
{baseData.average_day || "--"}
+
{baseData.average_duration || "--"}
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() {
}
/>
*/}
-
+