diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index 7d957de..69dada0 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -199,7 +199,7 @@ const TableModule = forwardRef((props, ref) => { //重置 function reset() { searchForm.resetFields(); - setFormData({...searchForm.getFieldsValue()}) + setFormData({ ...searchForm.getFieldsValue() }) fetch() } function cascaderChange(value, options) { @@ -266,7 +266,7 @@ const TableModule = forwardRef((props, ref) => { currentValue = value; const fake = () => { const str = { - plate: value, + plate_number: value, }; ajax.getPlateSearch(str).then((res) => { if (currentValue === value) { @@ -524,21 +524,21 @@ const TableModule = forwardRef((props, ref) => {
- 0 ? isQuickMenu : [ - { text: '昨日', value: 1 }, - { text: '今日', value: 0 }, - { text: '近三日', value: 2 }, - { text: '近一周', value: 6 }, - { text: '近一月', value: 29 }, - { text: '近半年', value: 180 }, - { text: '近一年', value: 365 }, - { text: '近两年', value: 730 }, - ]} - onChange={(v) => { - //setDeftime(v); - toDeftime(v, item.defaultName) - }} /> + 0 ? isQuickMenu : [ + { text: '昨日', value: 1 }, + { text: '今日', value: 0 }, + { text: '近三日', value: 2 }, + { text: '近一周', value: 6 }, + { text: '近一月', value: 29 }, + { text: '近半年', value: 180 }, + { text: '近一年', value: 365 }, + { text: '近两年', value: 730 }, + ]} + onChange={(v) => { + //setDeftime(v); + toDeftime(v, item.defaultName) + }} />
@@ -621,6 +621,10 @@ const TableModule = forwardRef((props, ref) => { form.startTime = moment(form.start_time).format("YYYY-MM-DD HH:mm:ss"); form.endTime = moment(form.end_time).format("YYYY-MM-DD HH:mm:ss"); } + if (exportUrl == "/api/fin/order_search/arrears_order_update_list_export") { //特殊情况，财务管理-停车订单查询-订单修改记录 + form.deal_time_end = moment(form.deal_time_end).format("YYYY-MM-DD HH:mm:ss"); + form.deal_time_start = moment(form.deal_time_start).format("YYYY-MM-DD HH:mm:ss"); + } } exportAjax({ url: exportUrl, @@ -630,7 +634,7 @@ const TableModule = forwardRef((props, ref) => { .then((res) => { if (res.status === 20000) { const link = document.createElement("a"); - link.href = res.data.url; + link.href = res.data.url || res.data.export_url; link.target = "_blank"; // 打开新页面 link.click(); setTipModal({ ...tipModal, visible: false }); @@ -766,11 +770,12 @@ const TableModule = forwardRef((props, ref) => { title="提示" onOk={handleOk} > +
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx index 9c2deff..f713b28 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx @@ -175,7 +175,7 @@ function CarTypeAly() { }; //新能源趋势分析， 折线图 const getRevenueOption = (data) => { - if (!data) return + if (data || data.length <= 0) return // 获取所有地区名称 data.sort((a, b) => { return new Date(a.date) - new Date(b.date); @@ -254,6 +254,9 @@ function CarTypeAly() { getParkingOption(res.data.energy) getCarTypeOption(res.data.car_type) } + // else { + // message.error('暂无数据') + // } }) .catch((err) => console.error(err)); } diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx index c9623ca..aadfde3 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx @@ -170,6 +170,7 @@ function ParkBerthAly() { // "turnover": 8.75, // }, // ] + if (data || data.length <= 0) return // 获取所有地区名称 data.sort((a, b) => { return new Date(a.date) - new Date(b.date); diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss index 239c192..4ecda2d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss @@ -257,4 +257,30 @@ $color-primary : var(--color-primary); margin-left: 20px; } } +} + +.edit-order-inquiry { + /*定义滚动条高宽及背景 + 高宽分别对应横竖滚动条的尺寸*/ + ::-webkit-scrollbar { + width: 6px; + height: 16px; + background-color: #5c5c5c; +} + +/*定义滚动条轨道 + 内阴影+圆角*/ +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; + background-color: #9da2ab; +} + +/*定义滑块 + 内阴影+圆角*/ +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); + background-color: #3b97ff; +} } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index f6e789d..5ce4d2f 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx @@ -155,8 +155,7 @@ function ParkTurnoverAly() { }; //泊位利用率变化趋势 const getRevenueOption = (data) => { - if(!data) return - console.log(data) + if (data || data.length <= 0) return // 获取所有地区名称 data.sort((a, b) => { return new Date(a.date) - new Date(b.date); @@ -207,7 +206,7 @@ function ParkTurnoverAly() { }; //进出场趋势 const getLineOption = (data) => { - if(!data) return + if (data || data.length <= 0) return // 获取所有地区名称 data.sort((a, b) => { return new Date(a.date) - new Date(b.date); diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss index 239c192..4ecda2d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss @@ -257,4 +257,30 @@ $color-primary : var(--color-primary); margin-left: 20px; } } +} + +.edit-order-inquiry { + /*定义滚动条高宽及背景 + 高宽分别对应横竖滚动条的尺寸*/ + ::-webkit-scrollbar { + width: 6px; + height: 16px; + background-color: #5c5c5c; +} + +/*定义滚动条轨道 + 内阴影+圆角*/ +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; + background-color: #9da2ab; +} + +/*定义滑块 + 内阴影+圆角*/ +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); + background-color: #3b97ff; +} } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx index d38d43b..991a12a 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx @@ -26,7 +26,7 @@ function ParkUsageAly() { const defaultData = { start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - car_parking_type:'3', + car_parking_type: '3', date_type: '1', // }; // 分页数据 @@ -154,6 +154,7 @@ function ParkUsageAly() { //泊位利用率变化趋势，折线图 const getRevenueOption = (data) => { + if (data || data.length <= 0) return // 获取所有地区名称 data.sort((a, b) => { return new Date(a.date) - new Date(b.date); @@ -207,10 +208,24 @@ function ParkUsageAly() { ajax .getParkUsageAlyLine(data) .then((res) => { + res = { + "status": 20000, + "message": "success", + "data": { + "list": [], + "total_records": 0 + } + } if (res.status === 20000) { console.log(res) getRevenueOption(res.data.list); setResultData(res.data) + } else { + getRevenueOption([]); + setResultData({ + total: 0, + list: [], + }) } }) .catch((err) => console.error(err)); diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx index e213d95..d596d34 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx @@ -227,6 +227,7 @@ function ParkingAlyOverview() { //停车趋势分析，折线图 const getRevenueOption = (data) => { + if (data || data.length <= 0) return // 获取所有地区名称 data.sort((a, b) => { return new Date(a.date) - new Date(b.date); diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx index 9b7e70e..f843c98 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx @@ -142,6 +142,7 @@ function ParkingLiveData() { }; //泊位占用趋势 const getLineOption = (data) => { + if (data || data.length <= 0) return // 获取所有地区名称 data.sort((a, b) => { return new Date(a.hour) - new Date(b.hour); diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx index 7d5cd62..33fada6 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx @@ -318,7 +318,7 @@ function ArrearsCar() { ajax({ url: "/api/ope/record/get_arrearage_car_info", type: "get", - data: { carId: e||carId }, + data: { carId: e || carId }, }).then((res) => { let { status, data, total } = res if (status == 20000) { @@ -329,8 +329,42 @@ function ArrearsCar() { } }) } + function isInteger(obj) { + return typeof obj === 'number' && obj % 1 === 0 + } + //车辆信息，列表 限制条件 + const limitCon = (e) => { + if ((e.refund_amount_min && !e.refund_amount_max) || (!e.refund_amount_min && e.refund_amount_max)) { + alert('请将欠费金额范围写全！') + return 1 + } + if (e && e.refund_amount_min) { + if (!(e && e.refund_amount_min == parseInt(e.refund_amount_min) && isInteger(parseInt(e.refund_amount_min))) || !(e && e.refund_amount_max == parseInt(e.refund_amount_max) && isInteger(parseInt(e.refund_amount_max)))) { + alert('欠费金额必须为整数！') + return 1 + } + } + if (parseInt(e.refund_amount_min) > parseInt(e.refund_amount_max)) { + alert('欠费金额后面的数据必须大于前面的数据！') + return 1 + } + + if ((e.count_min && !e.count_max) || (!e.count_min && e.count_max)) { + alert('请将电话追缴范围写全！') + return 1 + } + if (!(e && e.count_min == parseInt(e.count_min) && isInteger(parseInt(e.count_min))) || !(e && e.count_max == parseInt(e.count_max) && isInteger(parseInt(e.count_max)))) { + console.log(e.count_min) + alert('电话追缴必须为整数！') + return 1 + } + if (parseInt(e.count_min) > parseInt(e.count_max)) { + alert('电话追缴后面的数据必须大于前面的数据！') + return 1 + } + } useEffect(() => { - if(carId){ + if (carId) { searchDetail() } }, [pageData]); @@ -343,7 +377,8 @@ function ArrearsCar() { total={total} search={search} pageName={'arrearsCar'} - exportUrl={'http://192.168.5.149:90/PMS/api/bpm/record/get_record_export'} + limitCon={limitCon} + exportUrl={'/api/bpm/record/get_record_export'} /> 认证状态
{resultData[indexby].auditState || "--"}
- {resultData[indexby].auditState == 1 || resultData[indexby].auditState == 4 ? + {resultData[indexby].auditState == '待审核' || resultData[indexby].auditState == '残疾车待审核' ?
操作人
{resultData[indexby].operator || "--"}
@@ -207,6 +207,13 @@ function CarAuth() {
{resultData[indexby].operate_time || "--"}
} + {resultData[indexby].auditState == '已作废' || resultData[indexby].auditState == '残疾车已作废' ? +
+
拒审理由
+
{resultData[indexby].text || "--"}
+
+ :null + }
车辆认证信息
@@ -230,7 +237,7 @@ function CarAuth() { {/* { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> */}
- { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> {/* { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> */}
@@ -246,10 +253,10 @@ function CarAuth() {
- { setBigPic(resultData[indexby].driving_licence_img1); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].driving_licence_img1); setBigpicVisible(true) }} />
- { setBigPic(resultData[indexby].driving_licence_img2); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].driving_licence_img2); setBigpicVisible(true) }} />
@@ -268,10 +275,10 @@ function CarAuth() {
: null}
- { setBigPic(resultData[indexby].disabled_certificate_img1); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].disabled_certificate_img1); setBigpicVisible(true) }} />
- { setBigPic(resultData[indexby].disabled_certificate_img2); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].disabled_certificate_img2); setBigpicVisible(true) }} />
@@ -401,7 +408,7 @@ function CarAuth() { >
- 请输入拒审理由： +
请输入拒审理由：