Browse Source

Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

tags/PMS_V1.0.0_Alpha6
wanghx 1 year ago
parent
commit
3bdb4bab90
  1. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
  2. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
  3. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
  4. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx
  5. 4
      src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx

@ -709,7 +709,7 @@ function CarTypeAly() {
exportUrl="/api/ana/dataanalysis/carType_export" exportUrl="/api/ana/dataanalysis/carType_export"
postdata={{ postdata={{
// formData: {...pageInfo, export_type: 'all', area_id: sessionTabList?.show} // formData: {...pageInfo, export_type: 'all', area_id: sessionTabList?.show}
formData: { ...pageInfo, export: 1, type: tabKey == 2 ? 'road' : 'region', ...formData, sort: 'desc', area_id: sessionTabList?.show}
formData: { ...defaultParams, ...pageInfo, export: 1, type: tabKey == 2 ? 'road' : 'region', area_id: sessionTabList?.show }
}} }}
imgno={false} imgno={false}
/> />

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx

@ -927,7 +927,7 @@ function ParkingAlyDuration() {
exportUrl="/api/ana/dataanalysis/get_turn_times_export" exportUrl="/api/ana/dataanalysis/get_turn_times_export"
pageName="parkingOverview" pageName="parkingOverview"
postdata={{ postdata={{
formData: {...pageInfo, export_type: 'all', area_id: sessionTabList?.show}
formData: { ...defaultParams, ...pageInfo, export_type: 'all', area_id: sessionTabList?.show }
}} }}
imgno={false} imgno={false}
/> />
@ -1031,7 +1031,7 @@ function ParkingAlyDuration() {
exportUrl="/api/ana/dataanalysis/get_parking_duration_export" exportUrl="/api/ana/dataanalysis/get_parking_duration_export"
pageName="parkingOverview" pageName="parkingOverview"
postdata={{ postdata={{
formData: {...pageInfo, export_type: 'all', area_id: sessionTabList?.show}
formData: { ...defaultParams, ...pageInfo, export_type: 'all', area_id: sessionTabList?.show }
}} }}
imgno={false} imgno={false}
/> />

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx

@ -776,7 +776,7 @@ function ParkingAlyOverview() {
exportUrl="/api/ana/dataanalysis/parking_export" exportUrl="/api/ana/dataanalysis/parking_export"
pageName="parkingOverview" pageName="parkingOverview"
postdata={{ postdata={{
formData: {...pageInfo, export_type: 'all', area_id: sessionTabList?.show}
formData: { ...defaultParams, ...pageInfo, export_type: 'all', area_id: sessionTabList?.show }
}} }}
imgno={false} imgno={false}
/> />

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx

@ -537,7 +537,7 @@ function ParkingAlyReport() {
exportUrl="/api/ana/dataanalysis/parking_total_analysis_export" exportUrl="/api/ana/dataanalysis/parking_total_analysis_export"
pageName="parkingOverview" pageName="parkingOverview"
postdata={{ postdata={{
formData: { ...formData, ...pageInfo, area_id: sessionTabList?.show }
formData: { ...defaultParams, ...pageInfo, area_id: sessionTabList?.show }
}} }}
imgno={false} imgno={false}
/> />

4
src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx

@ -764,10 +764,10 @@ function CreditScoreMgm() {
</div> </div>
</div> </div>
</div> </div>
<div className="ltc-box-title">
<div className="ltc-box-title" style={{display:'none'}}>
<div className="line" style={{ width: "40%" }}></div><div className="text">积分倒扣机制</div><div className="line" style={{ width: "40%" }}></div> <div className="line" style={{ width: "40%" }}></div><div className="text">积分倒扣机制</div><div className="line" style={{ width: "40%" }}></div>
</div> </div>
<div className="ltc-content">
<div className="ltc-content" style={{display:'none'}}>
<div className="ltc-item"> <div className="ltc-item">
<div className="new-item golit">欠费金额每高于</div> <div className="new-item golit">欠费金额每高于</div>
<div className="new-value" style={{ width: "100px" }}> <div className="new-value" style={{ width: "100px" }}>

Loading…
Cancel
Save