fix(): 路内已知问题处理

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}
                     />
                     <Pagination {...paginationProps} className="pagination-common" />

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;

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 (
         <Modal
             className="yisa-modal detail-modal"
-            title={"弹窗详情"}
+            title={"欠费总分析详情"}
             open={visible}
             width={1100}
             onCancel={onCancel}
             onOk={onOk}
         >
             <div className="detail-modal-container">
-                <div className="detail-title">欠费总分析详情</div>
+                <div className="detail-title">共查询到<span>{ resultData.totalRecords || 0 }</span>条结果</div>
                 <ResultFlowResult
                     ajaxLoad={tableLoading}
                     resultData={resultData?.list || []}

src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.scss

@@ -45,6 +45,11 @@
         padding-bottom: 5px;
         .detail-title {
             margin-bottom: 10px;
+            span {
+                color: var(--color-primary);
+                padding: 0 5px;
+                font-weight: 700;
+            }
         }
         .ant-table-thead>tr>th {
             background-color: #616b83;

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;
             }
         }

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,

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,

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,

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,

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,

src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx

@@ -112,7 +112,9 @@ function Fence(props) {
         })
         setEditId(item.id)
         getBerthDataByNvr(item.nvr_id).then(() => {
+            setTimeout(() => {
                 setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : [])
+            }, 500)
         })
         setEditModalVisible(true)
     }

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,

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,

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,

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,

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() {
                 >
                     <Form.Item name="id" hidden></Form.Item>
                     <Form.Item name="level" hidden></Form.Item>
+                    <Form.Item name="pid" hidden></Form.Item>
                     <Form.Item label="部门名称" name="name" rules={[
                         {
                             required: true

src/pages/SystemMgm/RoleMgm/loadable.jsx

@@ -457,7 +457,8 @@ function RoleMgm(props) {
             ...getImg,
             auth: str,
             id: getAdminId.id,
-            depart_id: lastElement
+            depart_id: lastElement,
+            depart_arr: arrStr.toString()
         }
 
         if (getImg.name == "") {