diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue
index e69de29..97064a2 100644
--- a/src/views/business/board/equipmentReminder/detail.vue
+++ b/src/views/business/board/equipmentReminder/detail.vue
@@ -0,0 +1,14 @@
+<!-- 设备到期提醒详情页 -->
+<script lang="ts" setup name="OverdueReminderDetail">
+
+</script>
+
+<template>
+  <app-container>
+    设备到期提醒详情
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue
index e69de29..97064a2 100644
--- a/src/views/business/board/equipmentReminder/detail.vue
+++ b/src/views/business/board/equipmentReminder/detail.vue
@@ -0,0 +1,14 @@
+<!-- 设备到期提醒详情页 -->
+<script lang="ts" setup name="OverdueReminderDetail">
+
+</script>
+
+<template>
+  <app-container>
+    设备到期提醒详情
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts
new file mode 100644
index 0000000..7c33972
--- /dev/null
+++ b/src/views/business/board/jobAccount/jobAccount-interface.ts
@@ -0,0 +1,9 @@
+// 表格
+export interface IList {
+
+}
+
+export interface IListQuery {
+  offset: number
+  limit: number
+}

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue
index e69de29..97064a2 100644
--- a/src/views/business/board/equipmentReminder/detail.vue
+++ b/src/views/business/board/equipmentReminder/detail.vue
@@ -0,0 +1,14 @@
+<!-- 设备到期提醒详情页 -->
+<script lang="ts" setup name="OverdueReminderDetail">
+
+</script>
+
+<template>
+  <app-container>
+    设备到期提醒详情
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts
new file mode 100644
index 0000000..7c33972
--- /dev/null
+++ b/src/views/business/board/jobAccount/jobAccount-interface.ts
@@ -0,0 +1,9 @@
+// 表格
+export interface IList {
+
+}
+
+export interface IListQuery {
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
new file mode 100644
index 0000000..d444d25
--- /dev/null
+++ b/src/views/business/board/jobAccount/list.vue
@@ -0,0 +1,153 @@
+<!-- 实时工作统计 -->
+<script lang="ts" setup name="JobAccountList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IList, IListQuery } from './jobAccount-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  offset: 1,
+  limit: 20,
+})
+// 表头
+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' },
+])
+
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格标题时间
+const titleTime = ref('')
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    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
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    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')
+    // })
+  }
+  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('无可打印内容')
+  }
+}
+
+onMounted(() => {
+  fetchData(true)
+  titleTime.value = `计量服务实时工作统计 (${dayjs().format('YYYY-MM-DD HH:mm')})`
+})
+</script>
+
+<template>
+  <app-container>
+    <table-container :title="titleTime" :is-center="true">
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
+      >
+        <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>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue
index e69de29..97064a2 100644
--- a/src/views/business/board/equipmentReminder/detail.vue
+++ b/src/views/business/board/equipmentReminder/detail.vue
@@ -0,0 +1,14 @@
+<!-- 设备到期提醒详情页 -->
+<script lang="ts" setup name="OverdueReminderDetail">
+
+</script>
+
+<template>
+  <app-container>
+    设备到期提醒详情
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts
new file mode 100644
index 0000000..7c33972
--- /dev/null
+++ b/src/views/business/board/jobAccount/jobAccount-interface.ts
@@ -0,0 +1,9 @@
+// 表格
+export interface IList {
+
+}
+
+export interface IListQuery {
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
new file mode 100644
index 0000000..d444d25
--- /dev/null
+++ b/src/views/business/board/jobAccount/list.vue
@@ -0,0 +1,153 @@
+<!-- 实时工作统计 -->
+<script lang="ts" setup name="JobAccountList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IList, IListQuery } from './jobAccount-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  offset: 1,
+  limit: 20,
+})
+// 表头
+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' },
+])
+
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格标题时间
+const titleTime = ref('')
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    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
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    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')
+    // })
+  }
+  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('无可打印内容')
+  }
+}
+
+onMounted(() => {
+  fetchData(true)
+  titleTime.value = `计量服务实时工作统计 (${dayjs().format('YYYY-MM-DD HH:mm')})`
+})
+</script>
+
+<template>
+  <app-container>
+    <table-container :title="titleTime" :is-center="true">
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
+      >
+        <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>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 2421546..1449cb7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -32,7 +32,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
@@ -139,15 +139,15 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: '', // 样品编号
-      sampleName: '', // 样品名称
-      orderNo: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      isUrgent: '', // 是否加急
-      sampleBelong: '', // 样品属性
-      startTime: '', //	应检定开始时间
-      endTime: '', //	应检定结束时间
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      orderNo: listQuery.value.orderNo, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      startTime: listQuery.value.startTime, //	应检定开始时间
+      endTime: listQuery.value.endTime, //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue
index e69de29..97064a2 100644
--- a/src/views/business/board/equipmentReminder/detail.vue
+++ b/src/views/business/board/equipmentReminder/detail.vue
@@ -0,0 +1,14 @@
+<!-- 设备到期提醒详情页 -->
+<script lang="ts" setup name="OverdueReminderDetail">
+
+</script>
+
+<template>
+  <app-container>
+    设备到期提醒详情
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts
new file mode 100644
index 0000000..7c33972
--- /dev/null
+++ b/src/views/business/board/jobAccount/jobAccount-interface.ts
@@ -0,0 +1,9 @@
+// 表格
+export interface IList {
+
+}
+
+export interface IListQuery {
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
new file mode 100644
index 0000000..d444d25
--- /dev/null
+++ b/src/views/business/board/jobAccount/list.vue
@@ -0,0 +1,153 @@
+<!-- 实时工作统计 -->
+<script lang="ts" setup name="JobAccountList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IList, IListQuery } from './jobAccount-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  offset: 1,
+  limit: 20,
+})
+// 表头
+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' },
+])
+
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格标题时间
+const titleTime = ref('')
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    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
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    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')
+    // })
+  }
+  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('无可打印内容')
+  }
+}
+
+onMounted(() => {
+  fetchData(true)
+  titleTime.value = `计量服务实时工作统计 (${dayjs().format('YYYY-MM-DD HH:mm')})`
+})
+</script>
+
+<template>
+  <app-container>
+    <table-container :title="titleTime" :is-center="true">
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
+      >
+        <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>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 2421546..1449cb7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -32,7 +32,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
@@ -139,15 +139,15 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: '', // 样品编号
-      sampleName: '', // 样品名称
-      orderNo: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      isUrgent: '', // 是否加急
-      sampleBelong: '', // 样品属性
-      startTime: '', //	应检定开始时间
-      endTime: '', //	应检定结束时间
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      orderNo: listQuery.value.orderNo, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      startTime: listQuery.value.startTime, //	应检定开始时间
+      endTime: listQuery.value.endTime, //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 9d9e488..7468e71 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -176,13 +176,8 @@
   //   )
   // }
 }
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
+const changeDeptList = (row: any) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
@@ -420,7 +415,7 @@
                 v-for="item in standardUsersDeptList"
                 :key="item.id"
                 :label="item.organizeName"
-                :value="item.deptId"
+                :value="item.deptId!"
                 @click="changeDeptList(item)"
               />
             </el-select>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue
index e69de29..97064a2 100644
--- a/src/views/business/board/equipmentReminder/detail.vue
+++ b/src/views/business/board/equipmentReminder/detail.vue
@@ -0,0 +1,14 @@
+<!-- 设备到期提醒详情页 -->
+<script lang="ts" setup name="OverdueReminderDetail">
+
+</script>
+
+<template>
+  <app-container>
+    设备到期提醒详情
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts
new file mode 100644
index 0000000..7c33972
--- /dev/null
+++ b/src/views/business/board/jobAccount/jobAccount-interface.ts
@@ -0,0 +1,9 @@
+// 表格
+export interface IList {
+
+}
+
+export interface IListQuery {
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
new file mode 100644
index 0000000..d444d25
--- /dev/null
+++ b/src/views/business/board/jobAccount/list.vue
@@ -0,0 +1,153 @@
+<!-- 实时工作统计 -->
+<script lang="ts" setup name="JobAccountList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IList, IListQuery } from './jobAccount-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  offset: 1,
+  limit: 20,
+})
+// 表头
+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' },
+])
+
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格标题时间
+const titleTime = ref('')
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    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
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    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')
+    // })
+  }
+  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('无可打印内容')
+  }
+}
+
+onMounted(() => {
+  fetchData(true)
+  titleTime.value = `计量服务实时工作统计 (${dayjs().format('YYYY-MM-DD HH:mm')})`
+})
+</script>
+
+<template>
+  <app-container>
+    <table-container :title="titleTime" :is-center="true">
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
+      >
+        <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>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 2421546..1449cb7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -32,7 +32,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
@@ -139,15 +139,15 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: '', // 样品编号
-      sampleName: '', // 样品名称
-      orderNo: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      isUrgent: '', // 是否加急
-      sampleBelong: '', // 样品属性
-      startTime: '', //	应检定开始时间
-      endTime: '', //	应检定结束时间
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      orderNo: listQuery.value.orderNo, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      startTime: listQuery.value.startTime, //	应检定开始时间
+      endTime: listQuery.value.endTime, //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 9d9e488..7468e71 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -176,13 +176,8 @@
   //   )
   // }
 }
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
+const changeDeptList = (row: any) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
@@ -420,7 +415,7 @@
                 v-for="item in standardUsersDeptList"
                 :key="item.id"
                 :label="item.organizeName"
-                :value="item.deptId"
+                :value="item.deptId!"
                 @click="changeDeptList(item)"
               />
             </el-select>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7697052..87e50e9 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -127,7 +127,6 @@
   approvalStatus: '', // 审批状态
   applyEquipmentList: [], // 申请设备列表
   fixedAssetsList: [], // 申请设备上传列表
-  newApplyEquipmentList: [], // 申请设备列表
   newFixedAssetsList: [], // 申请设备上传列表
   approvalStatusName: '', // 审批状态名称
   constructionStandardUnitName: '', // 建标单位名称
@@ -437,28 +436,28 @@
 
   if (type === 'old') { // 需要更换
     // 判断applyEquipmentList上一条数据是否填写
-    if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
+    console.log(fromListInfo.value.newFixedAssetsList)
+
+    if (fromListInfo.value.fixedAssetsList.length >= 1 && fromListInfo.value.fixedAssetsList[fromListInfo.value.fixedAssetsList.length - 1].equipmentId === '') {
       ElMessage.warning('请完善上一条设备信息')
     }
     else {
-      fromListInfo.value.applyEquipmentList.push({
+      fromListInfo.value.fixedAssetsList.push({
         equipmentId: '',
         standardApplyId: '',
       })
-      fromListInfo.value.fixedAssetsList.push({ id: '' })
     }
   }
   else { // 更换为
     // 判断applyEquipmentList上一条数据是否填写
-    if (fromListInfo.value.newApplyEquipmentList.length >= 1 && fromListInfo.value.newApplyEquipmentList[fromListInfo.value.newApplyEquipmentList.length - 1].equipmentId === '') {
+    if (fromListInfo.value.newFixedAssetsList.length >= 1 && fromListInfo.value.newFixedAssetsList[fromListInfo.value.newFixedAssetsList.length - 1].equipmentId === '') {
       ElMessage.warning('请完善上一条设备信息')
     }
     else {
-      fromListInfo.value.newApplyEquipmentList.push({
+      fromListInfo.value.newFixedAssetsList.push({
         equipmentId: '',
         standardApplyId: '',
       })
-      fromListInfo.value.newFixedAssetsList.push({ id: '' })
     }
   }
 }
@@ -469,9 +468,6 @@
       fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
         return !selectionList.value.includes(item)
       })
-      fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-        return !selectionList.value.includes(item)
-      })
     }
     else {
       ElMessage.warning('请选中')
@@ -482,9 +478,6 @@
       fromListInfo.value.newFixedAssetsList = fromListInfo.value.newFixedAssetsList.filter((item) => {
         return !selectionList.value.includes(item)
       })
-      fromListInfo.value.newApplyEquipmentList = fromListInfo.value.newFixedAssetsList.filter((item) => {
-        return !selectionList.value.includes(item)
-      })
     }
     else {
       ElMessage.warning('请选中')
@@ -496,23 +489,27 @@
   data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
 
   if (tableType.value === 'old') { // 需要被更换
-    const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+    const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.equipmentId === data.id)
     if (index === -1) {
       fromListInfo.value.fixedAssetsList[listIndex.value] = data
-      fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-      fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+      // fromListInfo.value.fixedAssetsList[listIndex.value].supportEquipmentId = data.id
+      fromListInfo.value.fixedAssetsList[listIndex.value].equipmentId = data.id
+      fromListInfo.value.fixedAssetsList[listIndex.value].id = ''
     }
     else {
       ElMessage.warning('该设备已存在')
     }
+    console.log(fromListInfo.value.fixedAssetsList)
   }
 
   if (tableType.value === 'new') { // 更换为
-    const index = fromListInfo.value.newFixedAssetsList.findIndex(item => item.id === data.id)
+    console.log('data', data)
+
+    const index = fromListInfo.value.newFixedAssetsList.findIndex(item => item.equipmentId === data.id)
     if (index === -1) {
       fromListInfo.value.newFixedAssetsList[listNewIndex.value] = data
-      fromListInfo.value.newApplyEquipmentList[listNewIndex.value].equipmentId = data.id
-      fromListInfo.value.newApplyEquipmentList[listNewIndex.value].standardApplyId = infoId.value || ''
+      fromListInfo.value.newFixedAssetsList[listNewIndex.value].equipmentId = data.id
+      fromListInfo.value.newFixedAssetsList[listNewIndex.value].id = ''
     }
     else {
       ElMessage.warning('该设备已存在')
@@ -636,13 +633,13 @@
 const save = async (formEl: FormInstance | undefined) => {
   // 添加校验条件
   if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.equipmentId) {
       ElMessage.warning('需要更换的标准配套设备不能为空')
       return false
     }
   }
   if ($route.meta.title === '更换申请' && fromListInfo.value.newFixedAssetsList) {
-    if (!fromListInfo.value.newFixedAssetsList[0]?.id) {
+    if (!fromListInfo.value.newFixedAssetsList[0]?.equipmentId) {
       ElMessage.warning('更换成的标准配套设备不能为空')
       return false
     }
@@ -652,6 +649,24 @@
   }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      // 保存之前清除空行、避免传给后端无用空对象
+      if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+        const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.equipmentId)
+        if (index !== -1) {
+          fromListInfo.value.fixedAssetsList.splice(index, 1)
+        }
+      }
+      // 保存之前清除空行、避免传给后端无用空对象
+      if (fromListInfo.value.newFixedAssetsList && fromListInfo.value.newFixedAssetsList.length) {
+        const index = fromListInfo.value.newFixedAssetsList.findIndex((item: any) => !item.equipmentId)
+        if (index !== -1) {
+          fromListInfo.value.newFixedAssetsList.splice(index, 1)
+        }
+      }
+      if (fromListInfo.value.fixedAssetsList.length !== fromListInfo.value.newFixedAssetsList.length) {
+        ElMessage.warning('两个表格数据条数应相等')
+        return false
+      }
       ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
@@ -661,20 +676,12 @@
           lock: true,
           background: 'rgba(255, 255, 255, 0.8)',
         })
-        // 保存之前清除空行、避免传给后端无用空对象
-        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
-          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
-          if (index !== -1) {
-            fromListInfo.value.fixedAssetsList.splice(index, 1)
+        fromListInfo.value.applyEquipmentList = fromListInfo.value.newFixedAssetsList.map((item, index) => {
+          return {
+            ...item,
+            supportEquipmentId: fromListInfo.value.fixedAssetsList[index].supportEquipmentId,
           }
-        }
-        // 保存之前清除空行、避免传给后端无用空对象
-        if (fromListInfo.value.newFixedAssetsList && fromListInfo.value.newFixedAssetsList.length) {
-          const index = fromListInfo.value.newFixedAssetsList.findIndex((item: any) => !item.id)
-          if (index !== -1) {
-            fromListInfo.value.newFixedAssetsList.splice(index, 1)
-          }
-        }
+        })
         fromListInfo.value.newSupportEquipmentList = fromListInfo.value.newFixedAssetsList
         fromListInfo.value.oldSupportEquipmentList = fromListInfo.value.fixedAssetsList
         fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 2b68cb2..ca0d92e 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -13,13 +13,17 @@
     type: String,
     default: '数据列表',
   },
+  isCenter: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
-      <div v-if="titleShow" class="title-left">
+      <div v-if="titleShow" :class="props.isCenter ? 'title-center' : 'title-left'">
         {{ title }}
       </div>
       <div class="button-left">
@@ -53,6 +57,12 @@
       margin-left: 5px;
     }
 
+    .title-center {
+      margin-left: 5px;
+      flex: 1;
+      text-align: center;
+    }
+
     .button-left {
       display: flex;
       justify-content: flex-start;
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 6d00a4f..a2af905 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -81,6 +81,26 @@
           auth: '/business/board/expirationReminder',
         },
       },
+      {
+        path: 'jobAccount',
+        name: 'JobAccountList',
+        component: () => import('@/views/business/board/jobAccount/list.vue'),
+        meta: {
+          title: '实时工作统计',
+          icon: 'ep:key',
+          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',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/business/board/equipmentReminder/detail.vue b/src/views/business/board/equipmentReminder/detail.vue
index e69de29..97064a2 100644
--- a/src/views/business/board/equipmentReminder/detail.vue
+++ b/src/views/business/board/equipmentReminder/detail.vue
@@ -0,0 +1,14 @@
+<!-- 设备到期提醒详情页 -->
+<script lang="ts" setup name="OverdueReminderDetail">
+
+</script>
+
+<template>
+  <app-container>
+    设备到期提醒详情
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/jobAccount/jobAccount-interface.ts b/src/views/business/board/jobAccount/jobAccount-interface.ts
new file mode 100644
index 0000000..7c33972
--- /dev/null
+++ b/src/views/business/board/jobAccount/jobAccount-interface.ts
@@ -0,0 +1,9 @@
+// 表格
+export interface IList {
+
+}
+
+export interface IListQuery {
+  offset: number
+  limit: number
+}
diff --git a/src/views/business/board/jobAccount/list.vue b/src/views/business/board/jobAccount/list.vue
new file mode 100644
index 0000000..d444d25
--- /dev/null
+++ b/src/views/business/board/jobAccount/list.vue
@@ -0,0 +1,153 @@
+<!-- 实时工作统计 -->
+<script lang="ts" setup name="JobAccountList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IList, IListQuery } from './jobAccount-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  offset: 1,
+  limit: 20,
+})
+// 表头
+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' },
+])
+
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格标题时间
+const titleTime = ref('')
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    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
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    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')
+    // })
+  }
+  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('无可打印内容')
+  }
+}
+
+onMounted(() => {
+  fetchData(true)
+  titleTime.value = `计量服务实时工作统计 (${dayjs().format('YYYY-MM-DD HH:mm')})`
+})
+</script>
+
+<template>
+  <app-container>
+    <table-container :title="titleTime" :is-center="true">
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/business/board/jobAccount/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
+      >
+        <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>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/board/overdueReminder/list.vue b/src/views/business/board/overdueReminder/list.vue
index 2421546..1449cb7 100644
--- a/src/views/business/board/overdueReminder/list.vue
+++ b/src/views/business/board/overdueReminder/list.vue
@@ -32,7 +32,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
@@ -139,15 +139,15 @@
   })
   if (list.value.length > 0) {
     const params = {
-      sampleNo: '', // 样品编号
-      sampleName: '', // 样品名称
-      orderNo: '', // 委托书编号
-      customerNo: '', // 委托方代码
-      customerName: '', // 委托方名称
-      isUrgent: '', // 是否加急
-      sampleBelong: '', // 样品属性
-      startTime: '', //	应检定开始时间
-      endTime: '', //	应检定结束时间
+      sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleName: listQuery.value.sampleName, // 样品名称
+      orderNo: listQuery.value.orderNo, // 委托书编号
+      customerNo: listQuery.value.customerNo, // 委托方代码
+      customerName: listQuery.value.customerName, // 委托方名称
+      isUrgent: listQuery.value.isUrgent, // 是否加急
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      startTime: listQuery.value.startTime, //	应检定开始时间
+      endTime: listQuery.value.endTime, //	应检定结束时间
       sampleStatus: '8', // 样品状态 -- 8已超期
       ids: checkoutList.value,
     }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 9d9e488..7468e71 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -176,13 +176,8 @@
   //   )
   // }
 }
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
+const changeDeptList = (row: any) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
@@ -420,7 +415,7 @@
                 v-for="item in standardUsersDeptList"
                 :key="item.id"
                 :label="item.organizeName"
-                :value="item.deptId"
+                :value="item.deptId!"
                 @click="changeDeptList(item)"
               />
             </el-select>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7697052..87e50e9 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -127,7 +127,6 @@
   approvalStatus: '', // 审批状态
   applyEquipmentList: [], // 申请设备列表
   fixedAssetsList: [], // 申请设备上传列表
-  newApplyEquipmentList: [], // 申请设备列表
   newFixedAssetsList: [], // 申请设备上传列表
   approvalStatusName: '', // 审批状态名称
   constructionStandardUnitName: '', // 建标单位名称
@@ -437,28 +436,28 @@
 
   if (type === 'old') { // 需要更换
     // 判断applyEquipmentList上一条数据是否填写
-    if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
+    console.log(fromListInfo.value.newFixedAssetsList)
+
+    if (fromListInfo.value.fixedAssetsList.length >= 1 && fromListInfo.value.fixedAssetsList[fromListInfo.value.fixedAssetsList.length - 1].equipmentId === '') {
       ElMessage.warning('请完善上一条设备信息')
     }
     else {
-      fromListInfo.value.applyEquipmentList.push({
+      fromListInfo.value.fixedAssetsList.push({
         equipmentId: '',
         standardApplyId: '',
       })
-      fromListInfo.value.fixedAssetsList.push({ id: '' })
     }
   }
   else { // 更换为
     // 判断applyEquipmentList上一条数据是否填写
-    if (fromListInfo.value.newApplyEquipmentList.length >= 1 && fromListInfo.value.newApplyEquipmentList[fromListInfo.value.newApplyEquipmentList.length - 1].equipmentId === '') {
+    if (fromListInfo.value.newFixedAssetsList.length >= 1 && fromListInfo.value.newFixedAssetsList[fromListInfo.value.newFixedAssetsList.length - 1].equipmentId === '') {
       ElMessage.warning('请完善上一条设备信息')
     }
     else {
-      fromListInfo.value.newApplyEquipmentList.push({
+      fromListInfo.value.newFixedAssetsList.push({
         equipmentId: '',
         standardApplyId: '',
       })
-      fromListInfo.value.newFixedAssetsList.push({ id: '' })
     }
   }
 }
@@ -469,9 +468,6 @@
       fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
         return !selectionList.value.includes(item)
       })
-      fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-        return !selectionList.value.includes(item)
-      })
     }
     else {
       ElMessage.warning('请选中')
@@ -482,9 +478,6 @@
       fromListInfo.value.newFixedAssetsList = fromListInfo.value.newFixedAssetsList.filter((item) => {
         return !selectionList.value.includes(item)
       })
-      fromListInfo.value.newApplyEquipmentList = fromListInfo.value.newFixedAssetsList.filter((item) => {
-        return !selectionList.value.includes(item)
-      })
     }
     else {
       ElMessage.warning('请选中')
@@ -496,23 +489,27 @@
   data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
 
   if (tableType.value === 'old') { // 需要被更换
-    const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+    const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.equipmentId === data.id)
     if (index === -1) {
       fromListInfo.value.fixedAssetsList[listIndex.value] = data
-      fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-      fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+      // fromListInfo.value.fixedAssetsList[listIndex.value].supportEquipmentId = data.id
+      fromListInfo.value.fixedAssetsList[listIndex.value].equipmentId = data.id
+      fromListInfo.value.fixedAssetsList[listIndex.value].id = ''
     }
     else {
       ElMessage.warning('该设备已存在')
     }
+    console.log(fromListInfo.value.fixedAssetsList)
   }
 
   if (tableType.value === 'new') { // 更换为
-    const index = fromListInfo.value.newFixedAssetsList.findIndex(item => item.id === data.id)
+    console.log('data', data)
+
+    const index = fromListInfo.value.newFixedAssetsList.findIndex(item => item.equipmentId === data.id)
     if (index === -1) {
       fromListInfo.value.newFixedAssetsList[listNewIndex.value] = data
-      fromListInfo.value.newApplyEquipmentList[listNewIndex.value].equipmentId = data.id
-      fromListInfo.value.newApplyEquipmentList[listNewIndex.value].standardApplyId = infoId.value || ''
+      fromListInfo.value.newFixedAssetsList[listNewIndex.value].equipmentId = data.id
+      fromListInfo.value.newFixedAssetsList[listNewIndex.value].id = ''
     }
     else {
       ElMessage.warning('该设备已存在')
@@ -636,13 +633,13 @@
 const save = async (formEl: FormInstance | undefined) => {
   // 添加校验条件
   if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.equipmentId) {
       ElMessage.warning('需要更换的标准配套设备不能为空')
       return false
     }
   }
   if ($route.meta.title === '更换申请' && fromListInfo.value.newFixedAssetsList) {
-    if (!fromListInfo.value.newFixedAssetsList[0]?.id) {
+    if (!fromListInfo.value.newFixedAssetsList[0]?.equipmentId) {
       ElMessage.warning('更换成的标准配套设备不能为空')
       return false
     }
@@ -652,6 +649,24 @@
   }
   await formEl.validate((valid, fields) => {
     if (valid) {
+      // 保存之前清除空行、避免传给后端无用空对象
+      if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+        const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.equipmentId)
+        if (index !== -1) {
+          fromListInfo.value.fixedAssetsList.splice(index, 1)
+        }
+      }
+      // 保存之前清除空行、避免传给后端无用空对象
+      if (fromListInfo.value.newFixedAssetsList && fromListInfo.value.newFixedAssetsList.length) {
+        const index = fromListInfo.value.newFixedAssetsList.findIndex((item: any) => !item.equipmentId)
+        if (index !== -1) {
+          fromListInfo.value.newFixedAssetsList.splice(index, 1)
+        }
+      }
+      if (fromListInfo.value.fixedAssetsList.length !== fromListInfo.value.newFixedAssetsList.length) {
+        ElMessage.warning('两个表格数据条数应相等')
+        return false
+      }
       ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
@@ -661,20 +676,12 @@
           lock: true,
           background: 'rgba(255, 255, 255, 0.8)',
         })
-        // 保存之前清除空行、避免传给后端无用空对象
-        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
-          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
-          if (index !== -1) {
-            fromListInfo.value.fixedAssetsList.splice(index, 1)
+        fromListInfo.value.applyEquipmentList = fromListInfo.value.newFixedAssetsList.map((item, index) => {
+          return {
+            ...item,
+            supportEquipmentId: fromListInfo.value.fixedAssetsList[index].supportEquipmentId,
           }
-        }
-        // 保存之前清除空行、避免传给后端无用空对象
-        if (fromListInfo.value.newFixedAssetsList && fromListInfo.value.newFixedAssetsList.length) {
-          const index = fromListInfo.value.newFixedAssetsList.findIndex((item: any) => !item.id)
-          if (index !== -1) {
-            fromListInfo.value.newFixedAssetsList.splice(index, 1)
-          }
-        }
+        })
         fromListInfo.value.newSupportEquipmentList = fromListInfo.value.newFixedAssetsList
         fromListInfo.value.oldSupportEquipmentList = fromListInfo.value.fixedAssetsList
         fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 953932b..471f8cb 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -170,10 +170,11 @@
 }
 
 export interface IApplyEquipmentList {
-  equipmentId?: string
+  equipmentId?: string // 更换后的配套设备id
   standardApplyId?: string
   id?: string
   standardEquipmentId?: string
+  supportEquipmentId?: string // 原有配套设备id
 }
 
 // 计量人员列表item类型
@@ -222,7 +223,6 @@
   approvalStatus: string // 审批状态
   applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
   fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
-  newApplyEquipmentList: IApplyEquipmentList[] // 申请设备列表
   newFixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
   approvalStatusName: string // 审批状态名称
   constructionStandardUnitName: string // 建标单位名称