diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index 3a99b50..ab9279c 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -186,10 +186,10 @@ const TableModule = forwardRef((props, ref) => { if (mandatory) { let cna = Object.values(searchForm.getFieldsValue([mandatory])) //console.log(mandatory,cna[0],searchForm.getFieldsValue([mandatory])) - // if (!cna[0]) { - // message.error(`查询时间范围大于半年,需填写${mandatory_name}!`) - // return - // } + if (!cna[0]) { + message.error(`查询时间范围大于半年,需填写${mandatory_name}!`) + return + } } } if (limitCon && limitCon(form)) return diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx index 526e395..57c2ce7 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx @@ -389,7 +389,7 @@ function ParkBerthAly() { { setFormData({ ...formData.road_name }) }} + onChange={(e) => { setFormData({ ...formData,road_name:e.target.value }) }} >
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index e10da08..6fb66d6 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx @@ -26,7 +26,7 @@ function ParkTurnoverAly() { start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), date_type: '1', // - car_parking_type:'3' + car_parking_type: '3' }; // 分页数据 const [pageInfo, setPageInfo] = useState({ @@ -206,12 +206,15 @@ function ParkTurnoverAly() { }; //进出场趋势 const getLineOption = (data) => { - if (!data || data.length <= 0) return + if (!data || data.length <= 0) { + setLineData({}) + return + } // 获取所有地区名称 data.sort((a, b) => { return new Date(a.date) - new Date(b.date); }); - const areaNames = data[0].name ? [...new Set(data.map((item) => item.name))] : ['入场次数','出场次数']; + const areaNames = data[0].name ? [...new Set(data.map((item) => item.name))] : ['入场次数', '出场次数']; // 获取所有日期 const dates = [...new Set(data.map((item) => item.date))].sort( (a, b) => a.date - b.date @@ -219,9 +222,9 @@ function ParkTurnoverAly() { // 构建数据对象 const seriesData = areaNames.map((areaName, index) => { let newsave = '' - if (index==0) { + if (index == 0) { newsave = data.map((item) => { return item.in_num }) - }else{ + } else { newsave = data.map((item) => { return item.out_num }) } // 数据 @@ -309,9 +312,9 @@ function ParkTurnoverAly() { // 导出 const handleExport = () => { - if (tableData.list.area_list?.length > 0) { + if (resultData.length > 0) { let { pn, page_size, ...params } = defaultParams; - ajax.getParkingAlyDurationParkingExp(defaultParams).then( + ajax.getparkTurnoverAlyExp(defaultParams).then( (res) => { if (res) { window.open(res.data.export_url) @@ -442,7 +445,7 @@ function ParkTurnoverAly() { } />
*/} -
+
+ { setTipData({ ...tipData, count: e.target.value }) }} /> + 参数默认为5次,“≥n”代表正常,若为“0”表示不限制} > - - - 参数默认为5次,“≥n”代表正常,若为“0”表示不限制} - > - ? - - - - - 参数默认为30天,“≥n”代表正常,若为“0”表示不限制} - > - ? - - -

须知:修改默认参数配置会对全局车场评分有影响,点击确定立即生效,请谨慎修改!

- + ? +
+
车主注册时间≥
+ { setTipData({ ...tipData, days: e.target.value }) }} /> + 参数默认为30天,“≥n”代表正常,若为“0”表示不限制} + > + ? + +

须知:修改默认参数配置会对全局车场评分有影响,点击确定立即生效,请谨慎修改!

{ }); }; +//停车业务分析-泊位周转分析-导出 +const getparkTurnoverAlyExp = (params) => { + return ajax({ + url: "/api/ana/dataanalysis/hardware_export", + type: "post", + data: params, + }); +}; //停车业务分析-车辆类型分析-图 const getCarTypeAlyLine = (params) => { return ajax({ @@ -274,6 +282,7 @@ export default { getParkingLiveDataParkLine, getparkTurnoverAlyList, + getparkTurnoverAlyExp, getCarTypeAlyLine, getCarTypeAlyList,