chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix():接口对接

tags/PMS_Frontend_v1.0.6-develop
xingjx 1 year ago
parent
7ea4e250ff
commit
17194840e7
9 changed files with 49 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
  2. 16
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
  3. 13
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
  4. 18
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
  5. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
  6. 6
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
  7. 16
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
  8. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
  9. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx

16
src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
View File

@ -300,12 +300,12 @@ function CarTypeAly() {
postData = { ...holdData }; postData = { ...holdData };
} }
setDefaultParams({ ...postData, ...pageInfo }); 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); //setTabLoading(true);
setLoading(false); setLoading(false);
let params = { ...postData, ...v, ...pageInfo } let params = { ...postData, ...v, ...pageInfo }
@ -484,7 +484,7 @@ function CarTypeAly() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -524,7 +524,7 @@ function CarTypeAly() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }

16
src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
View File

@ -254,12 +254,12 @@ function NightParkStat() {
postData = { ...holdData }; postData = { ...holdData };
} }
setDefaultParams({ ...postData, ...pageInfo }); 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); setLoading(false);
setTabLoading(false); setTabLoading(false);
let params = { ...postData, ...v, ...pageInfo } let params = { ...postData, ...v, ...pageInfo }
@ -466,7 +466,7 @@ function NightParkStat() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -506,7 +506,7 @@ function NightParkStat() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }

13
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
View File

@ -105,7 +105,7 @@ function ParkBerthAly() {
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
render: (text, record, index) => { 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', key: 'utilization_rate',
//width: 200, //width: 200,
render: (text, record, index) => { 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', dataIndex: 'label',
key: 'label', key: 'label',
render: (text, record, index) => { 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 || {}); setResultData(res?.data || {});
if (res.data?.list?.length > 0) { if (res.data?.list?.length > 0) {
setBaseData(res?.data?.list[0]) setBaseData(res?.data?.list[0])
getParkingIncome({ ...postData, ...v, ...pageInfo, road_id: res?.data?.list[0].road_id })
} }
let maker = [] let maker = []
res.data?.list?.map((item) => { res.data?.list?.map((item) => {
@ -341,7 +342,7 @@ function ParkBerthAly() {
setTabLoading(true); setTabLoading(true);
let params = { ...postData, ...v, ...pageInfo } let params = { ...postData, ...v, ...pageInfo }
//请求接口 //请求接口
getParkingIncome(params)
//getParkingIncome(params)
getData(params) getData(params)
}; };
// 检索数据 // 检索数据
@ -418,7 +419,7 @@ function ParkBerthAly() {
label: "冷门车场", label: "冷门车场",
}, },
]} ]}
onChange={(e) => { setFormData({ ...formData.label }) }}
onChange={(e) => { setFormData({ ...formData, label: e }) }}
></Select> ></Select>
</div> </div>
<div className="search-btn" onClick={() => { handleSearch(); getParkingIncome(formData) }}>查询</div> <div className="search-btn" onClick={() => { handleSearch(); getParkingIncome(formData) }}>查询</div>
@ -460,7 +461,7 @@ function ParkBerthAly() {
<div className="result-header rec"> <div className="result-header rec">
<div className="result-content"> <div className="result-content">
<div className="title">平均停车时长</div> <div className="title">平均停车时长</div>
<div className="num">{baseData.average_day || "--"}</div>
<div className="num">{baseData.average_duration || "--"}</div>
</div> </div>
</div> </div>
</div> </div>

18
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
View File

@ -288,12 +288,12 @@ function ParkTurnoverAly() {
postData = { ...holdData }; postData = { ...holdData };
} }
setDefaultParams({ ...postData, ...pageInfo }); 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); setTabLoading(true);
setLoading(false); setLoading(false);
let params = { ...postData, ...v, ...pageInfo } let params = { ...postData, ...v, ...pageInfo }
@ -443,7 +443,7 @@ function ParkTurnoverAly() {
} }
/> />
</div> */} </div> */}
<div className="yisa-search">
<div className="yisa-search">
<label>日期 <label>日期
<div className="daf"> <div className="daf">
<Select <Select
@ -499,7 +499,7 @@ function ParkTurnoverAly() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -539,7 +539,7 @@ function ParkTurnoverAly() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
View File

@ -445,7 +445,7 @@ function ParkUsageAly() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -485,7 +485,7 @@ function ParkUsageAly() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }

6
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
View File

@ -993,7 +993,7 @@ function ParkingAlyDuration() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -1033,7 +1033,7 @@ function ParkingAlyDuration() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }
@ -1173,7 +1173,7 @@ function ParkingAlyDuration() {
</div> </div>
<div className="result-box duration-right"> <div className="result-box duration-right">
<div className="result-box-title">平均停车时长排行榜</div> <div className="result-box-title">平均停车时长排行榜</div>
<div className="export-btn" onClick={() => { handleExportCar }}>导出</div>
<div className="export-btn" onClick={() => { handleExportCar() }}>导出</div>
<Tabs <Tabs
defaultActiveKey="2" defaultActiveKey="2"
activeKey={tabCarKey} activeKey={tabCarKey}

16
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
View File

@ -370,12 +370,12 @@ function ParkingAlyOverview() {
postData = { ...holdData }; postData = { ...holdData };
} }
setDefaultParams({ ...postData, ...pageInfo }); 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); setTabLoading(true);
let params = { ...postData, ...v, ...pageInfo } let params = { ...postData, ...v, ...pageInfo }
//请求接口 //请求接口
@ -554,7 +554,7 @@ function ParkingAlyOverview() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -594,7 +594,7 @@ function ParkingAlyOverview() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
View File

@ -585,7 +585,7 @@ function ParkingAlyPeriod() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -625,7 +625,7 @@ function ParkingAlyPeriod() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
View File

@ -408,7 +408,7 @@ function TemporaryParkStat() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, start_time: dateString }); setFormData({ ...formData, start_time: dateString });
} }
@ -448,7 +448,7 @@ function TemporaryParkStat() {
}); });
} }
} else if (TimeChange().str == "month") { } 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 { } else {
setFormData({ ...formData, end_time: dateString }); setFormData({ ...formData, end_time: dateString });
} }

Write Preview
Loading…
Cancel
Save