From 944f59aabdb3634ae84c97f7df213eb956fbfaad Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Mon, 20 Nov 2023 14:14:56 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5bug=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExceptionParkReport/loadable.jsx               |  5 +-
 .../ExceptionParkStatic/loadable.jsx               |  5 +-
 .../InRoadMgm/BusinessMgm/Blacklist/loadable.jsx   |  6 +-
 .../InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx |  5 +-
 .../InRoadMgm/BusinessMgm/FreeRule/loadable.jsx    |  5 +-
 .../BusinessMgm/PreChargeRules/loadable.jsx        |  5 +-
 .../BusinessMgm/SelfParkingRules/loadable.jsx      |  5 +-
 .../BusinessMgm/SpecialRecord/loadable.jsx         | 15 +++--
 .../InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx     |  5 +-
 .../EquipmentMgm/EquipmentBrand/loadable.jsx       |  5 +-
 .../EquipmentMgm/EquipmentStatus/Device/index.jsx  |  5 +-
 .../EquipmentMgm/EquipmentStatus/Offline/index.jsx |  5 +-
 .../EquipmentMgm/EquipmentStatus/Road/index.jsx    |  5 +-
 .../EquipmentMgm/EquipmentStatus/index.scss        |  2 +-
 .../EquipmentMgm/MonitorEquipment/loadable.jsx     |  5 +-
 .../InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx     |  5 +-
 src/pages/InRoadMgm/InRoadOverview/loadable.jsx    | 72 +++++++++++++++++++---
 .../PersonMgm/Attendance/Fence/loadable.jsx        | 23 +++----
 .../PersonMgm/Attendance/ScheduleMgm/loadable.jsx  | 19 +++---
 .../Attendance/WorkerAttendance/loadable.jsx       | 24 +++-----
 .../Attendance/WorkerSchedule/loadable.jsx         | 23 +++----
 .../InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx      | 40 +++++++-----
 .../InRoadMgm/RoadMgm/RoadDetail/loadable.jsx      |  2 +-
 .../InRoadMgm/Stuff/CategroyConf/loadable.jsx      | 19 +++---
 src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx   | 18 +++---
 src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx    | 19 +++---
 src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx   | 23 +++----
 .../CallbackSuggestion/loadable.jsx                | 19 +++++-
 .../CustomerServieMgm/ComplainManage/loadable.jsx  |  1 +
 .../CustomerServieMgm/ComplaintMgm/loadable.jsx    |  1 +
 .../CustomerServieMgm/ErrorCorrection/loadable.jsx |  1 +
 .../GeoSignalIgnoreAudit/loadable.jsx              | 19 +++---
 .../GeoSignalIgnoreConf/loadable.jsx               | 19 +++---
 .../GeoSignalIgnoreInquiry/loadable.jsx            | 19 +++---
 src/pages/SystemMgm/AdminMgm/loadable.jsx          |  5 +-
 src/pages/SystemMgm/RoleMgm/loadable.jsx           |  5 +-
 36 files changed, 263 insertions(+), 196 deletions(-)

diff --git a/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx
index d744fb8..b53efad 100644
--- a/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx
@@ -150,9 +150,10 @@ function ExceptionParkReport(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.size === length) {
+              setFormData(Object.assign({}, formData, { pn: pn, size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, formData, { pn: pn }))
+            getData(Object.assign({}, formData, formData, { pn: pn }))
         }
     }
 
@@ -161,7 +162,7 @@ function ExceptionParkReport(props) {
         setFormData(Object.assign({}, formData, { pn: 1, size: length }))
         setLastFormData(Object.assign({}, setLastFormData, { pn: 1, size: length }))
         lastFormDataRef.current = Object.assign({}, setLastFormData, { pn: 1, size: length })
-        getData(Object.assign({}, setLastFormData, { pn: 1, size: length }))
+        getData(Object.assign({}, formData, { pn: 1, size: length }))
     }
     const [getOperationName, setGetOperationName] = useState([])
     const operationName = () => {
diff --git a/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkStatic/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkStatic/loadable.jsx
index 524e2bb..2fb7908 100644
--- a/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkStatic/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkStatic/loadable.jsx
@@ -98,9 +98,10 @@ function ExceptionParkStatic(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.size === length) {
+                setFormData(Object.assign({}, formData, { pn: pn, size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn, key:type }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, key:type })
-            getData(Object.assign({}, lastFormData, { pn: pn, key:type }))
+            getData(Object.assign({}, formData, { pn: pn, key:type }))
         }
     }
     const [type, setType] = useState('day');
@@ -109,7 +110,7 @@ function ExceptionParkStatic(props) {
         setFormData(Object.assign({}, formData, { pn: 1, size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, size: length }))
+        getData(Object.assign({}, formData, { pn: 1, size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
index 32c5ee6..ab5fe32 100644
--- a/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
@@ -231,9 +231,11 @@ function Blacklist(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn,size: length}))
+
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -241,7 +243,7 @@ function Blacklist(props) {
         setFormData(Object.assign({}, formData, { pn: 1, size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, size: length }))
+        getData(Object.assign({}, formData, { pn: 1, size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
index c5db24b..bfbe46d 100644
--- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
@@ -394,9 +394,10 @@ function ChargeRules(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+          setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -404,7 +405,7 @@ function ChargeRules(props) {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //切换分页
     const tableChangePn = (pn, length) => {
diff --git a/src/pages/InRoadMgm/BusinessMgm/FreeRule/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/FreeRule/loadable.jsx
index afcf3e3..1f2fb37 100644
--- a/src/pages/InRoadMgm/BusinessMgm/FreeRule/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/FreeRule/loadable.jsx
@@ -158,9 +158,10 @@ function FreeRule(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -168,7 +169,7 @@ function FreeRule(props) {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/BusinessMgm/PreChargeRules/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/PreChargeRules/loadable.jsx
index 6f15945..e5efb3b 100644
--- a/src/pages/InRoadMgm/BusinessMgm/PreChargeRules/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/PreChargeRules/loadable.jsx
@@ -178,9 +178,10 @@ function PreChargeRules(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+               setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -188,7 +189,7 @@ function PreChargeRules(props) {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/BusinessMgm/SelfParkingRules/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SelfParkingRules/loadable.jsx
index 37e1f22..9fadac6 100644
--- a/src/pages/InRoadMgm/BusinessMgm/SelfParkingRules/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/SelfParkingRules/loadable.jsx
@@ -220,9 +220,10 @@ function SelfParkingRules(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn,size: length}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -230,7 +231,7 @@ function SelfParkingRules(props) {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
index 78b3f58..9b9df44 100644
--- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
@@ -683,23 +683,26 @@ function CollectorWorkStat(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     const changePnApprove = (pn, length) => {
         if (approveFormData.size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setApproveFormData(Object.assign({}, approveFormData, { pn: pn }))
             approveFormDataRef.current = Object.assign({}, approveFormData, { pn: pn })
-            getApproveData(Object.assign({}, approveFormData, { pn: pn }))
+            getApproveData(Object.assign({}, formData, { pn: pn }))
         }
     }
     const changePnDeploy = (pn, length) => {
         if (deployFormData.size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setDeployFormData(Object.assign({}, deployFormData, { pn: pn }))
             deployFormDataRef.current = Object.assign({}, deployFormData, { pn: pn })
-            getDeployData(Object.assign({}, deployFormData, { pn: pn }))
+            getDeployData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换分页
@@ -723,19 +726,19 @@ function CollectorWorkStat(props) {
         setFormData(Object.assign({}, formData, { pn: 1, size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, size: length }))
+        getData(Object.assign({}, formData, { pn: 1, size: length }))
     }
     const changeLengthApprove = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, size: length }))
         setApproveFormData(Object.assign({}, approveFormData, { pn: 1, size: length }))
         approveFormDataRef.current = Object.assign({}, approveFormData, { pn: 1, size: length })
-        getApproveData(Object.assign({}, approveFormData, { pn: 1, size: length }))
+        getApproveData(Object.assign({}, formData, { pn: 1, size: length }))
     }
     const changeLengthDeploy = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, size: length }))
         setDeployFormData(Object.assign({}, deployFormData, { pn: 1, size: length }))
         deployFormDataRef.current = Object.assign({}, deployFormData, { pn: 1, size: length })
-        getDeployData(Object.assign({}, deployFormData, { pn: 1, size: length }))
+        getDeployData(Object.assign({}, formData, { pn: 1, size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
index ed22847..a6f5b32 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
@@ -200,9 +200,10 @@ function Fence(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.length === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -210,7 +211,7 @@ function Fence(props) {
         setFormData(Object.assign({}, formData, { pn: 1, length: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, length: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, length: length }))
+        getData(Object.assign({}, formData, { pn: 1, length: length }))
     }
     //数据导出
     const handleDownload = (data) => {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
index dbae790..15a994f 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
@@ -201,9 +201,10 @@ function Fence(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.length === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -211,7 +212,7 @@ function Fence(props) {
         setFormData(Object.assign({}, formData, { pn: 1, length: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, length: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, length: length }))
+        getData(Object.assign({}, formData, { pn: 1, length: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
index 6eac38d..1f57568 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
@@ -205,9 +205,10 @@ function Road(props) {
   //切换分页
   const changePn = (pn, length) => {
       if (lastFormData.length === length) {
+        setFormData(Object.assign({}, formData, { pn: pn}))
           setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
           lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-          getData(Object.assign({}, lastFormData, { pn: pn }))
+          getData(Object.assign({}, formData, { pn: pn }))
       }
   }
   //切换每页条数
@@ -215,7 +216,7 @@ function Road(props) {
       setFormData(Object.assign({}, formData, { pn: 1, length: length }))
       setLastFormData(Object.assign({}, lastFormData, { pn: 1, length: length }))
       lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
-      getData(Object.assign({}, lastFormData, { pn: 1, length: length }))
+      getData(Object.assign({}, formData, { pn: 1, length: length }))
   }
   //检索数据
   const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx
index 0a52b8e..0e5d293 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Offline/index.jsx
@@ -165,9 +165,10 @@ function Road(props) {
   //切换分页
   const changePn = (pn, length) => {
       if (lastFormData.length === length) {
+        setFormData(Object.assign({}, formData, { pn: pn}))
           setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
           lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-          getData(Object.assign({}, lastFormData, { pn: pn }))
+          getData(Object.assign({}, formData, { pn: pn }))
       }
   }
   //切换每页条数
@@ -175,7 +176,7 @@ function Road(props) {
       setFormData(Object.assign({}, formData, { pn: 1, length: length }))
       setLastFormData(Object.assign({}, lastFormData, { pn: 1, length: length }))
       lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
-      getData(Object.assign({}, lastFormData, { pn: 1, length: length }))
+      getData(Object.assign({}, formData, { pn: 1, length: length }))
   }
   //检索数据
   const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx
index cc427a1..ea62a0a 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Road/index.jsx
@@ -239,9 +239,10 @@ function Road(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.length === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -249,7 +250,7 @@ function Road(props) {
         setFormData(Object.assign({}, formData, { pn: 1, length: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, length: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, length: length }))
+        getData(Object.assign({}, formData, { pn: 1, length: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/index.scss b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/index.scss
index 9c693fb..85b5632 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/index.scss
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/index.scss
@@ -74,7 +74,7 @@ $color-primary : var(--color-primary);
   
     .paid-result{
       width: 100%;
-      height: 834px;
+      height: 800px;
       background: #505a6f;
       border-radius: 20px;
       margin-left: 17px;
diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
index 65154de..275f646 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
@@ -217,9 +217,10 @@ function Fence(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.length === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -227,7 +228,7 @@ function Fence(props) {
         setFormData(Object.assign({}, formData, { pn: 1, length: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, length: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, length: length }))
+        getData(Object.assign({}, formData, { pn: 1, length: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
index 323342b..447ae44 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
@@ -252,9 +252,10 @@ function Fence(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.length === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -262,7 +263,7 @@ function Fence(props) {
         setFormData(Object.assign({}, formData, { pn: 1, length: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, length: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, length: length }))
+        getData(Object.assign({}, formData, { pn: 1, length: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/InRoadMgm/InRoadOverview/loadable.jsx b/src/pages/InRoadMgm/InRoadOverview/loadable.jsx
index 3322c77..44ec4bc 100644
--- a/src/pages/InRoadMgm/InRoadOverview/loadable.jsx
+++ b/src/pages/InRoadMgm/InRoadOverview/loadable.jsx
@@ -11,7 +11,8 @@ import shouruzonge from "@/assets/images/shouruzonge.png";
 import ReactEcharts from "echarts-for-react";
 import { useSelector } from "react-redux";
 import "./index.scss";
-import { Select } from "antd";
+import { Select, Popover } from "antd";
+import { QuestionCircleOutlined } from '@ant-design/icons';
 const InRoadOverview = () => {
   const skin = useSelector((state) => {
     return state.common.skin;
@@ -301,7 +302,40 @@ const InRoadOverview = () => {
       })
       .catch((err) => console.error(err));
   }
-
+  const roadContent=(
+    <div>
+      <p>车场总数："商用+试运行状态"下的停车场总数</p>
+      <p>泊位总数："商用+试运行状态"下的停车场泊位总数</p>
+    </div>
+  )
+  const todayContent=(
+    <div>
+      <p>今日停车记录数:入场时间从今日0:00至当前时间的停车记录数量</p>
+      <p>日均停车记录:先算出车场每一天的入场停车记录总数，再用近7天的每天停车记录之和÷7</p>
+    </div>
+  )
+  const moneyContent=(
+    <div>
+      <p>今日收入总额: 收款时间为今日0:00至当前时间的总额</p>
+      <p>日均收入总额: 先算出车场每一天收入总额，再用近7天的每天收入总额之和÷7</p>
+    </div>
+  )
+  const averageContent=(
+    <div>
+      <p>日均泊位时长利用率:近7天内，每天泊位时长利用率之和÷7。每天的泊位时长利用率=当天出场车辆的停车时长之和÷当天的泊位数÷24。</p>
+      <p>日均泊位周转次数:近7天内，每天泊位周转次数之和÷7。每天的泊位周转次数=当天出场车辆的停车记录之和÷当天的泊位数。</p>
+    </div>
+  )
+  const carContent=(
+    <div>
+      <p>停车收入top5: 统计每个停车场最近7天支付的实收金额，取前5展示</p>
+    </div>
+  )
+  const carParkContent=(
+    <div>
+      <p>停车记录top5: 按入场时间统计每个车场最近7天停车记录，取前5展示</p>
+    </div>
+  )
   useEffect(() => {
     getBaseNumber();
     getIncomeTop5();
@@ -315,28 +349,42 @@ const InRoadOverview = () => {
       <div id="header">
         <div className="header-card">
           <div className="card-part">
-            <p>路段总数</p>
+            <p>路段总数
+              <Popover content={roadContent} >
+                <QuestionCircleOutlined style={{marginLeft:5}}/>
+              </Popover>
+              </p>
             <p className="count">{headerNums.road_num}个</p>
             <p>泊位总数:{headerNums.berth_num}个</p>
           </div>
         </div>
         <div className="header-card">
           <div className="card-part">
-            <p>今日停车记录数</p>
+            <p>今日停车记录数
+            <Popover content={todayContent} >
+                <QuestionCircleOutlined style={{marginLeft:5}}/>
+              </Popover>
+            </p>
             <p className="count">{headerNums.today_park}个</p>
             <p>日均停车记录数:{headerNums.average_park}个</p>
           </div>
         </div>
         <div className="header-card">
           <div className="card-part">
-            <p>今日收入总额</p>
+            <p>今日收入总额  <Popover content={moneyContent} >
+                <QuestionCircleOutlined style={{marginLeft:5}}/>
+              </Popover></p>
             <p className="count">{headerNums.today_money}个</p>
             <p>日均收入总额:{headerNums.average_money}个</p>
           </div>
         </div>
         <div className="header-card">
           <div className="card-part">
-            <p>日均时长泊位利用率</p>
+            <p>日均时长泊位利用率
+            <Popover content={averageContent} placement="leftTop">
+                <QuestionCircleOutlined style={{marginLeft:5}}/>
+              </Popover>
+            </p>
             <p className="count">{headerNums.average_use_ratio}个</p>
             <p>日均泊位周转次数:{headerNums.average_turnover}个</p>
           </div>
@@ -372,7 +420,11 @@ const InRoadOverview = () => {
         </div>
         <div className="right">
           <div className="record-right card">
-            <label>停车记录top5</label>
+            <label>停车记录top5
+            <Popover content={carParkContent} placement="leftTop">
+                <QuestionCircleOutlined style={{marginLeft:5}}/>
+              </Popover>
+            </label>
             <ul className="record-list">
               {recordTop.map((item, index) => {
                 return (
@@ -388,7 +440,11 @@ const InRoadOverview = () => {
             </ul>
           </div>
           <div className="revenue-right card">
-            <label>停车收入top5</label>
+            <label>停车收入top5
+            <Popover content={carContent} placement="leftTop">
+                <QuestionCircleOutlined style={{marginLeft:5}}/>
+              </Popover>
+            </label>
             <ul className="revenue-list">
               {incomeTop.map((item, index) => {
                 return (
diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx
index f696bd1..50be49f 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx
@@ -33,16 +33,14 @@ function Fence(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         areId: [],//区域
         parkName: '',//停车场
         enable: '',//是否配置
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     const [attendanceVisible, setAttendanceVisible] = useState(false)
     const [placeVisible, setPlaceVisible] = useState(false)
     const [markers, setMarkers] = useState([])
@@ -186,20 +184,19 @@ function Fence(props) {
             console.log(err)
         })
     }
-    //切换分页
-    const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+     //切换分页
+     const changePn = (pn, length) => {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -445,8 +442,8 @@ function Fence(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx
index 5e0126c..8c67b50 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx
@@ -23,14 +23,13 @@ function ScheduleMgm(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         scheduleName: '',//班次名称
         operationName: '',//所属运营商
         state: '',//状态
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [modalData, setModalData] = useState({
         scheduleName: '',//班次名称
         operationId: '',//所属运营商
@@ -48,7 +47,6 @@ function ScheduleMgm(props) {
         afterTime: ''//下班后
     })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     //登录名
     const handleScheduleName = (v) => {
         setFormData({ ...formData, scheduleName: v.target.value })
@@ -281,18 +279,17 @@ function ScheduleMgm(props) {
     }
     //切换分页
     const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
 
     //详情时间选择
@@ -401,8 +398,8 @@ function ScheduleMgm(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx
index dbc67f4..201d15b 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx
@@ -22,7 +22,7 @@ function WorkerAttendance(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         pdaManagerName: '',//登录名
         pdaManagerCode: '',//员工编号
         pdaManagerRole: '',//角色
@@ -31,11 +31,8 @@ function WorkerAttendance(props) {
         end_time: type === 'day' ? moment().format('YYYY-MM-DD') : moment().format('YYYY-MM'),
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
-    console.log(formData);
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     const [attendanceVisible, setAttendanceVisible] = useState(false)
     //登录名
     const handleLoginName = (v) => {
@@ -284,20 +281,19 @@ function WorkerAttendance(props) {
             console.log(err)
         })
     }
-    //切换分页
-    const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+       //切换分页
+       const changePn = (pn, length) => {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     const [markers, setMarkers] = useState([])
     //检索数据
@@ -457,8 +453,8 @@ function WorkerAttendance(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
index 254e9d0..795169f 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
@@ -18,16 +18,14 @@ function WorkerSchedule(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         username: '',//姓名
         operator: '',//所属运营商
         user_role: '',//角色
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     //姓名
     const handleScheduleName = (v) => {
         setFormData({ ...formData, username: v.target.value })
@@ -181,20 +179,19 @@ function WorkerSchedule(props) {
             console.log(err)
         })
     }
-    //切换分页
-    const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+      //切换分页
+      const changePn = (pn, length) => {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
 
     //检索数据
@@ -441,8 +438,8 @@ function WorkerSchedule(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index 9589a41..2c9f075 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -647,9 +647,9 @@ function ConfigRoad() {
       });
     },
   };
-useEffect(()=>{
-  getAllBerth()
-},[currentObj])
+  useEffect(() => {
+    getAllBerth()
+  }, [currentObj])
   //计费规则
   const billingRule = {
     form: [
@@ -1047,12 +1047,12 @@ useEffect(()=>{
   //table选择
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
-      let arr =[]
-      selectedRows.map(res=>{
+      let arr = []
+      selectedRows.map(res => {
         arr.push(res.id)
       })
       setSelectedRowKeys(arr);
-     
+
     },
     getCheckboxProps: (record) => ({
       disabled: record.name === "Disabled User",
@@ -1078,12 +1078,18 @@ useEffect(()=>{
 
   //1：泊位管理上线，2：下线，3：已删除
   function changeBerthManage(status) {
-    setConfirmModalData({
-      ...confirmModalData,
-      type: status,
-      ids: selectedRowKeys,
-      visible: true,
-    });
+    console.log(selectedRowKeys);
+    if (selectedRowKeys.length != []) {
+      setConfirmModalData({
+        ...confirmModalData,
+        type: status,
+        ids: selectedRowKeys,
+        visible: true,
+      });
+    }else {
+      message.error('请至少选择一条数据')
+    }
+
   }
 
   //收费员管理-删除收费员
@@ -2162,7 +2168,7 @@ useEffect(()=>{
         }}
         destroyOnClose
         onOk={handleDataAcquistionModal}
-        title="编辑数据"
+        title={dataAcquistionModal.isEdit ? "编辑设备" : "添加设备"}
         width={770}
       >
         <Form
@@ -2342,7 +2348,9 @@ const SearchPart = forwardRef((props, ref) => {
   useEffect(() => {
     getList();
   }, [pageData, formData]);
-
+  const reastBtn = () => {
+    form.resetFields();
+  }
   return (
     <>
       <Form
@@ -2388,11 +2396,11 @@ const SearchPart = forwardRef((props, ref) => {
         </Row>
       </Form>
       <div className="bottomBox">
-        <Button className="reset">清空</Button>
+        <Button className="reset" onClick={reastBtn}>清空</Button>
         <Button
           type="primary"
           className="submit search-button"
-          onClick={()=>{getList((formData, { ...pageData, pn: 1 }))}}
+          onClick={() => { getList((formData, { ...pageData, pn: 1 })) }}
         >
           查询
         </Button>
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
index efbe9c5..934b25d 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
@@ -88,7 +88,7 @@ function RoadDetail(props) {
                   <Descriptions.Item label="商用状态">
                     {resultData.operator_status_name}
                   </Descriptions.Item>
-                  <Descriptions.Item label="车场状态">
+                  <Descriptions.Item label="路段状态">
                     {resultData.road_status_name}
                   </Descriptions.Item>
                   <Descriptions.Item label="计费类型">
diff --git a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
index 29e52c6..d563b80 100644
--- a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
@@ -17,15 +17,13 @@ function CategroyConf(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         brand_id: '',//物品类型
         operatorid: '',//商户名称
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     const [checkVisible, setCheckVisible] = useState(false)
     const [editVisible, setEditVisible] = useState(false)
     const [addVisible, setAddVisible] = useState(false)
@@ -191,18 +189,17 @@ function CategroyConf(props) {
     }
     //切换分页
     const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -371,8 +368,8 @@ function CategroyConf(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
index 707d2ba..37aad07 100644
--- a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
@@ -17,14 +17,13 @@ function ModelConf(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         model_id: '',//物品类型
         operator_id: '',//商户名称
         model_name:'',
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
     const lastFormDataRef = useRef(formData)
     const [checkVisible, setCheckVisible] = useState(false)
@@ -206,18 +205,17 @@ function ModelConf(props) {
     }
     //切换分页
     const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -399,8 +397,8 @@ function ModelConf(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
index 39cfb93..4af3a7d 100644
--- a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
@@ -21,7 +21,7 @@ function StuffMgm(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         region_id: '',//区域
         code: '',//物品编号
         brand_id: '',//物品类型
@@ -32,10 +32,8 @@ function StuffMgm(props) {
         uid: '',//领用人
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     const [checkVisible, setCheckVisible] = useState(false)
     const [editVisible, setEditVisible] = useState(false)
     const [getSelectStatus, setGetSelectStatus] = useState(true)
@@ -316,18 +314,17 @@ function StuffMgm(props) {
     }
     //切换分页
     const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -651,8 +648,8 @@ function StuffMgm(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx b/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
index 3db0605..28436e3 100644
--- a/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
@@ -16,16 +16,14 @@ function StuffStat(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         operatorid: '',
         brand_id: '',
         model_id: '',
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     //物品型号
     const handleJobStatus = (value) => {
         setFormData({ ...formData, model_id: value })
@@ -123,20 +121,19 @@ function StuffStat(props) {
             console.log(err)
         })
     }
-    //切换分页
-    const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+     //切换分页
+     const changePn = (pn, length) => {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -264,8 +261,8 @@ function StuffStat(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
index 86713aa..017a35a 100644
--- a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx
@@ -159,8 +159,8 @@ function CallbackSuggestion(props) {
         },
         {
             title: '停车订单ID',
-            dataIndex: 'parkRecordId',
-            key: 'parkRecordId',
+            dataIndex: 'parkRecordsId',
+            key: 'parkRecordsId',
         },
         {
             title: '最后信息时间',
@@ -195,9 +195,17 @@ function CallbackSuggestion(props) {
     }
     const imgModal = () => {
         setImgVisible(false)
+        setRepairData({
+            content:'',
+            image:[]
+        })
     }
     const cancelImg = () => {
         setImgVisible(false)
+        setRepairData({
+            content:'',
+            image:[]
+        })
     }
     const getParkId = (record) => {
         if (copy(record.parkRecordId)) {
@@ -241,6 +249,7 @@ function CallbackSuggestion(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn, length: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
             getData(Object.assign({}, lastFormData, { pn: pn }))
@@ -306,6 +315,10 @@ function CallbackSuggestion(props) {
                     if (res.status === 20000) {
                         setGetImg(res.data)
                         setGetImgList(res.data.dialogueDetail)
+                        setRepairData({
+                            content:'',
+                            image:[]
+                        })
                     }
                 })
             }
@@ -671,7 +684,7 @@ function CallbackSuggestion(props) {
                                 )
                             })
                         }
-                        <TextArea showCount maxLength={200} className="text" onChange={onChangeText} />
+                        <TextArea showCount maxLength={200} value={repairData.content} className="text" onChange={onChangeText} />
                         <div className="uploadBtn">
                             <div className="upload">
                                 <Upload
diff --git a/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx
index 615ea2f..787beca 100644
--- a/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx
@@ -209,6 +209,7 @@ function ComplainManage(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn, length: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
             getData(Object.assign({}, lastFormData, { pn: pn }))
diff --git a/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx
index 50ce112..c84656a 100644
--- a/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx
@@ -211,6 +211,7 @@ function ComplaintMgm(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn, length: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
             getData(Object.assign({}, lastFormData, { pn: pn }))
diff --git a/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx
index 54e6685..94c0229 100644
--- a/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx
+++ b/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx
@@ -147,6 +147,7 @@ function ErrorCorrection(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn, length: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
             getData(Object.assign({}, lastFormData, { pn: pn }))
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
index 5b80b24..31bed46 100644
--- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
+++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
@@ -16,17 +16,15 @@ function GeoSignalIgnoreAudit(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         areId: [], //区域
         parkName: '', //路段
         signalType: 0, //消息类型
         auditType: 0,
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     const [imgVisible, setImgVisible] = useState(false)
     const [passVisible, setPassVisible] = useState(false)
     const [rejectVisible, setRejectVisible] = useState(false)
@@ -236,18 +234,17 @@ function GeoSignalIgnoreAudit(props) {
     }
     //切换分页
     const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -367,8 +364,8 @@ function GeoSignalIgnoreAudit(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreConf/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreConf/loadable.jsx
index f85dfb8..16a650e 100644
--- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreConf/loadable.jsx
+++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreConf/loadable.jsx
@@ -16,13 +16,11 @@ function GeoSignalIgnoreConf(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     const [imgVisible, setImgVisible] = useState(false)
     const [deleteVisible, setDeleteVisible] = useState(false)
     //物品型号
@@ -157,18 +155,17 @@ function GeoSignalIgnoreConf(props) {
     }
     //切换分页
     const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     const addNewType=()=>{
         setImgVisible(true)
@@ -201,8 +198,8 @@ function GeoSignalIgnoreConf(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx
index 9342c3d..4083ced 100644
--- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx
+++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx
@@ -16,7 +16,7 @@ function GeoSignalIgnoreInquiry(props) {
         export_url: '',
         process_url: ""
     })
-    const parameter = {
+    const [formData, setFormData] = useState({
         areId: [], //区域
         parkName: '', //路段
         name: '', //姓名
@@ -25,10 +25,8 @@ function GeoSignalIgnoreInquiry(props) {
         auditType: 0,//忽略型号
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
-    }
-    const [formData, setFormData] = useState(parameter)
+    })
     const [lastFormData, setLastFormData] = useState(formData)
-    const lastFormDataRef = useRef(formData)
     const [imgVisible, setImgVisible] = useState(false)
     //物品型号
     const handleJobStatus = (value) => {
@@ -198,18 +196,17 @@ function GeoSignalIgnoreInquiry(props) {
     }
     //切换分页
     const changePn = (pn, length) => {
-        if (lastFormData.page_size === length) {
+        if (formData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn}))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
-        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -354,8 +351,8 @@ function GeoSignalIgnoreInquiry(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={lastFormData.pn}
-                            pageSize={lastFormData.page_size}
+                            current={formData.pn}
+                            pageSize={formData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/SystemMgm/AdminMgm/loadable.jsx b/src/pages/SystemMgm/AdminMgm/loadable.jsx
index ac3777e..5163264 100644
--- a/src/pages/SystemMgm/AdminMgm/loadable.jsx
+++ b/src/pages/SystemMgm/AdminMgm/loadable.jsx
@@ -431,9 +431,10 @@ function AdminMgm(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -441,7 +442,7 @@ function AdminMgm(props) {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx
index 9351e9b..2f1602c 100644
--- a/src/pages/SystemMgm/RoleMgm/loadable.jsx
+++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx
@@ -340,9 +340,10 @@ function RoleMgm(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.page_size === length) {
+            setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
             lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
-            getData(Object.assign({}, lastFormData, { pn: pn }))
+            getData(Object.assign({}, formData, { pn: pn }))
         }
     }
     //切换每页条数
@@ -350,7 +351,7 @@ function RoleMgm(props) {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
-        getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
     const getSearchData = (data = formData) => {