diff --git a/src/assets/css/ant-modification.scss b/src/assets/css/ant-modification.scss index 4a6f9d9..df9bf21 100644 --- a/src/assets/css/ant-modification.scss +++ b/src/assets/css/ant-modification.scss @@ -268,7 +268,7 @@ .ant-table-fixed-header { .ant-table-tbody { tr:nth-child(2n + 1) > td { - background: var(--table-bg); + //background: var(--table-bg); } tr:nth-child(2n) > td { diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index d7d1420..2e9529a 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -145,9 +145,10 @@ const TableModule = forwardRef((props, ref) => { }, [formData]) //查询函数 - function fetch() { + function fetch(pn) { // setLoading(true); - let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData }; + let pnno = pn ? { pn: 1 } : {} + let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData, ...pnno }; if (timeFlag) { form = { ...form, @@ -481,7 +482,7 @@ const TableModule = forwardRef((props, ref) => { (item.defaultValue && item.defaultValue[1]) || moment() } > - +
{ -
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss index 2ffb766..642842b 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss @@ -142,6 +142,19 @@ $color-primary : var(--color-primary); display: inline-block; } + .export-btn { + display: inline-block; + text-align: center; + float: right; + width: 68px; + height: 34px; + line-height: 34px; + background: linear-gradient(180deg,#3aa9ff, #59b7ff); + border-radius: 4px; + margin-right: 15px; + margin-top: 10px; + cursor: pointer; + } i { border: 1px solid; border-radius: 22px; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx index 07df3ad..86d22b3 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx @@ -212,7 +212,7 @@ function ParkingAlyDuration() { end_time: end, }); }; - //停车场收入概览 + //停车场收入概览 柱状图 const getRevenueOption = (data) => { console.log(data) // data = [ @@ -712,22 +712,22 @@ function ParkingAlyDuration() { } setDefaultParams({ ...postData, ...pageInfo }); setTabLoading(true); - // ajax.getAppList({ ...postData, ...v, ...pageInfo }).then( - // (res) => { - // if (parseInt(res?.status) === 20000) { - // setResultData(res?.data || {}); - // } else { - // message.error(res?.message); - // } - // setLoading(false); - // setTabLoading(false); - // }, - // (err) => { - // console.log(err); - // setLoading(false); - // setTabLoading(false); - // } - // ); + ajax.getParkingAlyDurationParkingList({ ...postData, ...v, ...pageInfo }).then( + (res) => { + if (parseInt(res?.status) === 20000) { + setResultData(res?.data || {}); + } else { + message.error(res?.message); + } + setLoading(false); + setTabLoading(false); + }, + (err) => { + console.log(err); + setLoading(false); + setTabLoading(false); + } + ); }; // 检索数据 @@ -963,6 +963,7 @@ function ParkingAlyDuration() {
日均泊位周转次数排行榜
+
{window.open('/api/ana/dataanalysis/get_turn_times_export')}}>导出
平均停车时长排行榜
+
{window.open('/get_parking_duration_export')}}>导出
+
@@ -421,9 +324,9 @@ function ParkingAlyPeriod() { value: '2', }, ]} - value={formData.pay_merchant_id} + value={formData.car_parking_type} onChange={(v) => - setFormData({ ...formData, pay_merchant_id: v }) + setFormData({ ...formData, car_parking_type: v }) } /> @@ -432,43 +335,19 @@ function ParkingAlyPeriod() { - setFormData({ ...formData, park: e.target.value }) + setFormData({ ...formData, road_name: e.target.value }) } />