diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
new file mode 100644
index 0000000..1e8664a
--- /dev/null
+++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
@@ -0,0 +1,32 @@
+// 筛选
+export interface IListQuery {
+  equipmentName: string	// 设备名称
+  equipmentNo: string	// 设备编号
+  mesureType: string // 检定方式
+  useDept: string // 使用部门
+  usePerson: string	// 使用人
+  limit: number
+  offset: number
+}
+
+// 字典
+export interface dictType {
+  name: string
+  id: string
+  value: string
+}
+// 表格数据
+export interface IList {
+  id: string // 主键
+  equipmentNo: string // 设备编号
+  equipmentName: string // 名称
+  modelNo: string // 型号
+  ABC: string // ABC
+  mesureTypeName: string // 检定方式
+  managerStateName: string // 管理状态
+  useDeptName: string // 使用部门
+  managerStausePersonNameteName: string // 使用人
+  validDate: string // 有效日期
+  remark: string // 备注
+}
+

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
new file mode 100644
index 0000000..1e8664a
--- /dev/null
+++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
@@ -0,0 +1,32 @@
+// 筛选
+export interface IListQuery {
+  equipmentName: string	// 设备名称
+  equipmentNo: string	// 设备编号
+  mesureType: string // 检定方式
+  useDept: string // 使用部门
+  usePerson: string	// 使用人
+  limit: number
+  offset: number
+}
+
+// 字典
+export interface dictType {
+  name: string
+  id: string
+  value: string
+}
+// 表格数据
+export interface IList {
+  id: string // 主键
+  equipmentNo: string // 设备编号
+  equipmentName: string // 名称
+  modelNo: string // 型号
+  ABC: string // ABC
+  mesureTypeName: string // 检定方式
+  managerStateName: string // 管理状态
+  useDeptName: string // 使用部门
+  managerStausePersonNameteName: string // 使用人
+  validDate: string // 有效日期
+  remark: string // 备注
+}
+
diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue
index ec6a9b7..301487b 100644
--- a/src/views/business/board/equipmentReminder/list.vue
+++ b/src/views/business/board/equipmentReminder/list.vue
@@ -1,14 +1,327 @@
 <!-- 设备到期提醒列表页 -->
 <script lang="ts" setup name="equipmentReminderList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './equipmentReminder-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { exportEquipmentReminderList, getEquipmentReminderList, urgeEquipmentReminderList } from '@/api/business/board/equipmentReminder'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  equipmentName: '',	// 设备名称
+  equipmentNo: '',	// 设备编号
+  mesureType: '', // 检定方式
+  useDept: '', // 使用部门
+  usePerson: '',	// 使用人
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: '58' },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: '90' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '100' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '165' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 获取数据
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const managerStateList = ref<dictType[]>([]) // 管理状态
+const abcList = ref<dictType[]>([]) // ABC
+// 获取字典值
+async function getDict() {
+  // 获取检定方式
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    abcList.value = response.data
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentReminderList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击详情
+const handleEdit = (row: IList) => {
+  $router.push(`/board/equipmentReminderDetail/${row.id}`)
+}
+
+// 点击搜索
+const search = () => {
+  fetchData(true)
+}
+
+// 点击重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '',	// 设备名称
+    equipmentNo: '',	// 设备编号
+    mesureType: '', // 检定方式
+    useDept: '', // 使用部门
+    usePerson: '',	// 使用人
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 催办
+const urge = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认催办吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      urgeEquipmentReminderList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已催办')
+          fetchData(true)
+        }
+      })
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      equipmentName: listQuery.value.equipmentName,	// 设备名称
+      equipmentNo: listQuery.value.equipmentNo,	// 设备编号
+      mesureType: listQuery.value.mesureType, // 检定方式
+      useDept: listQuery.value.useDept, // 使用部门
+      usePerson: listQuery.value.usePerson,	// 使用人
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportEquipmentReminderList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备到期提醒列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典值
+  fetchDeptTreeList() // 获取使用部门
+  fetchUserList() // 获取人员列表
+  fetchData() // 获取表格数据
+})
 </script>
 
 <template>
   <app-container>
-    设备到期提醒
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
+          <el-option
+            v-for="item in mesureTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.usePerson"
+          placeholder="使用人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <!-- ------------------------------------------------- -->
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row)"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') "
+                size="small"
+                link
+                type="primary"
+                @click="urge(row)"
+              >
+                催办
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+</style>a

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
new file mode 100644
index 0000000..1e8664a
--- /dev/null
+++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
@@ -0,0 +1,32 @@
+// 筛选
+export interface IListQuery {
+  equipmentName: string	// 设备名称
+  equipmentNo: string	// 设备编号
+  mesureType: string // 检定方式
+  useDept: string // 使用部门
+  usePerson: string	// 使用人
+  limit: number
+  offset: number
+}
+
+// 字典
+export interface dictType {
+  name: string
+  id: string
+  value: string
+}
+// 表格数据
+export interface IList {
+  id: string // 主键
+  equipmentNo: string // 设备编号
+  equipmentName: string // 名称
+  modelNo: string // 型号
+  ABC: string // ABC
+  mesureTypeName: string // 检定方式
+  managerStateName: string // 管理状态
+  useDeptName: string // 使用部门
+  managerStausePersonNameteName: string // 使用人
+  validDate: string // 有效日期
+  remark: string // 备注
+}
+
diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue
index ec6a9b7..301487b 100644
--- a/src/views/business/board/equipmentReminder/list.vue
+++ b/src/views/business/board/equipmentReminder/list.vue
@@ -1,14 +1,327 @@
 <!-- 设备到期提醒列表页 -->
 <script lang="ts" setup name="equipmentReminderList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './equipmentReminder-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { exportEquipmentReminderList, getEquipmentReminderList, urgeEquipmentReminderList } from '@/api/business/board/equipmentReminder'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  equipmentName: '',	// 设备名称
+  equipmentNo: '',	// 设备编号
+  mesureType: '', // 检定方式
+  useDept: '', // 使用部门
+  usePerson: '',	// 使用人
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: '58' },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: '90' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '100' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '165' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 获取数据
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const managerStateList = ref<dictType[]>([]) // 管理状态
+const abcList = ref<dictType[]>([]) // ABC
+// 获取字典值
+async function getDict() {
+  // 获取检定方式
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    abcList.value = response.data
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentReminderList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击详情
+const handleEdit = (row: IList) => {
+  $router.push(`/board/equipmentReminderDetail/${row.id}`)
+}
+
+// 点击搜索
+const search = () => {
+  fetchData(true)
+}
+
+// 点击重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '',	// 设备名称
+    equipmentNo: '',	// 设备编号
+    mesureType: '', // 检定方式
+    useDept: '', // 使用部门
+    usePerson: '',	// 使用人
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 催办
+const urge = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认催办吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      urgeEquipmentReminderList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已催办')
+          fetchData(true)
+        }
+      })
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      equipmentName: listQuery.value.equipmentName,	// 设备名称
+      equipmentNo: listQuery.value.equipmentNo,	// 设备编号
+      mesureType: listQuery.value.mesureType, // 检定方式
+      useDept: listQuery.value.useDept, // 使用部门
+      usePerson: listQuery.value.usePerson,	// 使用人
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportEquipmentReminderList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备到期提醒列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典值
+  fetchDeptTreeList() // 获取使用部门
+  fetchUserList() // 获取人员列表
+  fetchData() // 获取表格数据
+})
 </script>
 
 <template>
   <app-container>
-    设备到期提醒
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
+          <el-option
+            v-for="item in mesureTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.usePerson"
+          placeholder="使用人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <!-- ------------------------------------------------- -->
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row)"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') "
+                size="small"
+                link
+                type="primary"
+                @click="urge(row)"
+              >
+                催办
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+</style>a
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
index d444d25..7631686 100644
--- a/src/views/business/board/jobAccount/list.vue
+++ b/src/views/business/board/jobAccount/list.vue
@@ -8,6 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { exportJobAccountList, getJobAccountList } from '@/api/business/board/jobAccount'
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -16,15 +17,15 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '检测实验室', value: 'jcsys', width: '160', align: 'center' },
-  { text: '实验室代码', value: 'jcsys', width: '120', align: 'center' },
-  { text: '当日检测完样品', value: 'jcsys', align: 'center' },
-  { text: '当日检定员出具证书数', value: 'jcsys', align: 'center' },
-  { text: '当日到期样品数', value: 'jcsys', align: 'center' },
-  { text: '今年样品数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数-检测中', value: 'jcsys', align: 'center' },
-  { text: '超期率', value: 'jcsys', align: 'center', width: '180' },
+  { text: '检测实验室', value: 'organizeName', width: '160', align: 'center' },
+  { text: '实验室代码', value: 'organizeNo', width: '160', align: 'center' },
+  { text: '当日检测完样品', value: 'samplesCompletedToday', align: 'center' },
+  { text: '当日检定员出具证书数', value: 'certificatesToday', align: 'center' },
+  { text: '当日到期样品数', value: 'expireSamplesToday', align: 'center' },
+  { text: '今年样品数', value: 'samplesYear', align: 'center' },
+  { text: '今年超期样品总数', value: 'expireSamplesYear', align: 'center' },
+  { text: '今年超期样品总数-检测中', value: 'inMeasureExpireSamplesYear', align: 'center' },
+  { text: '超期率', value: 'expireRate', align: 'center' },
 ])
 
 // 表格数据
@@ -45,17 +46,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      jcsys: 'test',
-    },
-  ]
-  loadingTable.value = false
+  getJobAccountList().then((response) => {
+    list.value = response.data
+    // total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 多选发生改变时
@@ -82,15 +77,10 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // exportTaskList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '实时工作统计列表.xlsx')
-    // })
+    exportJobAccountList().then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '实时工作统计列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -133,8 +123,8 @@
         <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        :data="list" :total="total" :pagination="false" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :is-showmulti-select="false" @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
new file mode 100644
index 0000000..1e8664a
--- /dev/null
+++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
@@ -0,0 +1,32 @@
+// 筛选
+export interface IListQuery {
+  equipmentName: string	// 设备名称
+  equipmentNo: string	// 设备编号
+  mesureType: string // 检定方式
+  useDept: string // 使用部门
+  usePerson: string	// 使用人
+  limit: number
+  offset: number
+}
+
+// 字典
+export interface dictType {
+  name: string
+  id: string
+  value: string
+}
+// 表格数据
+export interface IList {
+  id: string // 主键
+  equipmentNo: string // 设备编号
+  equipmentName: string // 名称
+  modelNo: string // 型号
+  ABC: string // ABC
+  mesureTypeName: string // 检定方式
+  managerStateName: string // 管理状态
+  useDeptName: string // 使用部门
+  managerStausePersonNameteName: string // 使用人
+  validDate: string // 有效日期
+  remark: string // 备注
+}
+
diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue
index ec6a9b7..301487b 100644
--- a/src/views/business/board/equipmentReminder/list.vue
+++ b/src/views/business/board/equipmentReminder/list.vue
@@ -1,14 +1,327 @@
 <!-- 设备到期提醒列表页 -->
 <script lang="ts" setup name="equipmentReminderList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './equipmentReminder-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { exportEquipmentReminderList, getEquipmentReminderList, urgeEquipmentReminderList } from '@/api/business/board/equipmentReminder'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  equipmentName: '',	// 设备名称
+  equipmentNo: '',	// 设备编号
+  mesureType: '', // 检定方式
+  useDept: '', // 使用部门
+  usePerson: '',	// 使用人
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: '58' },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: '90' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '100' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '165' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 获取数据
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const managerStateList = ref<dictType[]>([]) // 管理状态
+const abcList = ref<dictType[]>([]) // ABC
+// 获取字典值
+async function getDict() {
+  // 获取检定方式
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    abcList.value = response.data
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentReminderList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击详情
+const handleEdit = (row: IList) => {
+  $router.push(`/board/equipmentReminderDetail/${row.id}`)
+}
+
+// 点击搜索
+const search = () => {
+  fetchData(true)
+}
+
+// 点击重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '',	// 设备名称
+    equipmentNo: '',	// 设备编号
+    mesureType: '', // 检定方式
+    useDept: '', // 使用部门
+    usePerson: '',	// 使用人
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 催办
+const urge = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认催办吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      urgeEquipmentReminderList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已催办')
+          fetchData(true)
+        }
+      })
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      equipmentName: listQuery.value.equipmentName,	// 设备名称
+      equipmentNo: listQuery.value.equipmentNo,	// 设备编号
+      mesureType: listQuery.value.mesureType, // 检定方式
+      useDept: listQuery.value.useDept, // 使用部门
+      usePerson: listQuery.value.usePerson,	// 使用人
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportEquipmentReminderList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备到期提醒列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典值
+  fetchDeptTreeList() // 获取使用部门
+  fetchUserList() // 获取人员列表
+  fetchData() // 获取表格数据
+})
 </script>
 
 <template>
   <app-container>
-    设备到期提醒
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
+          <el-option
+            v-for="item in mesureTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.usePerson"
+          placeholder="使用人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <!-- ------------------------------------------------- -->
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row)"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') "
+                size="small"
+                link
+                type="primary"
+                @click="urge(row)"
+              >
+                催办
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+</style>a
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
index d444d25..7631686 100644
--- a/src/views/business/board/jobAccount/list.vue
+++ b/src/views/business/board/jobAccount/list.vue
@@ -8,6 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { exportJobAccountList, getJobAccountList } from '@/api/business/board/jobAccount'
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -16,15 +17,15 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '检测实验室', value: 'jcsys', width: '160', align: 'center' },
-  { text: '实验室代码', value: 'jcsys', width: '120', align: 'center' },
-  { text: '当日检测完样品', value: 'jcsys', align: 'center' },
-  { text: '当日检定员出具证书数', value: 'jcsys', align: 'center' },
-  { text: '当日到期样品数', value: 'jcsys', align: 'center' },
-  { text: '今年样品数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数-检测中', value: 'jcsys', align: 'center' },
-  { text: '超期率', value: 'jcsys', align: 'center', width: '180' },
+  { text: '检测实验室', value: 'organizeName', width: '160', align: 'center' },
+  { text: '实验室代码', value: 'organizeNo', width: '160', align: 'center' },
+  { text: '当日检测完样品', value: 'samplesCompletedToday', align: 'center' },
+  { text: '当日检定员出具证书数', value: 'certificatesToday', align: 'center' },
+  { text: '当日到期样品数', value: 'expireSamplesToday', align: 'center' },
+  { text: '今年样品数', value: 'samplesYear', align: 'center' },
+  { text: '今年超期样品总数', value: 'expireSamplesYear', align: 'center' },
+  { text: '今年超期样品总数-检测中', value: 'inMeasureExpireSamplesYear', align: 'center' },
+  { text: '超期率', value: 'expireRate', align: 'center' },
 ])
 
 // 表格数据
@@ -45,17 +46,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      jcsys: 'test',
-    },
-  ]
-  loadingTable.value = false
+  getJobAccountList().then((response) => {
+    list.value = response.data
+    // total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 多选发生改变时
@@ -82,15 +77,10 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // exportTaskList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '实时工作统计列表.xlsx')
-    // })
+    exportJobAccountList().then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '实时工作统计列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -133,8 +123,8 @@
         <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        :data="list" :total="total" :pagination="false" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :is-showmulti-select="false" @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 1449cb7..8d89fd7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -66,7 +66,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e.map((item: { sampleId: string }) => item.sampleId)
 }
 
 // 点击详情
@@ -249,6 +249,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && row.currentSegment && row.currentSegment !== '待分配'"
                 size="small"
                 link
                 type="primary"

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
new file mode 100644
index 0000000..1e8664a
--- /dev/null
+++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
@@ -0,0 +1,32 @@
+// 筛选
+export interface IListQuery {
+  equipmentName: string	// 设备名称
+  equipmentNo: string	// 设备编号
+  mesureType: string // 检定方式
+  useDept: string // 使用部门
+  usePerson: string	// 使用人
+  limit: number
+  offset: number
+}
+
+// 字典
+export interface dictType {
+  name: string
+  id: string
+  value: string
+}
+// 表格数据
+export interface IList {
+  id: string // 主键
+  equipmentNo: string // 设备编号
+  equipmentName: string // 名称
+  modelNo: string // 型号
+  ABC: string // ABC
+  mesureTypeName: string // 检定方式
+  managerStateName: string // 管理状态
+  useDeptName: string // 使用部门
+  managerStausePersonNameteName: string // 使用人
+  validDate: string // 有效日期
+  remark: string // 备注
+}
+
diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue
index ec6a9b7..301487b 100644
--- a/src/views/business/board/equipmentReminder/list.vue
+++ b/src/views/business/board/equipmentReminder/list.vue
@@ -1,14 +1,327 @@
 <!-- 设备到期提醒列表页 -->
 <script lang="ts" setup name="equipmentReminderList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './equipmentReminder-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { exportEquipmentReminderList, getEquipmentReminderList, urgeEquipmentReminderList } from '@/api/business/board/equipmentReminder'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  equipmentName: '',	// 设备名称
+  equipmentNo: '',	// 设备编号
+  mesureType: '', // 检定方式
+  useDept: '', // 使用部门
+  usePerson: '',	// 使用人
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: '58' },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: '90' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '100' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '165' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 获取数据
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const managerStateList = ref<dictType[]>([]) // 管理状态
+const abcList = ref<dictType[]>([]) // ABC
+// 获取字典值
+async function getDict() {
+  // 获取检定方式
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    abcList.value = response.data
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentReminderList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击详情
+const handleEdit = (row: IList) => {
+  $router.push(`/board/equipmentReminderDetail/${row.id}`)
+}
+
+// 点击搜索
+const search = () => {
+  fetchData(true)
+}
+
+// 点击重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '',	// 设备名称
+    equipmentNo: '',	// 设备编号
+    mesureType: '', // 检定方式
+    useDept: '', // 使用部门
+    usePerson: '',	// 使用人
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 催办
+const urge = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认催办吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      urgeEquipmentReminderList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已催办')
+          fetchData(true)
+        }
+      })
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      equipmentName: listQuery.value.equipmentName,	// 设备名称
+      equipmentNo: listQuery.value.equipmentNo,	// 设备编号
+      mesureType: listQuery.value.mesureType, // 检定方式
+      useDept: listQuery.value.useDept, // 使用部门
+      usePerson: listQuery.value.usePerson,	// 使用人
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportEquipmentReminderList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备到期提醒列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典值
+  fetchDeptTreeList() // 获取使用部门
+  fetchUserList() // 获取人员列表
+  fetchData() // 获取表格数据
+})
 </script>
 
 <template>
   <app-container>
-    设备到期提醒
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
+          <el-option
+            v-for="item in mesureTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.usePerson"
+          placeholder="使用人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <!-- ------------------------------------------------- -->
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row)"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') "
+                size="small"
+                link
+                type="primary"
+                @click="urge(row)"
+              >
+                催办
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+</style>a
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
index d444d25..7631686 100644
--- a/src/views/business/board/jobAccount/list.vue
+++ b/src/views/business/board/jobAccount/list.vue
@@ -8,6 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { exportJobAccountList, getJobAccountList } from '@/api/business/board/jobAccount'
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -16,15 +17,15 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '检测实验室', value: 'jcsys', width: '160', align: 'center' },
-  { text: '实验室代码', value: 'jcsys', width: '120', align: 'center' },
-  { text: '当日检测完样品', value: 'jcsys', align: 'center' },
-  { text: '当日检定员出具证书数', value: 'jcsys', align: 'center' },
-  { text: '当日到期样品数', value: 'jcsys', align: 'center' },
-  { text: '今年样品数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数-检测中', value: 'jcsys', align: 'center' },
-  { text: '超期率', value: 'jcsys', align: 'center', width: '180' },
+  { text: '检测实验室', value: 'organizeName', width: '160', align: 'center' },
+  { text: '实验室代码', value: 'organizeNo', width: '160', align: 'center' },
+  { text: '当日检测完样品', value: 'samplesCompletedToday', align: 'center' },
+  { text: '当日检定员出具证书数', value: 'certificatesToday', align: 'center' },
+  { text: '当日到期样品数', value: 'expireSamplesToday', align: 'center' },
+  { text: '今年样品数', value: 'samplesYear', align: 'center' },
+  { text: '今年超期样品总数', value: 'expireSamplesYear', align: 'center' },
+  { text: '今年超期样品总数-检测中', value: 'inMeasureExpireSamplesYear', align: 'center' },
+  { text: '超期率', value: 'expireRate', align: 'center' },
 ])
 
 // 表格数据
@@ -45,17 +46,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      jcsys: 'test',
-    },
-  ]
-  loadingTable.value = false
+  getJobAccountList().then((response) => {
+    list.value = response.data
+    // total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 多选发生改变时
@@ -82,15 +77,10 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // exportTaskList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '实时工作统计列表.xlsx')
-    // })
+    exportJobAccountList().then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '实时工作统计列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -133,8 +123,8 @@
         <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        :data="list" :total="total" :pagination="false" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :is-showmulti-select="false" @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 1449cb7..8d89fd7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -66,7 +66,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e.map((item: { sampleId: string }) => item.sampleId)
 }
 
 // 点击详情
@@ -249,6 +249,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && row.currentSegment && row.currentSegment !== '待分配'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 51321f8..2f7c1d0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -294,7 +294,7 @@
         })
       }
       else if (type === 'back') { // 回退
-        let status
+        let status = ''
         if (currentMenu.value === '已收入') {
           status = '1'
         }

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
new file mode 100644
index 0000000..1e8664a
--- /dev/null
+++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
@@ -0,0 +1,32 @@
+// 筛选
+export interface IListQuery {
+  equipmentName: string	// 设备名称
+  equipmentNo: string	// 设备编号
+  mesureType: string // 检定方式
+  useDept: string // 使用部门
+  usePerson: string	// 使用人
+  limit: number
+  offset: number
+}
+
+// 字典
+export interface dictType {
+  name: string
+  id: string
+  value: string
+}
+// 表格数据
+export interface IList {
+  id: string // 主键
+  equipmentNo: string // 设备编号
+  equipmentName: string // 名称
+  modelNo: string // 型号
+  ABC: string // ABC
+  mesureTypeName: string // 检定方式
+  managerStateName: string // 管理状态
+  useDeptName: string // 使用部门
+  managerStausePersonNameteName: string // 使用人
+  validDate: string // 有效日期
+  remark: string // 备注
+}
+
diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue
index ec6a9b7..301487b 100644
--- a/src/views/business/board/equipmentReminder/list.vue
+++ b/src/views/business/board/equipmentReminder/list.vue
@@ -1,14 +1,327 @@
 <!-- 设备到期提醒列表页 -->
 <script lang="ts" setup name="equipmentReminderList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './equipmentReminder-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { exportEquipmentReminderList, getEquipmentReminderList, urgeEquipmentReminderList } from '@/api/business/board/equipmentReminder'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  equipmentName: '',	// 设备名称
+  equipmentNo: '',	// 设备编号
+  mesureType: '', // 检定方式
+  useDept: '', // 使用部门
+  usePerson: '',	// 使用人
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: '58' },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: '90' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '100' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '165' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 获取数据
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const managerStateList = ref<dictType[]>([]) // 管理状态
+const abcList = ref<dictType[]>([]) // ABC
+// 获取字典值
+async function getDict() {
+  // 获取检定方式
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    abcList.value = response.data
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentReminderList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击详情
+const handleEdit = (row: IList) => {
+  $router.push(`/board/equipmentReminderDetail/${row.id}`)
+}
+
+// 点击搜索
+const search = () => {
+  fetchData(true)
+}
+
+// 点击重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '',	// 设备名称
+    equipmentNo: '',	// 设备编号
+    mesureType: '', // 检定方式
+    useDept: '', // 使用部门
+    usePerson: '',	// 使用人
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 催办
+const urge = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认催办吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      urgeEquipmentReminderList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已催办')
+          fetchData(true)
+        }
+      })
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      equipmentName: listQuery.value.equipmentName,	// 设备名称
+      equipmentNo: listQuery.value.equipmentNo,	// 设备编号
+      mesureType: listQuery.value.mesureType, // 检定方式
+      useDept: listQuery.value.useDept, // 使用部门
+      usePerson: listQuery.value.usePerson,	// 使用人
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportEquipmentReminderList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备到期提醒列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典值
+  fetchDeptTreeList() // 获取使用部门
+  fetchUserList() // 获取人员列表
+  fetchData() // 获取表格数据
+})
 </script>
 
 <template>
   <app-container>
-    设备到期提醒
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
+          <el-option
+            v-for="item in mesureTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.usePerson"
+          placeholder="使用人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <!-- ------------------------------------------------- -->
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row)"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') "
+                size="small"
+                link
+                type="primary"
+                @click="urge(row)"
+              >
+                催办
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+</style>a
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
index d444d25..7631686 100644
--- a/src/views/business/board/jobAccount/list.vue
+++ b/src/views/business/board/jobAccount/list.vue
@@ -8,6 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { exportJobAccountList, getJobAccountList } from '@/api/business/board/jobAccount'
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -16,15 +17,15 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '检测实验室', value: 'jcsys', width: '160', align: 'center' },
-  { text: '实验室代码', value: 'jcsys', width: '120', align: 'center' },
-  { text: '当日检测完样品', value: 'jcsys', align: 'center' },
-  { text: '当日检定员出具证书数', value: 'jcsys', align: 'center' },
-  { text: '当日到期样品数', value: 'jcsys', align: 'center' },
-  { text: '今年样品数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数-检测中', value: 'jcsys', align: 'center' },
-  { text: '超期率', value: 'jcsys', align: 'center', width: '180' },
+  { text: '检测实验室', value: 'organizeName', width: '160', align: 'center' },
+  { text: '实验室代码', value: 'organizeNo', width: '160', align: 'center' },
+  { text: '当日检测完样品', value: 'samplesCompletedToday', align: 'center' },
+  { text: '当日检定员出具证书数', value: 'certificatesToday', align: 'center' },
+  { text: '当日到期样品数', value: 'expireSamplesToday', align: 'center' },
+  { text: '今年样品数', value: 'samplesYear', align: 'center' },
+  { text: '今年超期样品总数', value: 'expireSamplesYear', align: 'center' },
+  { text: '今年超期样品总数-检测中', value: 'inMeasureExpireSamplesYear', align: 'center' },
+  { text: '超期率', value: 'expireRate', align: 'center' },
 ])
 
 // 表格数据
@@ -45,17 +46,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      jcsys: 'test',
-    },
-  ]
-  loadingTable.value = false
+  getJobAccountList().then((response) => {
+    list.value = response.data
+    // total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 多选发生改变时
@@ -82,15 +77,10 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // exportTaskList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '实时工作统计列表.xlsx')
-    // })
+    exportJobAccountList().then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '实时工作统计列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -133,8 +123,8 @@
         <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        :data="list" :total="total" :pagination="false" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :is-showmulti-select="false" @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 1449cb7..8d89fd7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -66,7 +66,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e.map((item: { sampleId: string }) => item.sampleId)
 }
 
 // 点击详情
@@ -249,6 +249,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && row.currentSegment && row.currentSegment !== '待分配'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 51321f8..2f7c1d0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -294,7 +294,7 @@
         })
       }
       else if (type === 'back') { // 回退
-        let status
+        let status = ''
         if (currentMenu.value === '已收入') {
           status = '1'
         }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index ee710d5..5705273 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -200,11 +200,13 @@
       type: 1, // 成员
     }
 
-    addProcess(processConfig.value).then(() => {
-      ElMessage.success('创建流程成功')
-      emits('createProcessSuccess') // 返回列表页
+    addProcess(processConfig.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('创建流程成功')
+        emits('createProcessSuccess') // 返回列表页
+      }
     }).catch(() => { // 流程异常情况: 所填写的formID已经存在
-      emits('createProcessSuccess') // 返回列表页
+      // emits('createProcessSuccess') // 返回列表页
     })
   }
   loading.close()

diff --git a/src/api/business/board/equipmentReminder.ts b/src/api/business/board/equipmentReminder.ts
new file mode 100644
index 0000000..37db34d
--- /dev/null
+++ b/src/api/business/board/equipmentReminder.ts
@@ -0,0 +1,40 @@
+// 设备到期提醒
+import request from '../../index'
+import type { IListQuery } from '@/views/business/board/equipmentReminder/equipmentReminder-interface'
+
+// 设备到期提醒列表
+export function getEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: `/meter/assets/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 设备到期提醒导出
+export function exportEquipmentReminderList(data: IListQuery) {
+  return request({
+    url: '/meter/assets/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 催办
+export function urgeEquipmentReminderList(data: { id: string }) {
+  return request({
+    url: '/meter/assets/remindWorker',
+    method: 'post',
+    data,
+  })
+}
+
+// 固定资产详情
+export function getEquipmentReminderDetail(data: object) {
+  return request({
+    url: '/meter/assets/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/board/jobAccount.ts b/src/api/business/board/jobAccount.ts
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/src/api/business/board/jobAccount.ts
@@ -0,0 +1,21 @@
+// 实时工作统计
+import request from '../../index'
+
+// 实时工作统计列表
+export function getJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics',
+    method: 'get',
+  })
+}
+
+// 实时工作统计导出
+export function exportJobAccountList() {
+  return request({
+    url: '/business/board/workStatistics/export',
+    method: 'get',
+    responseType: 'blob',
+    // data,
+  })
+}
+
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 3a6a285..b3c1920 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
   endTime: '',
   deptId: '',
   offset: 1,
-  limit: 5,
+  limit: 20,
   sort: 'id',
   deptType: '',
 })
@@ -166,7 +166,8 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
+            :height="260"
+            :page-sizes="[20]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index a2af905..b21ad07 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'equipmentReminderDetail/:id',
+        name: 'EquipmentReminderDetail',
+        component: () => import('@/views/business/board/equipmentReminder/detail.vue'),
+        meta: {
+          title: '设备到期提醒详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/board/equipmentReminderList',
+        },
+      },
+      {
         path: 'standardReminderList',
         name: 'StandardReminderList',
         component: () => import('@/views/business/board/standardReminder/list.vue'),
@@ -91,16 +103,16 @@
           auth: '/business/board/jobAccount',
         },
       },
-      {
-        path: 'departmentalOutputAnalysis',
-        name: 'JobAccountList',
-        component: () => import('@/views/business/board/jobAccount/list.vue'),
-        meta: {
-          title: '部门产值分析',
-          icon: 'ep:key',
-          auth: '/business/board/departmentalOutputAnalysis',
-        },
-      },
+      // {
+      //   path: 'departmentalOutputAnalysis',
+      //   name: 'JobAccountList',
+      //   component: () => import('@/views/business/board/jobAccount/list.vue'),
+      //   meta: {
+      //     title: '部门产值分析',
+      //     icon: 'ep:key',
+      //     auth: '/business/board/departmentalOutputAnalysis',
+      //   },
+      // },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
new file mode 100644
index 0000000..1e8664a
--- /dev/null
+++ b/src/views/business/board/equipmentReminder/equipmentReminder-interface.ts
@@ -0,0 +1,32 @@
+// 筛选
+export interface IListQuery {
+  equipmentName: string	// 设备名称
+  equipmentNo: string	// 设备编号
+  mesureType: string // 检定方式
+  useDept: string // 使用部门
+  usePerson: string	// 使用人
+  limit: number
+  offset: number
+}
+
+// 字典
+export interface dictType {
+  name: string
+  id: string
+  value: string
+}
+// 表格数据
+export interface IList {
+  id: string // 主键
+  equipmentNo: string // 设备编号
+  equipmentName: string // 名称
+  modelNo: string // 型号
+  ABC: string // ABC
+  mesureTypeName: string // 检定方式
+  managerStateName: string // 管理状态
+  useDeptName: string // 使用部门
+  managerStausePersonNameteName: string // 使用人
+  validDate: string // 有效日期
+  remark: string // 备注
+}
+
diff --git a/src/views/business/board/equipmentReminder/list.vue b/src/views/business/board/equipmentReminder/list.vue
index ec6a9b7..301487b 100644
--- a/src/views/business/board/equipmentReminder/list.vue
+++ b/src/views/business/board/equipmentReminder/list.vue
@@ -1,14 +1,327 @@
 <!-- 设备到期提醒列表页 -->
 <script lang="ts" setup name="equipmentReminderList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery, dictType } from './equipmentReminder-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { exportEquipmentReminderList, getEquipmentReminderList, urgeEquipmentReminderList } from '@/api/business/board/equipmentReminder'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  equipmentName: '',	// 设备名称
+  equipmentNo: '',	// 设备编号
+  mesureType: '', // 检定方式
+  useDept: '', // 使用部门
+  usePerson: '',	// 使用人
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: '58' },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: '90' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '100' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '165' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 获取数据
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const managerStateList = ref<dictType[]>([]) // 管理状态
+const abcList = ref<dictType[]>([]) // ABC
+// 获取字典值
+async function getDict() {
+  // 获取检定方式
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data
+  })
+  // 获取ABC
+  getDictByCode('ABC').then((response) => {
+    abcList.value = response.data
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEquipmentReminderList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击详情
+const handleEdit = (row: IList) => {
+  $router.push(`/board/equipmentReminderDetail/${row.id}`)
+}
+
+// 点击搜索
+const search = () => {
+  fetchData(true)
+}
+
+// 点击重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '',	// 设备名称
+    equipmentNo: '',	// 设备编号
+    mesureType: '', // 检定方式
+    useDept: '', // 使用部门
+    usePerson: '',	// 使用人
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 催办
+const urge = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认催办吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      urgeEquipmentReminderList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已催办')
+          fetchData(true)
+        }
+      })
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      equipmentName: listQuery.value.equipmentName,	// 设备名称
+      equipmentNo: listQuery.value.equipmentNo,	// 设备编号
+      mesureType: listQuery.value.mesureType, // 检定方式
+      useDept: listQuery.value.useDept, // 使用部门
+      usePerson: listQuery.value.usePerson,	// 使用人
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportEquipmentReminderList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备到期提醒列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典值
+  fetchDeptTreeList() // 获取使用部门
+  fetchUserList() // 获取人员列表
+  fetchData() // 获取表格数据
+})
 </script>
 
 <template>
   <app-container>
-    设备到期提醒
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable class="w-50 m-2" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
+          <el-option
+            v-for="item in mesureTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.usePerson"
+          placeholder="使用人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <!-- ------------------------------------------------- -->
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row)"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') "
+                size="small"
+                link
+                type="primary"
+                @click="urge(row)"
+              >
+                催办
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
-</style>
+</style>a
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
index d444d25..7631686 100644
--- a/src/views/business/board/jobAccount/list.vue
+++ b/src/views/business/board/jobAccount/list.vue
@@ -8,6 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { exportJobAccountList, getJobAccountList } from '@/api/business/board/jobAccount'
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -16,15 +17,15 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '检测实验室', value: 'jcsys', width: '160', align: 'center' },
-  { text: '实验室代码', value: 'jcsys', width: '120', align: 'center' },
-  { text: '当日检测完样品', value: 'jcsys', align: 'center' },
-  { text: '当日检定员出具证书数', value: 'jcsys', align: 'center' },
-  { text: '当日到期样品数', value: 'jcsys', align: 'center' },
-  { text: '今年样品数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数', value: 'jcsys', align: 'center' },
-  { text: '今年超期样品总数-检测中', value: 'jcsys', align: 'center' },
-  { text: '超期率', value: 'jcsys', align: 'center', width: '180' },
+  { text: '检测实验室', value: 'organizeName', width: '160', align: 'center' },
+  { text: '实验室代码', value: 'organizeNo', width: '160', align: 'center' },
+  { text: '当日检测完样品', value: 'samplesCompletedToday', align: 'center' },
+  { text: '当日检定员出具证书数', value: 'certificatesToday', align: 'center' },
+  { text: '当日到期样品数', value: 'expireSamplesToday', align: 'center' },
+  { text: '今年样品数', value: 'samplesYear', align: 'center' },
+  { text: '今年超期样品总数', value: 'expireSamplesYear', align: 'center' },
+  { text: '今年超期样品总数-检测中', value: 'inMeasureExpireSamplesYear', align: 'center' },
+  { text: '超期率', value: 'expireRate', align: 'center' },
 ])
 
 // 表格数据
@@ -45,17 +46,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getTaskList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      jcsys: 'test',
-    },
-  ]
-  loadingTable.value = false
+  getJobAccountList().then((response) => {
+    list.value = response.data
+    // total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 多选发生改变时
@@ -82,15 +77,10 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // exportTaskList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '实时工作统计列表.xlsx')
-    // })
+    exportJobAccountList().then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '实时工作统计列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -133,8 +123,8 @@
         <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        :data="list" :total="total" :pagination="false" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :is-showmulti-select="false" @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 1449cb7..8d89fd7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -66,7 +66,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e.map((item: { sampleId: string }) => item.sampleId)
 }
 
 // 点击详情
@@ -249,6 +249,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && row.currentSegment && row.currentSegment !== '待分配'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 51321f8..2f7c1d0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -294,7 +294,7 @@
         })
       }
       else if (type === 'back') { // 回退
-        let status
+        let status = ''
         if (currentMenu.value === '已收入') {
           status = '1'
         }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index ee710d5..5705273 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -200,11 +200,13 @@
       type: 1, // 成员
     }
 
-    addProcess(processConfig.value).then(() => {
-      ElMessage.success('创建流程成功')
-      emits('createProcessSuccess') // 返回列表页
+    addProcess(processConfig.value).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('创建流程成功')
+        emits('createProcessSuccess') // 返回列表页
+      }
     }).catch(() => { // 流程异常情况: 所填写的formID已经存在
-      emits('createProcessSuccess') // 返回列表页
+      // emits('createProcessSuccess') // 返回列表页
     })
   }
   loading.close()
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 888f4b6..a10a633 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -95,7 +95,11 @@
       window.sessionStorage.setItem('decisionItem', `${form.value.decisionItem}`)
       window.sessionStorage.setItem('noticeStarter', `${form.value.noticeStarter}`)
       // 调保存接口
-      processSetting.value.saveSet()
+      processSetting.value.saveSet('edit', form.value.name, form.value.business, form.value.desc)
+      getRowData.name = form.value.name // 流程名称
+      getRowData.business = form.value.business // 流程名称
+      getRowData.formID = form.value.formID // 流程名称
+      getRowData.desc = form.value.desc // 流程名称
     }
     else {
       console.log('error submit!', fields)