diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5935b12..590c8e0 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -124,9 +124,16 @@
 }
 // 选择设备
 const confirm = (device: any) => {
-  console.log(device, '选中的设备')
   // 判断是单选还是多选
+
   if (Array.isArray(device)) {
+    const data = list.value.filter((item) => {
+      return device.some((child: any) => child.id === item.equipmentId)
+    })
+    if (data.length) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -144,6 +151,10 @@
   else {
     // 单选
     // 判断是否重复
+    if (list.value.some(item => item.equipmentId === device.id)) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     const row = {
       ...device,
       equipmentId: device.id,

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5935b12..590c8e0 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -124,9 +124,16 @@
 }
 // 选择设备
 const confirm = (device: any) => {
-  console.log(device, '选中的设备')
   // 判断是单选还是多选
+
   if (Array.isArray(device)) {
+    const data = list.value.filter((item) => {
+      return device.some((child: any) => child.id === item.equipmentId)
+    })
+    if (data.length) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -144,6 +151,10 @@
   else {
     // 单选
     // 判断是否重复
+    if (list.value.some(item => item.equipmentId === device.id)) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     const row = {
       ...device,
       equipmentId: device.id,
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index c56b23f..318c290 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -96,6 +96,7 @@
     detailTask({ id: ruleForm.value.id }).then((res) => {
       ruleForm.value = res.data.data
       console.log(ruleForm.value, 'rule')
+      ruleForm.value.isUrgent = String(res.data.data.isUrgent)
     })
   }
 }

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5935b12..590c8e0 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -124,9 +124,16 @@
 }
 // 选择设备
 const confirm = (device: any) => {
-  console.log(device, '选中的设备')
   // 判断是单选还是多选
+
   if (Array.isArray(device)) {
+    const data = list.value.filter((item) => {
+      return device.some((child: any) => child.id === item.equipmentId)
+    })
+    if (data.length) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -144,6 +151,10 @@
   else {
     // 单选
     // 判断是否重复
+    if (list.value.some(item => item.equipmentId === device.id)) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     const row = {
       ...device,
       equipmentId: device.id,
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index c56b23f..318c290 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -96,6 +96,7 @@
     detailTask({ id: ruleForm.value.id }).then((res) => {
       ruleForm.value = res.data.data
       console.log(ruleForm.value, 'rule')
+      ruleForm.value.isUrgent = String(res.data.data.isUrgent)
     })
   }
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 8633a27..9bd4cdb 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -87,6 +87,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -136,6 +141,7 @@
 }
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -225,7 +231,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5935b12..590c8e0 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -124,9 +124,16 @@
 }
 // 选择设备
 const confirm = (device: any) => {
-  console.log(device, '选中的设备')
   // 判断是单选还是多选
+
   if (Array.isArray(device)) {
+    const data = list.value.filter((item) => {
+      return device.some((child: any) => child.id === item.equipmentId)
+    })
+    if (data.length) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -144,6 +151,10 @@
   else {
     // 单选
     // 判断是否重复
+    if (list.value.some(item => item.equipmentId === device.id)) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     const row = {
       ...device,
       equipmentId: device.id,
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index c56b23f..318c290 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -96,6 +96,7 @@
     detailTask({ id: ruleForm.value.id }).then((res) => {
       ruleForm.value = res.data.data
       console.log(ruleForm.value, 'rule')
+      ruleForm.value.isUrgent = String(res.data.data.isUrgent)
     })
   }
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 8633a27..9bd4cdb 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -87,6 +87,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -136,6 +141,7 @@
 }
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -225,7 +231,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b162157..1b66dec 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -430,7 +430,7 @@
         <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5935b12..590c8e0 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -124,9 +124,16 @@
 }
 // 选择设备
 const confirm = (device: any) => {
-  console.log(device, '选中的设备')
   // 判断是单选还是多选
+
   if (Array.isArray(device)) {
+    const data = list.value.filter((item) => {
+      return device.some((child: any) => child.id === item.equipmentId)
+    })
+    if (data.length) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -144,6 +151,10 @@
   else {
     // 单选
     // 判断是否重复
+    if (list.value.some(item => item.equipmentId === device.id)) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     const row = {
       ...device,
       equipmentId: device.id,
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index c56b23f..318c290 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -96,6 +96,7 @@
     detailTask({ id: ruleForm.value.id }).then((res) => {
       ruleForm.value = res.data.data
       console.log(ruleForm.value, 'rule')
+      ruleForm.value.isUrgent = String(res.data.data.isUrgent)
     })
   }
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 8633a27..9bd4cdb 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -87,6 +87,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -136,6 +141,7 @@
 }
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -225,7 +231,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b162157..1b66dec 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -430,7 +430,7 @@
         <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 6b5a5a5..2aa96c9 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,6 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
+const normalTableRef= ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -126,15 +127,15 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getInfoListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    normalTableRef.value.handleChecked()
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -178,12 +179,24 @@
   listQuery.limit = 20
   search()
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // search()
+  fetchData()
+}
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
 const fetchTogetherData = () => {
   togetherLoading.value = true
   getInfoListTogether(listQuery).then((res) => {
+    console.log('获取聚合表格数据')
     togetherList.value = res.data
     togetherLoading.value = false
   })
@@ -201,16 +214,6 @@
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -499,111 +502,116 @@
         <icon-button icon="icon-export" title="导出" @click="exportList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
-      <!-- 普通表格 -->
-      <normal-table
-        v-show=" tableFlage " :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
-      >
-        <template #columns>
-          <!-- 全部状态 -->
-          <el-table-column
-            v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
-            :label=" column.text " :prop=" column.value " :align=" column.align "
-            :show-overflow-tooltip="true"
-          >
-            <template #default=" scope ">
-              <span>
-                {{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-          <!-- 其他审批状态 -->
-          <el-table-column
-            v-for=" column of otherColums " v-else :key=" column.value " :label=" column.text "
-            :prop=" column.value " :align=" column.align "
-            :show-overflow-tooltip="true"
-          >
-            <template #default=" scope ">
-              <span>
-                {{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="160" align="center">
-            <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'agree')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'refuse')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
-                @click="submit(scope.row)"
-              >
-                提交
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
-                @click="canHandler(scope.row)"
-              >
-                取消
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
-                @click="delHandler(scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <!-- 展开行表格 -->
-      <normal-table
-        v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
-          {
-            needIndex: false, // 是否需要序号列
-            border: true, // 是否需要上方边框
-          }
-        " :pagination=" false " :is-showmulti-select=" true "
-      />
-      <el-table
-        v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-        :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
-      >
-        <el-table-column type="expand">
-          <template #default="props">
-            <normal-table
-              :data=" expandList " :total=" total " :columns=" columns " :list-loading=" expandLoading " :options="
-                {
-                  needIndex: false, // 是否需要序号列
-                  border: true, // 是否需要上方边框
-                }
-              " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
-            />
+      <div v-if=" tableFlage ">
+        <!-- 普通表格 -->
+        <normal-table
+          v-show=" tableFlage "
+          ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        >
+          <template #columns>
+            <!-- 全部状态 -->
+            <el-table-column
+              v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
+              :label=" column.text " :prop=" column.value " :align=" column.align "
+              :show-overflow-tooltip="true"
+            >
+              <template #default=" scope ">
+                <span>
+                  {{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <!-- 其他审批状态 -->
+            <el-table-column
+              v-for=" column of otherColums " v-else :key=" column.value " :label=" column.text "
+              :prop=" column.value " :align=" column.align "
+              :show-overflow-tooltip="true"
+            >
+              <template #default=" scope ">
+                <span>
+                  {{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="160" align="center">
+              <template #default=" scope ">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  查看
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                  @click="handler(scope.row, 'update')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                  @click="approveHandler(scope.row, 'agree')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                  @click="approveHandler(scope.row, 'refuse')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                  @click="submit(scope.row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                  @click="canHandler(scope.row)"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                  @click="delHandler(scope.row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
           </template>
-        </el-table-column>
-        <el-table-column label="设备名称" prop="equipmentName" align="center" />
-        <el-table-column label="数量" align="center">
-          <template #default=" scope ">
-            共计{{ scope.row.count }}台
-          </template>
-        </el-table-column>
-      </el-table>
+        </normal-table>
+      </div>
+      <div v-if=" !tableFlage ">
+        <!-- 展开行表格 -->
+        <normal-table
+          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+            {
+              needIndex: false, // 是否需要序号列
+              border: true, // 是否需要上方边框
+            }
+          " :pagination=" false " :is-showmulti-select=" true " :query="{}"
+        />
+        <el-table
+          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+        >
+          <el-table-column type="expand">
+            <template #default="props">
+              <normal-table
+                :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+                  {
+                    needIndex: false, // 是否需要序号列
+                    border: true, // 是否需要上方边框
+                  }
+                " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="设备名称" prop="equipmentName" align="center" />
+          <el-table-column label="数量" align="center">
+            <template #default=" scope ">
+              共计{{ scope.row.count }}台
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </table-container>
   </app-container>
 </template>

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5935b12..590c8e0 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -124,9 +124,16 @@
 }
 // 选择设备
 const confirm = (device: any) => {
-  console.log(device, '选中的设备')
   // 判断是单选还是多选
+
   if (Array.isArray(device)) {
+    const data = list.value.filter((item) => {
+      return device.some((child: any) => child.id === item.equipmentId)
+    })
+    if (data.length) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -144,6 +151,10 @@
   else {
     // 单选
     // 判断是否重复
+    if (list.value.some(item => item.equipmentId === device.id)) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     const row = {
       ...device,
       equipmentId: device.id,
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index c56b23f..318c290 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -96,6 +96,7 @@
     detailTask({ id: ruleForm.value.id }).then((res) => {
       ruleForm.value = res.data.data
       console.log(ruleForm.value, 'rule')
+      ruleForm.value.isUrgent = String(res.data.data.isUrgent)
     })
   }
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 8633a27..9bd4cdb 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -87,6 +87,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -136,6 +141,7 @@
 }
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -225,7 +231,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b162157..1b66dec 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -430,7 +430,7 @@
         <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 6b5a5a5..2aa96c9 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,6 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
+const normalTableRef= ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -126,15 +127,15 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getInfoListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    normalTableRef.value.handleChecked()
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -178,12 +179,24 @@
   listQuery.limit = 20
   search()
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // search()
+  fetchData()
+}
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
 const fetchTogetherData = () => {
   togetherLoading.value = true
   getInfoListTogether(listQuery).then((res) => {
+    console.log('获取聚合表格数据')
     togetherList.value = res.data
     togetherLoading.value = false
   })
@@ -201,16 +214,6 @@
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -499,111 +502,116 @@
         <icon-button icon="icon-export" title="导出" @click="exportList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
-      <!-- 普通表格 -->
-      <normal-table
-        v-show=" tableFlage " :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
-      >
-        <template #columns>
-          <!-- 全部状态 -->
-          <el-table-column
-            v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
-            :label=" column.text " :prop=" column.value " :align=" column.align "
-            :show-overflow-tooltip="true"
-          >
-            <template #default=" scope ">
-              <span>
-                {{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-          <!-- 其他审批状态 -->
-          <el-table-column
-            v-for=" column of otherColums " v-else :key=" column.value " :label=" column.text "
-            :prop=" column.value " :align=" column.align "
-            :show-overflow-tooltip="true"
-          >
-            <template #default=" scope ">
-              <span>
-                {{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="160" align="center">
-            <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'agree')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'refuse')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
-                @click="submit(scope.row)"
-              >
-                提交
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
-                @click="canHandler(scope.row)"
-              >
-                取消
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
-                @click="delHandler(scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <!-- 展开行表格 -->
-      <normal-table
-        v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
-          {
-            needIndex: false, // 是否需要序号列
-            border: true, // 是否需要上方边框
-          }
-        " :pagination=" false " :is-showmulti-select=" true "
-      />
-      <el-table
-        v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-        :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
-      >
-        <el-table-column type="expand">
-          <template #default="props">
-            <normal-table
-              :data=" expandList " :total=" total " :columns=" columns " :list-loading=" expandLoading " :options="
-                {
-                  needIndex: false, // 是否需要序号列
-                  border: true, // 是否需要上方边框
-                }
-              " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
-            />
+      <div v-if=" tableFlage ">
+        <!-- 普通表格 -->
+        <normal-table
+          v-show=" tableFlage "
+          ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        >
+          <template #columns>
+            <!-- 全部状态 -->
+            <el-table-column
+              v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
+              :label=" column.text " :prop=" column.value " :align=" column.align "
+              :show-overflow-tooltip="true"
+            >
+              <template #default=" scope ">
+                <span>
+                  {{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <!-- 其他审批状态 -->
+            <el-table-column
+              v-for=" column of otherColums " v-else :key=" column.value " :label=" column.text "
+              :prop=" column.value " :align=" column.align "
+              :show-overflow-tooltip="true"
+            >
+              <template #default=" scope ">
+                <span>
+                  {{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="160" align="center">
+              <template #default=" scope ">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  查看
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                  @click="handler(scope.row, 'update')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                  @click="approveHandler(scope.row, 'agree')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                  @click="approveHandler(scope.row, 'refuse')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                  @click="submit(scope.row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                  @click="canHandler(scope.row)"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                  @click="delHandler(scope.row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
           </template>
-        </el-table-column>
-        <el-table-column label="设备名称" prop="equipmentName" align="center" />
-        <el-table-column label="数量" align="center">
-          <template #default=" scope ">
-            共计{{ scope.row.count }}台
-          </template>
-        </el-table-column>
-      </el-table>
+        </normal-table>
+      </div>
+      <div v-if=" !tableFlage ">
+        <!-- 展开行表格 -->
+        <normal-table
+          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+            {
+              needIndex: false, // 是否需要序号列
+              border: true, // 是否需要上方边框
+            }
+          " :pagination=" false " :is-showmulti-select=" true " :query="{}"
+        />
+        <el-table
+          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+        >
+          <el-table-column type="expand">
+            <template #default="props">
+              <normal-table
+                :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+                  {
+                    needIndex: false, // 是否需要序号列
+                    border: true, // 是否需要上方边框
+                  }
+                " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="设备名称" prop="equipmentName" align="center" />
+          <el-table-column label="数量" align="center">
+            <template #default=" scope ">
+              共计{{ scope.row.count }}台
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index f76feab..44dfd3a 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -182,7 +182,16 @@
       limit: undefined,
       ids: selectList.value.map(item => item.id),
     }
-    exportCertificate(data).then((res) => {
+    const fd = new FormData()
+    fd.append('certificateName', data.certificateName)
+    fd.append('certificateNo', data.certificateNo)
+    fd.append('createTimeEnd', data.createTimeEnd)
+    fd.append('createTimeStart', data.createTimeStart)
+    fd.append('equipmentName', data.equipmentName)
+    fd.append('equipmentNo', data.equipmentNo)
+    fd.append('ids', data.ids)
+    fd.append('subcontractorName', data.subcontractorName)
+    exportCertificate(fd).then((res) => {
       exportFile(res.data, '分包方证书')
       loading.close()
     })

diff --git a/.env.development b/.env.development
index c701b87..6971c8b 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-# VITE_APP_API_BASEURL = http://192.168.8.107:5909
-VITE_APP_API_BASEURL = http://111.198.10.15:21710
+VITE_APP_API_BASEURL = http://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 29589d8..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21710"
+  "baseUrl": "http://192.168.8.107:5909"
 }
diff --git a/src/api/eqpt/MeasurementBusiness/notice.ts b/src/api/eqpt/MeasurementBusiness/notice.ts
index f285ab9..8123798 100644
--- a/src/api/eqpt/MeasurementBusiness/notice.ts
+++ b/src/api/eqpt/MeasurementBusiness/notice.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/business/outsource/notice/approval/listPage',
+    url: `/business/outsource/notice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index b62ca50..3cac549 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/listPage',
+    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index 6dbd678..1a0b5ff 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -4,9 +4,9 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: object) {
+export function getListPage(data: any) {
   return request({
-    url: '/resource/customer/questionnaire/listPage',
+    url: `/resource/customer/questionnaire/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/certificate.ts b/src/api/eqpt/device/certificate.ts
index 85e510d..622f5c3 100644
--- a/src/api/eqpt/device/certificate.ts
+++ b/src/api/eqpt/device/certificate.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getCertificateList(data: object) {
+export function getCertificateList(data: any) {
   return request({
-    url: '/equipment/certificate/listPage',
+    url: `/equipment/certificate/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 89c52ea..f2a9176 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -5,31 +5,31 @@
 const prefix = 'equipment/info'
 
 // 设备列表 -分页 -（全部状态）
-export function getInfoListPage(params: object, statusName: string) {
+export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/equipment/approval/approvedListPage',
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/equipment/approval/toApprovalListPage',
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/equipment/approval/listPage',
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 6a93493..60b3262 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -3,9 +3,9 @@
  */
 import request from '@/api/index'
 // 列表
-export function getRemindList(data: object) {
+export function getRemindList(data: any) {
   return request({
-    url: '/equipment/remind/listPage',
+    url: `/equipment/remind/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index d4b8954..4e41650 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 延迟/送检列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/inspection/allPage',
+      url: `/inspection/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/inspection/approval/approvedListPage',
+      url: `/inspection/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/inspection/approval/toApprovalListPage',
+      url: `/inspection/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/inspection/approval/listPage',
+      url: `/inspection/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 9aafdd0..395aa22 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -4,10 +4,10 @@
 import request from '@/api/index'
 
 // 计量计划列表-（不同状态）
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/plan/allPage',
+      url: `/plan/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -16,7 +16,7 @@
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/plan/approval/approvedListPage',
+      url: `/plan/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -25,7 +25,7 @@
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/plan/approval/toApprovalListPage',
+      url: `/plan/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
@@ -34,7 +34,7 @@
   }
   else {
     return request({
-      url: '/plan/approval/listPage',
+      url: `/plan/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: {
         ...params,
diff --git a/src/api/eqpt/status/index.ts b/src/api/eqpt/status/index.ts
index 993c9d9..d0c1d92 100644
--- a/src/api/eqpt/status/index.ts
+++ b/src/api/eqpt/status/index.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态的列表
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/status/allPage',
+      url: `/status/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/status/approval/approvedListPage',
+      url: `/status/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/status/approval/toApprovalListPage',
+      url: `/status/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/status/approval/listPage',
+      url: `/status/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index 0456ec8..8d5b894 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 const $route = useRoute()
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontractor/allPage',
+      url: `/subcontractor/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontractor/approval/approvedListPage',
+      url: `/subcontractor/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontractor/approval/toApprovalListPage',
+      url: `/subcontractor/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontractor/approval/listPage',
+      url: `/subcontractor/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index 60a4a58..6fa7216 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -4,31 +4,31 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: object, statusName: string) {
+export function getListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: '/subcontract/review/allPage',
+      url: `/subcontract/review/allPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: '/subcontract/review/approval/approvedListPage',
+      url: `/subcontract/review/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: '/subcontract/review/approval/toApprovalListPage',
+      url: `/subcontract/review/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: '/subcontract/review/approval/listPage',
+      url: `/subcontract/review/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
       method: 'post',
       data: params,
     })
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c5436a5..94ac38b 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,3 @@
-// 流程管理接口
 // import qs from 'qs'
 import request from '../index'
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8625b38..4a1f370 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -2,6 +2,7 @@
 import type { Ref } from 'vue'
 import { ElTable } from 'element-plus'
 import { defineExpose, ref } from 'vue'
+import { isEqual, uniqWith } from 'lodash'
 import type { TableColumn } from './table_interface'
 
 // ------------------定义props、 emit-------------------
@@ -163,7 +164,6 @@
 }
 // 清除多选选中
 const clearMulti = () => {
-  console.log('清理选中')
   table.value!.clearSelection()
 }
 defineExpose({
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index 7fa8782..a188f98 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -198,7 +198,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 74f5a40..04eb9bc 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -43,7 +43,7 @@
   },
   submit: {
     if: (row: any, permPath: string) => {
-      permPath ? console.log(permPath) : ''
+      // permPath ? console.log(permPath) : ''
       return row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'
     },
   },
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index e89dd60..c0eaeea 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -79,12 +79,37 @@
   dialogVisible.value = false
   emits('resetData')
 }
+
+// 获取文件类型
+const fileTypeList = ref<any>([])
+const getFileType = () => {
+  getDictByCode('configFileType').then((res) => {
+    fileTypeList.value = res.data
+  })
+}
+getFileType()
+// 判断文件类型与上传文件是否一致
+const checkFile = () => {
+  const data = fileTypeList.value.filter((item: any) => item.value === ruleForm.value.fileType)
+  if (data.length) {
+    const val = data[0].name
+    const fileName = ruleForm.value.minioFileName.split('.')[ruleForm.value.minioFileName.split('.').length - 1]
+    if (val !== fileName) {
+      ElMessage.warning('上传文件与所选文件类型不一致')
+      return false
+    }
+  }
+  return true
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        if (!checkFile()) {
+          return
+        }
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -94,6 +119,9 @@
         })
       }
       else {
+        if (!checkFile()) {
+          return
+        }
         updateFileListPage(ruleForm.value).then((res) => {
           ElMessage({
             type: 'success',
@@ -105,15 +133,6 @@
     }
   })
 }
-// 获取文件类型
-const fileTypeList = ref<any>([])
-const getFileType = () => {
-  getDictByCode('configFileType').then((res) => {
-    fileTypeList.value = res.data
-  })
-}
-getFileType()
-
 const businessTypeList = ref<dictType[]>([])// 获取业务类型
 const moduleNameList = ref<dictType[]>([])// 模块名称
 const getDict = () => {
@@ -191,8 +210,8 @@
               v-model="updateTime"
               disabled
               type="datetime"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 61432c3..de42e04 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -104,6 +104,7 @@
 const selectTreeRef = ref()
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -218,7 +219,7 @@
     <div style="padding: 12px;">
       <normal-table
         v-if="dialogFormVisible"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5935b12..590c8e0 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -124,9 +124,16 @@
 }
 // 选择设备
 const confirm = (device: any) => {
-  console.log(device, '选中的设备')
   // 判断是单选还是多选
+
   if (Array.isArray(device)) {
+    const data = list.value.filter((item) => {
+      return device.some((child: any) => child.id === item.equipmentId)
+    })
+    if (data.length) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     // 多选
     device.forEach((item) => {
       list.value.push({
@@ -144,6 +151,10 @@
   else {
     // 单选
     // 判断是否重复
+    if (list.value.some(item => item.equipmentId === device.id)) {
+      ElMessage.warning('选择设备重复')
+      return
+    }
     const row = {
       ...device,
       equipmentId: device.id,
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index c56b23f..318c290 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -96,6 +96,7 @@
     detailTask({ id: ruleForm.value.id }).then((res) => {
       ruleForm.value = res.data.data
       console.log(ruleForm.value, 'rule')
+      ruleForm.value.isUrgent = String(res.data.data.isUrgent)
     })
   }
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 8633a27..9bd4cdb 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -87,6 +87,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -136,6 +141,7 @@
 }
 // 重置
 const reset = () => {
+  datetimerange.value = []
   listQuery.value = {
     equipmentName: '', // 设备名称
     equipmentNo: '', // 统一编号
@@ -225,7 +231,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b162157..1b66dec 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -430,7 +430,7 @@
         <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过'" type="primary" @click="submitForm()">
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
         <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 6b5a5a5..2aa96c9 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,6 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
+const normalTableRef= ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -126,15 +127,15 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   getInfoListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    normalTableRef.value.handleChecked()
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -178,12 +179,24 @@
   listQuery.limit = 20
   search()
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // search()
+  fetchData()
+}
 // 获取聚合表格数据
 const togetherLoading = ref(true)
 const togetherList = ref([])
 const fetchTogetherData = () => {
   togetherLoading.value = true
   getInfoListTogether(listQuery).then((res) => {
+    console.log('获取聚合表格数据')
     togetherList.value = res.data
     togetherLoading.value = false
   })
@@ -201,16 +214,6 @@
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -499,111 +502,116 @@
         <icon-button icon="icon-export" title="导出" @click="exportList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
-      <!-- 普通表格 -->
-      <normal-table
-        v-show=" tableFlage " :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
-      >
-        <template #columns>
-          <!-- 全部状态 -->
-          <el-table-column
-            v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
-            :label=" column.text " :prop=" column.value " :align=" column.align "
-            :show-overflow-tooltip="true"
-          >
-            <template #default=" scope ">
-              <span>
-                {{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-          <!-- 其他审批状态 -->
-          <el-table-column
-            v-for=" column of otherColums " v-else :key=" column.value " :label=" column.text "
-            :prop=" column.value " :align=" column.align "
-            :show-overflow-tooltip="true"
-          >
-            <template #default=" scope ">
-              <span>
-                {{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="160" align="center">
-            <template #default=" scope ">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                查看
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
-                @click="handler(scope.row, 'update')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'agree')"
-              >
-                同意
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
-                @click="approveHandler(scope.row, 'refuse')"
-              >
-                拒绝
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
-                @click="submit(scope.row)"
-              >
-                提交
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
-                @click="canHandler(scope.row)"
-              >
-                取消
-              </el-button>
-              <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
-                @click="delHandler(scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-      <!-- 展开行表格 -->
-      <normal-table
-        v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
-          {
-            needIndex: false, // 是否需要序号列
-            border: true, // 是否需要上方边框
-          }
-        " :pagination=" false " :is-showmulti-select=" true "
-      />
-      <el-table
-        v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-        :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
-      >
-        <el-table-column type="expand">
-          <template #default="props">
-            <normal-table
-              :data=" expandList " :total=" total " :columns=" columns " :list-loading=" expandLoading " :options="
-                {
-                  needIndex: false, // 是否需要序号列
-                  border: true, // 是否需要上方边框
-                }
-              " :pagination=" false " :is-showmulti-select=" true " :show-header=" false "
-            />
+      <div v-if=" tableFlage ">
+        <!-- 普通表格 -->
+        <normal-table
+          v-show=" tableFlage "
+          ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        >
+          <template #columns>
+            <!-- 全部状态 -->
+            <el-table-column
+              v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
+              :label=" column.text " :prop=" column.value " :align=" column.align "
+              :show-overflow-tooltip="true"
+            >
+              <template #default=" scope ">
+                <span>
+                  {{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <!-- 其他审批状态 -->
+            <el-table-column
+              v-for=" column of otherColums " v-else :key=" column.value " :label=" column.text "
+              :prop=" column.value " :align=" column.align "
+              :show-overflow-tooltip="true"
+            >
+              <template #default=" scope ">
+                <span>
+                  {{ scope.row[column.value] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="160" align="center">
+              <template #default=" scope ">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  查看
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                  @click="handler(scope.row, 'update')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                  @click="approveHandler(scope.row, 'agree')"
+                >
+                  同意
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                  @click="approveHandler(scope.row, 'refuse')"
+                >
+                  拒绝
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                  @click="submit(scope.row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                  @click="canHandler(scope.row)"
+                >
+                  取消
+                </el-button>
+                <el-button
+                  v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                  @click="delHandler(scope.row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
           </template>
-        </el-table-column>
-        <el-table-column label="设备名称" prop="equipmentName" align="center" />
-        <el-table-column label="数量" align="center">
-          <template #default=" scope ">
-            共计{{ scope.row.count }}台
-          </template>
-        </el-table-column>
-      </el-table>
+        </normal-table>
+      </div>
+      <div v-if=" !tableFlage ">
+        <!-- 展开行表格 -->
+        <normal-table
+          v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
+            {
+              needIndex: false, // 是否需要序号列
+              border: true, // 是否需要上方边框
+            }
+          " :pagination=" false " :is-showmulti-select=" true " :query="{}"
+        />
+        <el-table
+          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+        >
+          <el-table-column type="expand">
+            <template #default="props">
+              <normal-table
+                :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
+                  {
+                    needIndex: false, // 是否需要序号列
+                    border: true, // 是否需要上方边框
+                  }
+                " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="设备名称" prop="equipmentName" align="center" />
+          <el-table-column label="数量" align="center">
+            <template #default=" scope ">
+              共计{{ scope.row.count }}台
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index f76feab..44dfd3a 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -182,7 +182,16 @@
       limit: undefined,
       ids: selectList.value.map(item => item.id),
     }
-    exportCertificate(data).then((res) => {
+    const fd = new FormData()
+    fd.append('certificateName', data.certificateName)
+    fd.append('certificateNo', data.certificateNo)
+    fd.append('createTimeEnd', data.createTimeEnd)
+    fd.append('createTimeStart', data.createTimeStart)
+    fd.append('equipmentName', data.equipmentName)
+    fd.append('equipmentNo', data.equipmentNo)
+    fd.append('ids', data.ids)
+    fd.append('subcontractorName', data.subcontractorName)
+    exportCertificate(fd).then((res) => {
       exportFile(res.data, '分包方证书')
       loading.close()
     })
diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue
index c861d63..f2fbd02 100644
--- a/src/views/tested/subpackage/review/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue
@@ -9,15 +9,16 @@
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
+  approvalStatus: '',
+  companyName: '',
   createTimeEnd: '',
   createTimeStart: '',
-  createUserName: '',
-  reviewNo: '',
-  subcontractorCompanyName: '',
+  directorName: '',
+  formId: SCHEDULE.SUBCONTRACTOR_APPROVAL,
+  ids: [],
+  subcontractorNo: '',
   offset: 1,
   limit: 5,
-  approvalStatus: '',
-  formId: SCHEDULE.SUBCONTRACT_REVIEW_APPROVAL,
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -30,6 +31,10 @@
     listQuery.value.createTimeStart = newVal[0]
     listQuery.value.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.value.createTimeStart = ''
+    listQuery.value.createTimeEnd = ''
+  }
 })
 // 表头
 const columns = ref([
@@ -88,13 +93,16 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.value.approvalStatus = ''
+  listQuery.value.companyName = ''
   listQuery.value.createTimeEnd = ''
   listQuery.value.createTimeStart = ''
-  listQuery.value.createUserName = ''
-  listQuery.value.reviewNo = ''
-  listQuery.value.subcontractorCompanyName = ''
+  listQuery.value.directorName = ''
+  listQuery.value.formId = SCHEDULE.SUBCONTRACTOR_APPROVAL
+  listQuery.value.ids = []
+  listQuery.value.subcontractorNo = ''
   listQuery.value.offset = 1
-  listQuery.value.limit = 20
+  listQuery.value.limit = 5
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -137,25 +145,25 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.reviewNo" placeholder="评审表编号" clearable />
+        <el-input v-model.trim="listQuery.subcontractorNo" placeholder="分包方编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="分包机构名称" clearable />
+        <el-input v-model.trim="listQuery.companyName" placeholder="单位名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.directorName" placeholder="联系人" clearable />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>