Browse Source

feat(): 营收分析,已知问题处理

tags/PMS_Frontend_v1.0.6-develop
wanghx 1 year ago
parent
commit
7eb33a6168
  1. 1
      src/components/Export/ExportBtnNew/index.jsx
  2. 2
      src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx
  3. 2
      src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx
  4. 12
      src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx
  5. 2
      src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx

1
src/components/Export/ExportBtnNew/index.jsx

@ -160,6 +160,7 @@ function ExportBtn(props) {
// //
else if (checkedType == 1) { else if (checkedType == 1) {
const { pn, length } = postdata.formData const { pn, length } = postdata.formData
console.log(postdata.formData)
startExport((pn - 1) * length + 1, pn * length, exportType == "hasImg" ? 1 : 0) startExport((pn - 1) * length + 1, pn * length, exportType == "hasImg" ? 1 : 0)
} }
// //

2
src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx

@ -107,7 +107,7 @@ function ArrearageRecoverAly(props) {
list: res.data.list, list: res.data.list,
totalRecords: res.totalRecords || 0 totalRecords: res.totalRecords || 0
}) })
initTrendLineChart([...res.data.trend])
initTrendLineChart([...res.data.trend].reverse())
setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss")) setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss"))
} }
setLoading(false) setLoading(false)

2
src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx

@ -107,7 +107,7 @@ function CityArrearageAly(props) {
list: res.data.list, list: res.data.list,
totalRecords: res.totalRecords || 0 totalRecords: res.totalRecords || 0
}) })
initTrendLineChart([...res.data.trend])
initTrendLineChart([...res.data.trend].reverse())
setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss")) setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss"))
} }
setLoading(false) setLoading(false)

12
src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx

@ -26,8 +26,10 @@ function OrderArrearageAly(props) {
pay_merchant_id: 0, pay_merchant_id: 0,
park_text: "", park_text: "",
date_type: "day", 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({ const [formData, setFormData] = useState({
...defaultFormData ...defaultFormData
@ -118,10 +120,10 @@ function OrderArrearageAly(props) {
} }
const ajaxGetListData = (isLine=false, newPageInfo={}) => { const ajaxGetListData = (isLine=false, newPageInfo={}) => {
setLoading(true) 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 (res.status == 20000) {
// if (isLine) { // if (isLine) {
initTrendLineChart([...res.data])
initTrendLineChart([...res.data].reverse())
setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss")) setStaticsTime(moment().format("YYYY-MM-DD HH:mm:ss"))
// } else { // } else {
setResultDate({ setResultDate({
@ -507,7 +509,7 @@ function OrderArrearageAly(props) {
// exportUrl="/api/dataAnalysis/arrearsCity" // exportUrl="/api/dataAnalysis/arrearsCity"
exportUrl="/api/ana/arrearage/arrears_order" exportUrl="/api/ana/arrearage/arrears_order"
postdata={{ postdata={{
formData: {...formData, ...{is_excel: 1}}
formData: {...formData, ...{is_excel: 1}, ...pageInfo}
}} }}
imgno={false} imgno={false}
/> />

2
src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx

@ -115,7 +115,7 @@ function PriceAly(props) {
list: res.data.list, list: res.data.list,
totalRecords: res.totalRecords || 0 totalRecords: res.totalRecords || 0
}) })
initTrendLineChart([...res.data.trend])
initTrendLineChart([...res.data.trend].reverse())
} }
setLoading(false) setLoading(false)
}) })

Loading…
Cancel
Save