diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx index c0a1da9..9fdca26 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx @@ -78,7 +78,8 @@ const ParkArrear = forwardRef((props, ref) => { total: resultData?.totalRecords, pageSize: pageInfo.length, pageSizeOptions: Array.from( - new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) + // new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) + [...dictionary?.pageSizeOptions] ), onChange: (current, size) => { setPageInfo({ @@ -159,7 +160,7 @@ const ParkArrear = forwardRef((props, ref) => { dataSource={resultData?.list || []} columns={tableColumns} pagination={false} - scroll={{y: 585}} + scroll={{y: 'calc(100% - 200px)'}} loading={tableLoading} /> diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss index 26bef27..493e9be 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss @@ -22,6 +22,7 @@ height: 25px; } .park-table-content { + min-height: 0; flex: 1; .park-table { flex: 1; diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx index 237874a..d98c04b 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx @@ -75,9 +75,7 @@ const PlateArrear = forwardRef((props, ref) => { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: Array.from( - new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) - ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, @@ -286,14 +284,14 @@ const ModalDetail = (props) => { return (
-
欠费总分析详情
+
共查询到{ resultData.totalRecords || 0 }条结果
tr>th { background-color: #616b83; diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss index e4bd7df..7424481 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss @@ -36,6 +36,7 @@ $color-primary : var(--color-primary); margin-bottom: 10px; } .parking-wrapper { + min-height: 0; flex: 1; } } diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx index 410b3ec..ff0096d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx @@ -70,9 +70,10 @@ function ArrearageRecoverAly(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: Array.from( - new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) - ), + // pageSizeOptions: Array.from( + // new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) + // ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx index b182fc6..0d54e82 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx @@ -73,6 +73,7 @@ function CityArrearageAly(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx index 039a42f..9fa51c2 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx @@ -78,6 +78,7 @@ function CityIncomeStat(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx index 11e173d..80fe9b9 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx @@ -81,6 +81,7 @@ function OrderArrearageAly(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx index b4edd2b..003ab6d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx @@ -80,6 +80,7 @@ function PriceAly(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx index eb96e6f..ea70708 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx @@ -112,7 +112,9 @@ function Fence(props) { }) setEditId(item.id) getBerthDataByNvr(item.nvr_id).then(() => { - setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : []) + setTimeout(() => { + setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : []) + }, 500) }) setEditModalVisible(true) } diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx index 8f34565..c248df9 100644 --- a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx @@ -128,7 +128,8 @@ function ConfMes(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: [8, 10 ,20], + // pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx index 209af94..27ce50e 100644 --- a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx @@ -100,7 +100,8 @@ function NotificationMes(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: [8, 10 ,20], + // pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx index 6ec9611..ca5cea0 100644 --- a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx @@ -99,7 +99,8 @@ function MonitorCarAlarmMes(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: [8, 10 ,20], + // pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx index f67c3f4..ca8d388 100644 --- a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx @@ -142,6 +142,7 @@ function NotificationMes(props) { total: resultData?.totalRecords, pageSize: pageInfo.length, pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx index be3a3b1..69bc6ba 100644 --- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx +++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx @@ -136,7 +136,8 @@ function OrgnizationMgm() { orgForm.setFieldsValue({ id: id, 'depart_id': recursionFindIdPath([...departTree], id, undefined, false), - 'name': name + 'name': name, + pid: pid }) setActiveOrgTree({ isTop: isTop }) setOrgModalVisible(true) @@ -374,12 +375,13 @@ function OrgnizationMgm() { const handleOrgConfirm = () => { orgForm.validateFields().then((data) => { + // console.log(data) let arr =data.depart_id if (data.id) { ajaxAreaEdit(Object.assign({}, { id: data.id, name: data.name, - pid: arr ? arr.at(-1) : '' + pid: data.pid })).then((msg) => { message.success(msg) setOrgModalVisible(false) @@ -642,6 +644,7 @@ function OrgnizationMgm() { > +