diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 02d0fcc..8fa1bc7 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -126,8 +126,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 getSelectList('standardManagerState') // 获取管理状态下拉框
 
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -138,7 +138,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 02d0fcc..8fa1bc7 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -126,8 +126,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 getSelectList('standardManagerState') // 获取管理状态下拉框
 
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -138,7 +138,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index d7a0f7f..aa5845f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -11,14 +11,6 @@
   remark: string
 }
 
-export interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-
 export interface IlistQuery {
   applyNo: string
   applyStatus: string

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 02d0fcc..8fa1bc7 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -126,8 +126,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 getSelectList('standardManagerState') // 获取管理状态下拉框
 
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -138,7 +138,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index d7a0f7f..aa5845f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -11,14 +11,6 @@
   remark: string
 }
 
-export interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 780cbfa..8a2ffb4 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -11,7 +11,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 02d0fcc..8fa1bc7 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -126,8 +126,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 getSelectList('standardManagerState') // 获取管理状态下拉框
 
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -138,7 +138,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index d7a0f7f..aa5845f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -11,14 +11,6 @@
   remark: string
 }
 
-export interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 780cbfa..8a2ffb4 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -11,7 +11,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 20b5041..61f6af0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -31,11 +31,11 @@
 }
 const formInline = ref({
   createTime: null,
-  deptId: null,
+  deptId: '',
   deptName: null,
-  director: null,
+  director: '',
   effectiveCompany: null,
-  id: null,
+  id: '',
   planName: null,
   planNo: null,
   remark: null,
@@ -45,7 +45,7 @@
   trainNumber: null,
   trainPerson: null,
   trainStaffList: [],
-  trainTime: null,
+  trainTime: '',
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -140,8 +140,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 负责人类型
+interface confirmPersonType {
+  name: string
+}
+// 负责人类型
+interface trainStaffListType {
+  updateTime: string
+  createTime: string
+}
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: confirmPersonType) => {
   console.log(object)
   formInline.value.director = object.name
 }
@@ -178,7 +187,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item) => {
+          formInline.value.trainStaffList.map((item: trainStaffListType) => {
             delete item.updateTime
             delete item.createTime
           })

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 02d0fcc..8fa1bc7 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -126,8 +126,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 getSelectList('standardManagerState') // 获取管理状态下拉框
 
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -138,7 +138,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index d7a0f7f..aa5845f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -11,14 +11,6 @@
   remark: string
 }
 
-export interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 780cbfa..8a2ffb4 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -11,7 +11,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 20b5041..61f6af0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -31,11 +31,11 @@
 }
 const formInline = ref({
   createTime: null,
-  deptId: null,
+  deptId: '',
   deptName: null,
-  director: null,
+  director: '',
   effectiveCompany: null,
-  id: null,
+  id: '',
   planName: null,
   planNo: null,
   remark: null,
@@ -45,7 +45,7 @@
   trainNumber: null,
   trainPerson: null,
   trainStaffList: [],
-  trainTime: null,
+  trainTime: '',
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -140,8 +140,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 负责人类型
+interface confirmPersonType {
+  name: string
+}
+// 负责人类型
+interface trainStaffListType {
+  updateTime: string
+  createTime: string
+}
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: confirmPersonType) => {
   console.log(object)
   formInline.value.director = object.name
 }
@@ -178,7 +187,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item) => {
+          formInline.value.trainStaffList.map((item: trainStaffListType) => {
             delete item.updateTime
             delete item.createTime
           })
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index fb2fa17..11d1a7c 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -75,6 +75,7 @@
 export interface IOptions {
   id: string
   name: string
+  planName: string
 }
 
 export interface IlistTypes {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 02d0fcc..8fa1bc7 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -126,8 +126,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 getSelectList('standardManagerState') // 获取管理状态下拉框
 
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -138,7 +138,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index d7a0f7f..aa5845f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -11,14 +11,6 @@
   remark: string
 }
 
-export interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 780cbfa..8a2ffb4 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -11,7 +11,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 20b5041..61f6af0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -31,11 +31,11 @@
 }
 const formInline = ref({
   createTime: null,
-  deptId: null,
+  deptId: '',
   deptName: null,
-  director: null,
+  director: '',
   effectiveCompany: null,
-  id: null,
+  id: '',
   planName: null,
   planNo: null,
   remark: null,
@@ -45,7 +45,7 @@
   trainNumber: null,
   trainPerson: null,
   trainStaffList: [],
-  trainTime: null,
+  trainTime: '',
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -140,8 +140,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 负责人类型
+interface confirmPersonType {
+  name: string
+}
+// 负责人类型
+interface trainStaffListType {
+  updateTime: string
+  createTime: string
+}
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: confirmPersonType) => {
   console.log(object)
   formInline.value.director = object.name
 }
@@ -178,7 +187,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item) => {
+          formInline.value.trainStaffList.map((item: trainStaffListType) => {
             delete item.updateTime
             delete item.createTime
           })
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index fb2fa17..11d1a7c 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -75,6 +75,7 @@
 export interface IOptions {
   id: string
   name: string
+  planName: string
 }
 
 export interface IlistTypes {
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index df09a66..f4fc979 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -7,7 +7,7 @@
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuerys> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   ids: [],

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index a5d557a..6e6fdfa 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -118,3 +118,12 @@
   })
 }
 
+// 申请编辑
+export function updateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/updateStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
deleted file mode 100644
index 34b76f5..0000000
--- a/src/assets/images/bench/1671087276259.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/bench/sampie-status.png b/src/assets/images/bench/sampie-status.png
new file mode 100644
index 0000000..ff9eb2d
--- /dev/null
+++ b/src/assets/images/bench/sampie-status.png
Binary files differ
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 64a6818..1f5af41 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -1,13 +1,528 @@
-<script lang="ts" setup name="CustomerList">
-// 业务管理-工作台
+<script lang="ts" setup name="DeviceBench">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
+import { getTrainLogSStatistic } from '@/api/system/bench'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
+import useUserStore from '@/store/modules/user'
+
+const { username } = useUserStore()
+// 每个展示块高度
+const blockHeight = ref(300)
+const blockWidth = ref(400)
+const { proxy } = getCurrentInstance() as any
+// 设备台账检定提醒表格数据
+const standingBookTableData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 10,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 77,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 22,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 33,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '当前检测实验室',
+    lastTime: '下一检测实验室',
+    schedule: 15,
+  },
+])
+// 设备台账检定提醒表头
+const standingBookTableHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '当前检测实验室', value: 'usePersonName', width: '125' },
+  { text: '下一检测实验室', value: 'lastTime', width: '130' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 我的检测表头
+const myTestsHead = [
+  { text: '样品名称', value: 'equipmentName', width: '80' },
+  { text: '委托方名称', value: 'usePersonName', width: '100' },
+  { text: '检测状态', value: 'lastTime', width: '80' },
+]
+// 我的检测表格数据
+const myTestsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '委托方名称',
+    lastTime: '检测状态',
+  },
+])
+// 进度条数据
+const percentage1 = ref(20)
+const percentage2 = ref(40)
+const percentage3 = ref(60)
+// 进度条添加后缀 %
+const format = (percentage: number) => (percentage === 100 ? 'Full' : `${percentage}%`)
+// 证书报告表头
+const credentialsHead = [
+  { text: '名称', value: 'equipmentName', width: '100' },
+  { text: '检定员', value: 'usePersonName' },
+  { text: '状态', value: 'lastTime' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 证书报告表格数据
+const credentialsData = ref([
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 30,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '审批中',
+    schedule: 20,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '可打印',
+    schedule: 60,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 70,
+  },
+  {
+    equipmentName: '样品名称',
+    usePersonName: '检定员',
+    lastTime: '编制中',
+    schedule: 10,
+  },
+])
+// 实时工作统计表头
+const realTimeWorkStatisticsHead = [
+  { text: '实验室名称', value: 'equipmentName', width: '100' },
+  { text: '今日检完样品', value: 'usePersonName', width: '120' },
+  { text: '今日出具证书数', value: 'lastTime', width: '140' },
+  { text: '进度', value: 'schedule', width: '140' },
+]
+// 实时工作统计表格数据
+const realTimeWorkStatisticsData = ref([
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 12,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 25,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 99,
+  },
+  {
+    equipmentName: '实验室名称',
+    usePersonName: '今日检完样品',
+    lastTime: '今日出具证书数',
+    schedule: 44,
+  },
+])
+// 标准装置到期提醒表格数据
+const standardTableData = ref([
+  {
+    equipmentName: '设备1',
+    usePersonName: '负责人1',
+    lastTime: '2022-12-21 12:10:30',
+  },
+])
+// 我的检测饼图数据
+const myTestsPieList: Ref<pieDataI[]> = ref([])
+// 我的测试饼图
+const myTestsPieTitle = ref(0)
+// 饼图--图例配置项
+const picLegend = ref({
+  show: false,
+  orient: 'vertical',
+  right: '20%',
+  top: 'center',
+  icon: 'circle',
+  itemWidth: 12,
+  itemHeight: 12,
+  itemStyle: {
+    fontSize: 18,
+  },
+})
+// 渲染饼图
+setTimeout(() => {
+  myTestsPieList.value = [
+    { name: '176-50%  待检测', value: 1 },
+    { name: '176-25%  检测中', value: 20 },
+    { name: '176-25%  检测完', value: 20 },
+  ]
+  myTestsPieTitle.value = 41
+}, 1)
+// fetchMyTrainLog()
+// 标准装置到期提醒表头
+const standardTableHead = [
+  { text: '设备名称', value: 'equipmentName' },
+  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '上次检定时间', value: 'lastTime', width: '180' },
+]
+// 按钮跳转数据
+const buttomTypes = ref([
+  { id: '1', text: '证书打印', url: '/train/trainLog' },
+  { id: '2', text: '环境记录单', url: '/person/remind' },
+  { id: '3', text: '原始记录', url: '/source/list' },
+  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
+  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
+  { id: '6', text: '分包方档案', url: '/person/list' },
+])
+// 当前进行中样品状态数据
+const statusData = ref([
+  { name: '待收样', number: '256' },
+  { name: '待领样', number: '167' },
+  { name: '检测中', number: '135' },
+  { name: '成编制报告', number: '135' },
+])
+
+function calcBlockSize() {
+  // 计算工作台区域高度 - 顶部-面包屑-边距
+  const bodyHeight = document.body.clientHeight - 60 - 50 - 20
+  blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300
+  blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
+  console.log(blockHeight.value, blockWidth.value - 20)
+}
 </script>
 
 <template>
   <app-container>
-    业务管理-工作台
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="样品监控"
+          path-url="1"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="standingBookTableData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in standingBookTableHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+          <div class="my-tests">
+            <div style="width: 60%;">
+              <el-table
+                :data="myTestsData"
+                :height="blockHeight - 60"
+                style="width: 100%; height: 100%;"
+                stripe
+                header-row-class-name="bench-table-header"
+                row-class-name="bench-table-row"
+                class="bench-table"
+              >
+                <el-table-column
+                  v-for="item in myTestsHead"
+                  :key="item.value"
+                  :prop="item.value"
+                  align="center"
+                  :label="item.text"
+                  :width="item.width"
+                />
+              </el-table>
+            </div>
+            <div style="width: 40%;">
+              <pie-chart
+                :data="myTestsPieList"
+                :radius="['50%', '70%']"
+                :colors="['#3d7eff', '#caddff', '#1d9cce', '#1D9CAF']"
+                right="0%"
+                :legend="picLegend"
+                :width="`${blockWidth - 225}px`"
+                :label-formatter="`${myTestsPieTitle}`"
+              />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 180">
+          <div class="bench-right-top">
+            <div
+              v-for="item of buttomTypes"
+              :key="item.text"
+              class="right-top-box"
+            >
+              {{ item.text }}
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 130" title="当前进行中样品状态" icon="icon-book">
+          <div class="status-box">
+            <div v-for="(item, index) in statusData" :key="index" class="status-box-item">
+              <div>
+                {{ item.number }}
+              </div>
+              <div style="font-size: 12px;">
+                {{ item.name }}
+              </div>
+              <div class="status-box-bgc" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
+    <div style="margin-top: 10px;" />
+    <el-row :gutter="10">
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="证书报告"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="credentialsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in credentialsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col
+          icon="icon-book"
+          title="实时工作统计"
+          path-url="1"
+          :style="{ height: blockHeight }"
+          :height="blockHeight"
+        >
+          <el-table
+            :data="realTimeWorkStatisticsData"
+            :height="blockHeight - 60"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column
+              v-for="item in realTimeWorkStatisticsHead"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            >
+              <template v-if="item.value === 'schedule'" #default="scope">
+                <el-progress :stroke-width="5" :percentage="scope.row.schedule" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </bench-col>
+      </el-col>
+      <el-col :span="8">
+        <bench-col :height="blockHeight - 155" title="当前人员状态" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress" icon="icon-book">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+        <div style="margin-top: 10px;" />
+        <bench-col :height="blockHeight - 155" title="产值分析" icon="icon-book">
+          <div class="personnel-status">
+            <h5 style="width: 20%;">
+              人员A
+            </h5>
+            <div class="personnel-progress">
+              <el-progress :stroke-width="8" :percentage="50" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" :format="format" />
+              <el-progress :stroke-width="8" style="margin-top: 20px;" :percentage="100" status="success" />
+            </div>
+          </div>
+        </bench-col>
+      </el-col>
+    </el-row>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.my-tests {
+  display: flex;
+  justify-content: space-between;
+}
+
+.personnel-status {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 10%;
+
+  .personnel-progress {
+    width: 70%;
+    height: 60%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.status-box {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+
+  .status-box-item {
+    width: 40%;
+    height: 8vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    text-align: center;
+
+    .status-box-bgc {
+      width: 50%;
+      height: 5vh;
+      background: url("../../../assets/images/bench/sampie-status.png") no-repeat center / cover;
+    }
+  }
+}
+
+.bench-right-top {
+  width: 100%;
+  height: 100%;
+  padding: 0 10px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+
+  .right-top-box {
+    width: calc(33% - 10px);
+    height: calc(50% - 10px);
+    padding: 10px;
+    margin: 5px;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    background-color: #3d7eff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:hover {
+      background-color: #286ffd;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.bench-table {
+  .el-table__header-wrapper {
+    border-radius: 8px;
+  }
+}
+
+.bench-table-header {
+  th {
+    font-weight: normal;
+    font-size: 14px;
+  }
+}
+
+.bench-table-row {
+  border-radius: 8px;
+}
 </style>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b1d51bf..5be4fa1 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -7,7 +7,7 @@
   limit: number
 }
 export interface ISupplier {
-  checkDate: null | string
+  checkDate: string
   checkName: string
   checkNo: string
   checkPerson: string
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index d02cee6..0046fa3 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -192,11 +192,6 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <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>
     </div>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 859b9b0..7bfd090 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -160,7 +160,7 @@
 const handleCancel = (row: ISupplier) => {
   const params = {
     taskId: row.taskId!,
-    comments: '',
+    comments: '取消',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -192,7 +192,7 @@
   console.log('cancel!')
 }
 // 装载时间数组
-const checkTimeArr = ref([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
+const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -277,7 +277,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    submitAcceptanceCheck({ id: row.id, formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index de22d15..a8e1295 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -6,7 +6,7 @@
 import checkList from './checkList.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { acceptanceCheckInfo, addAcceptanceCheck, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -56,130 +56,23 @@
   approvalStatusName: '',
   createTime: '',
   createUser: '',
-  equipmentInfoList: [
-    {
-      abc: '',
-      abcName: '',
-      assetNo: '',
-      assetSource: '',
-      assetType: '',
-      assetTypeName: '',
-      attribute: '',
-      capitalSource: '',
-      capitalSourceName: '',
-      cardEstablishmentDate: '',
-      createTime: '',
-      createUser: 0,
-      depreciationMethod: '',
-      depreciationMethodName: '',
-      depreciationPeriod: 0,
-      enableDate: '',
-      equipmentCategory: '',
-      equipmentCategoryName: '',
-      equipmentName: '',
-      equipmentNo: '',
-      equipmentSpecifications: '',
-      equipmentType: '',
-      equipmentTypeName: '',
-      fileList: [
-        {
-          assetId: 0,
-          createTime: '',
-          createUser: 0,
-          fileName: '',
-          id: 0,
-          isDel: 0,
-          minioFileName: '',
-          remark: '',
-          updateTime: '',
-        },
-      ],
-      id: 0,
-      installIncidentalExpenses: '',
-      installPlace: '',
-      intactState: '',
-      isCalibrationTestEquipment: 0,
-      isDel: 0,
-      isFixedAssets: 0,
-      isMeasureAccount: 0,
-      isStandardSupportEquipment: 0,
-      labelBind: '',
-      majorCategory: '',
-      majorCategoryName: '',
-      managerLevel: '',
-      managerLevelName: '',
-      managerState: '',
-      managerStateName: '',
-      manufacturer: '',
-      manufacturerCountry: '',
-      manufacturingDate: '',
-      manufacturingNo: '',
-      mesureCycle: 0,
-      mesureDate: '',
-      mesureDept: 0,
-      mesureRange: '',
-      mesureResult: '',
-      mesureResultName: '',
-      mesureType: '',
-      mesureTypeName: '',
-      modelNo: '',
-      originValue: 0,
-      overallDimension: '',
-      presentOriginValue: 0,
-      purpose: '',
-      remark: '',
-      singlePrice: 0,
-      supportStandardEquipmentName: '',
-      supportStandardEquipmentNo: '',
-      technicalLevel: '',
-      uncertainty: '',
-      updateTime: '',
-      useDept: 0,
-      useDeptName: '',
-      usePerson: 0,
-      usePersonName: '',
-      validDate: '',
-      version: 0,
-      weight: 0,
-    },
-  ],
-  equipmentList: [
-    {
-      applyId: '',
-      assetOriginValue: 0,
-      createTime: '',
-      createUser: '',
-      equipmentId: '',
-      equipmentName: '',
-      equipmentNo: '',
-      financialValue: 0,
-      id: 0,
-      isDel: 0,
-      measureRange: '',
-      overhaulIdea: '',
-      overhaulResult: '',
-      overhaulResultName: '',
-      remark: '',
-      updateTime: '',
-      useDept: '',
-      usePerson: '',
-    },
-  ],
+  equipmentInfoList: [],
+  equipmentList: [],
   fileList: [
     {
-      applyId: 0,
+      applyId: '',
       createTime: '',
-      createUser: 0,
+      createUser: '',
       fileName: '',
-      id: 0,
-      isDel: 0,
+      id: '',
+      isDel: '',
       minioFileName: '',
       remark: '',
       updateTime: '',
     },
   ],
-  id: 0,
-  isDel: 0,
+  id: '',
+  isDel: '',
   overhaulPerson: '',
   processId: '',
   processResult: '',
@@ -189,7 +82,15 @@
   updateTime: '',
   version: '',
 })
-const checkIdObject = ref({
+// 审批弹窗信息收集类型
+interface checkIdObjectType {
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+}
+// 获取到检修申请列表数据
+const checkIdObject = ref<checkIdObjectType>({
   applyName: '',
   applyPersonName: '',
   time: '',
@@ -225,25 +126,25 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'equipmentName',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'equipmentNo',
     align: 'center',
-    required: true,
+    required: false,
   },
   {
     text: '检修结果',
-    value: 'xinghao',
+    value: 'overhaulResult',
     align: 'center',
     required: true,
   },
   {
     text: '检修意见',
-    value: 'xinghao',
+    value: 'overhaulIdea',
     width: '450px',
     align: 'center',
     required: true,
@@ -482,45 +383,34 @@
     clickBtn(item)
   }
 }
-// 点击增加行
-const addRoow = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
+
+// 标准实验室发生改变row类型
+interface objectReturn {
+  id: string
+  applyName: string
+  applyPersonName: string
+  time: string
+  applyNo: string
+  equipmentId: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: objectReturn) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
-}
-// 标准配套设备更换表格删除行
-const removeRow = () => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      list.value = list.value.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      ElMessage.success('删除成功')
+  // 获取到详情
+  equipmentApplyInfo({ id: object.id }).then((res) => {
+    res.data.equipmentInfoList.map((item: objectReturn) => {
+      if (item.id) {
+        item.equipmentId = item.id
+        item.id = ''
+      }
+      // 如果选择的没有id则就让装置数组置空
+      else {
+        return formInline.value.equipmentList = []
+      }
     })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+    formInline.value.equipmentList = res.data.equipmentInfoList
+  })
 }
 // 审批弹窗的关闭
 const applyListClose = () => {
@@ -661,47 +551,37 @@
       </el-form>
     </detail-page>
     <detail-block title="检修设备列表">
-      <!-- <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template> -->
+      <el-table
+        :data="formInline.equipmentList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-select
+              v-if="item.text === '检修结果'"
+              v-model="scope.row[item.value]"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="pageType === 'detail'"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
     </detail-block>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :width="item.width" :prop="item.value">
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-if="item.text !== '检修结果'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
-          <el-select
-            v-else
-            v-model="scope.row[item.value]"
-            clearable
-            placeholder="计划编号"
-            size="default"
-            :disabled="pageType === 'detail'"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-    </el-table>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index e22bc4c..a3129d4 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -544,45 +544,46 @@
           删除行
         </el-button>
       </template>
-    </detail-block>
-    <el-table
-      :data="formInline.equipmentInfoList"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="(item, index) in columns"
-        :key="index"
-        align="center"
-        :label="item.text"
-        :width="item.width"
-        :prop="item.value"
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
       >
-        <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input
-            v-if="item.text !== '有效日期'"
-            v-model="scope.row[item.value]"
-            :placeholder="`${item.text}`"
-            class="input"
-          />
-          <el-date-picker
-            v-else
-            v-model="scope.row[item.value]"
-            type="datetime"
-            placeholder="请选择考核日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="pageType === 'detail'"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-if="item.text !== '有效日期'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            />
+            <el-date-picker
+              v-else
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择考核日期"
+              style="width: 100%;"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="pageType === 'detail'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
     <detail-block v-if="pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
       <div>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 9f8f98b..1efebea 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -33,7 +33,7 @@
   }
 }
 const formInline: Ref<ISupplier> = ref({
-  checkDate: null,
+  checkDate: '',
   checkName: '',
   checkNo: '',
   checkPerson: '',
@@ -290,7 +290,7 @@
                 <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
                   {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
               </el-form-item>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index d4f8601..275ed66 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -139,8 +139,8 @@
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -151,7 +151,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 const fetchData = (isNowPage: boolean) => {
@@ -210,6 +212,7 @@
     params: {
       type: 'detail',
       id: row.id,
+      formId: props.schedule,
     },
   })
 }
@@ -271,6 +274,7 @@
         params: {
           type: 'edit',
           id: row.id,
+          formId: props.schedule,
         },
       })
       break
@@ -399,6 +403,7 @@
       title: '新建',
       name: props.name,
       applyType: props.applyType,
+      formId: props.schedule,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6d85903..e022442 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -3,12 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
-import type { IOptions } from '../standard_interface'
 import UserListDialog from '../../../stateManage/components/addRow.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import { submitApproval } from '@/api/approval'
@@ -24,9 +23,11 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
+  formId.value = $route.params.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
@@ -45,7 +46,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -54,12 +55,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
-  laboratoryOwnerName: null,
-  managerState: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: '',
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -68,17 +69,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -109,7 +110,14 @@
   version: null,
   taskId: '',
 })
-
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -145,19 +153,20 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
-// 获取部门信息
-getUsersDept({
-  createEndTime: '',
-  createstartTime: '',
+const params = ref({
   director: '',
   meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
   organizeName: '',
   organizeNo: '',
   organizeType: '2',
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -324,8 +333,13 @@
 const addList = ref({})
 // 添加表格弹窗开关
 const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
 // 选择标准装置数据列表下拉框
-const standardList = ref([])
+const standardList = ref<standardListType[]>([])
 // 初始化路由
 const $router = useRouter()
 // 关闭
@@ -375,7 +389,7 @@
 }
 fetchData()
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
+const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -443,16 +457,19 @@
 interface rowReturn {
   phone: string
   director: string
+  deptId: string
+  organizeName: string
+  id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取详情信息
 const getInfo = (id: string | number) => {
@@ -469,12 +486,6 @@
   getInfo(infoId.value)
 }
 
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -500,15 +511,8 @@
     })
 }
 // 点击数据后的操作按钮
-const getAddList = (buttonType: string) => {
+const clickBtn = (buttonType: string) => {
   switch (buttonType) {
-    case '提交':
-      getStandardLisAdd(fromListInfo.value).then((res) => {
-        if (res.code === '200') {
-          close()
-        }
-      })
-      break
     case '同意':
       approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
       break
@@ -523,6 +527,72 @@
       break
   }
 }
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          getStandardLisAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          updateStandardEquipmentApply(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
 
 const approvalActivities = [
   {
@@ -615,25 +685,20 @@
 
 <template>
   <app-container>
-    <div class="top-info">
-      <h4 class="title">
-        {{ $route.meta.title }} -- {{ textMap[pageType] }}
-      </h4>
-      <div>
+    <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
+      <template #btns>
         <el-button
           v-for="(item, index) in buttonArray"
           :key="index"
           type="primary"
-          @click="getAddList(item)"
+          @click="getAddList(item, ruleFormRef)"
         >
           {{ item }}
         </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
-      </div>
-    </div>
-    <div class="info-content">
+      </template>
       <el-form
         ref="ruleFormRef"
         :inline="true"
@@ -834,7 +899,7 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model.trim="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratory"
                 clearable
                 placeholder="标准所在实验室"
                 style="width: 100%;"
@@ -877,7 +942,7 @@
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
-                v-model.trim="formInline.managerState"
+                v-model="formInline.managerState"
                 clearable
                 placeholder="管理状态"
                 style="width: 100%;"
@@ -896,7 +961,7 @@
           <el-col :span="6">
             <el-form-item label="计量专业:" prop="measureMajor">
               <el-select
-                v-model.trim="formInline.measureMajor"
+                v-model="formInline.measureMajor"
                 clearable
                 placeholder="计量专业"
                 style="width: 100%;"
@@ -1067,159 +1132,149 @@
           </el-col>
         </el-row>
       </el-form>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            标准配套设备更换
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary">
-              批量选择
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="primary"
-              @click="addRoow"
-            >
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('1')"
-            >
-              删除行
-            </el-button>
-          </span>
-        </div>
-        <el-table
-          :data="fromListInfo.applyEquipmentList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+    </detail-page>
+    <detail-block title="标准配套设备更换">
+      <template v-if="pageType !== 'detail'" #btns>
+        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
+          批量选择
+        </el-button> -->
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="addRoow"
         >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columns"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-input
-                v-model="scope.row[item.value]"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-button
-                    size="small"
-                    :disabled="pageType === 'detail'"
-                    @click="chooseList(scope.row, scope.$index)"
-                  >
-                    选择
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.applyEquipmentList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  size="small"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="申请文档">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('2')"
+        >
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <el-input
+              v-else
+              v-model="scope.row[item.value]"
+              :autofocus="true"
+              style="height: 5vh;"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-upload
+                  v-model:file-list="fileList"
+                  enctype="multipart/form-data"
+                  :http-request="uploadQuarterlyEvaluateFile"
+                  :before-remove="beforeRemove"
+                  :on-exceed="handleExceed"
+                  :on-preview="uploadShow"
+                  :on-change="handleFileChange"
+                  :limit="1"
+                >
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                    上传
                   </el-button>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
-      </detail-block>
-      <detail-block>
-        <div class="header">
-          <div class="title">
-            申请文档
-          </div>
-          <span class="btns">
-            <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button
-              v-if="pageType !== 'detail'"
-              type="info"
-              @click="removeRow('2')"
+                </el-upload>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
             >
-              删除行
-            </el-button>
-          </span>
+              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
-        <el-table
-          :data="fromListInfo.fileList"
-          border
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="38" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column
-            v-for="item in columnsFiles"
-            :key="item.value"
-            :prop="item.value"
-            :label="item.text"
-            align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <el-date-picker
-                v-if="item.time"
-                v-model="scope.row[item.value]"
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-              />
-              <el-input
-                v-else
-                v-model="scope.row[item.value]"
-                :autofocus="true"
-                style="height: 5vh;"
-                :placeholder="`${item.text}`"
-                class="input"
-              >
-                <template v-if="item.choose" #append>
-                  <el-upload
-                    v-model:file-list="fileList"
-                    enctype="multipart/form-data"
-                    :http-request="uploadQuarterlyEvaluateFile"
-                    :before-remove="beforeRemove"
-                    :on-exceed="handleExceed"
-                    :on-preview="uploadShow"
-                    :on-change="handleFileChange"
-                    :limit="1"
-                  >
-                    <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
-                      上传
-                    </el-button>
-                  </el-upload>
-                </template>
-              </el-input>
-            </template>
-          </el-table-column>
-        </el-table>
       </detail-block>
-      <div v-if="pageType === 'detail'">
-        <detail-block title="审批流程">
-          <!-- 审批流程 -->
-          <div>
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in approvalActivities"
-                :key="index"
-                :timestamp="activity.timestamp"
-              >
-                <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </detail-block>
-      </div>
     </div>
   </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/standardList/addRow.vue b/src/views/device/standardEquipment/components/standardList/addRow.vue
deleted file mode 100644
index 9f2bf81..0000000
--- a/src/views/device/standardEquipment/components/standardList/addRow.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!-- 添加记录弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictByCode } from '@/api/system/dict'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = ref({})
-const formTable = ref([
-  {
-    name: '计量人员',
-    form: {
-
-    },
-  },
-  {
-    name: '标准配套设备',
-    form: {
-
-    },
-  },
-  {
-    name: '检定规程',
-    form: {
-
-    },
-  },
-  {
-    name: '重复性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '稳定性考核记录',
-    form: {
-
-    },
-  },
-  {
-    name: '证书管理',
-    form: {
-
-    },
-  },
-])
-const title = ref('')
-const name = ref('')
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-const managerStateList = ref([]) // 管理状态
-// 重置
-const resetData = () => {
-}
-const initDialog = (row: any) => {
-  console.log(row)
-  title.value = row.title
-  name.value = row.name
-  form.value = formTable.value.filter(item => item.name === row.name)[0].form
-  // if (row.title === '编辑') {
-
-  // }
-  dialogFormVisible.value = true
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  console.log(form.value, 'form')
-  const flagArr = []
-  for (const key in form.value) {
-    if (form.value[key]) {
-      flagArr.push(1)
-    }
-    else {
-      flagArr.push(0)
-    }
-  }
-  if (flagArr.every(item => item == 1)) {
-    if (title.value === '编辑') {
-      emits('add', form.value, 'update')
-    }
-    else {
-      emits('add', form.value, '')
-    }
-    dialogFormVisible.value = false
-  }
-  else {
-    ElMessage.warning('请先完整填写信息')
-  }
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <div v-if="name === '计量人员'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '标准配套设备'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
-      </div>
-      <div v-if="name === '检定规程'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '重复性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '稳定性考核记录'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-      <div v-if="name === '证书管理'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 940a7a4..2504fd6 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -23,7 +23,7 @@
 const formInline = ref({
   assessDate: '',
   assessmentUnit: '',
-  category: null,
+  category: '',
   categoryName: '',
   constructionStandardProject: '',
   constructionStandardUnitName: '',
@@ -32,12 +32,12 @@
   createUser: null,
   id: '',
   isDel: null,
-  laboratoryOwner: null,
-  laboratoryOwnerContact: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
   laboratoryOwnerName: null,
-  managerState: null,
+  managerState: '',
   managerStateName: '',
-  measureMajor: null,
+  measureMajor: '',
   fileList: [],
   measureMajorName: '',
   mesureRange: '',
@@ -46,17 +46,17 @@
   projectNo: '',
   remark: '',
   standardHumidity: null,
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardLaboratoryName: '',
-  standardLevel: null,
+  standardLevel: '',
   standardLevelName: '',
   standardName: '',
   standardNo: '',
-  standardOwner: null,
+  standardOwner: '',
   standardOwnerName: '',
   standardTemperature: null,
   totalInvestment: null,
-  transmitRange: null,
+  transmitRange: '',
   transmitRangeName: '',
   uncertainty: '',
   updateTime: null,
@@ -96,8 +96,8 @@
 getSelectList('standardLevel') // 获取标准等级下拉框
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -108,7 +108,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 // 获取到标准负责人数组
@@ -199,14 +201,14 @@
   director: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: object) => {
+const changeDeptList = (row: rowReturn) => {
   formInline.value.laboratoryOwnerContact = row.phone
   formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwner = null
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
 }
 // 获取detail信息
 const getInfo = () => {
diff --git a/src/views/device/standardEquipment/components/standardList/temptable.vue b/src/views/device/standardEquipment/components/standardList/temptable.vue
deleted file mode 100644
index 91c2c15..0000000
--- a/src/views/device/standardEquipment/components/standardList/temptable.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<!-- 表格记录 -->
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
-import userListDialog from './userListDialog.vue'
-interface columnsType {
-  text: string
-  value: string
-  width?: string
-  align?: string
-}
-const props = defineProps({
-  name: {
-    type: String,
-    required: true,
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const list = ref([])
-const total = ref(0)
-const columns = ref<columnsType[]>([])
-const selectionList = ref([])
-const searchQuery = ref({
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref(false)
-// 记录表格数据
-const tableData = ref([
-  {
-    name: '计量人员',
-    list: [],
-    columns: [
-      {
-        text: '姓名',
-        value: 'name',
-        align: 'center',
-        selete: true,
-        type: 'user',
-      },
-      {
-        text: '计量人员编号',
-        value: 'staffNo',
-        align: 'center',
-      },
-      {
-        text: '工作部门',
-        value: 'deptId',
-        align: 'center',
-      },
-      {
-        text: '计量专业',
-        value: 'major',
-        align: 'center',
-      },
-      {
-        text: '证书编号',
-        value: 'verifierCertificateNo',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: 'certificateDate',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '标准配套设备',
-    list: [],
-    columns: [
-      {
-        text: '设备名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '设备编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '型号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '测量范围',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '使用部门',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '检定结果',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '有效日期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '检定规程',
-    list: [],
-    columns: [
-      {
-        text: '文件名称',
-        value: '',
-        align: 'center',
-        selete: true,
-      },
-      {
-        text: '文件编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '文件号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '实施状态',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '重复性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '稳定性考核记录',
-    list: [],
-    columns: [
-      {
-        text: '记录编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '记录名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核时间',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '考核结果',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-  {
-    name: '证书管理',
-    list: [],
-    columns: [
-      {
-        text: '证书编号',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书名称',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书类型',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书出具日期',
-        value: '',
-        align: 'center',
-      },
-      {
-        text: '证书有效期',
-        value: '',
-        align: 'center',
-      },
-    ],
-  },
-])
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.value.offset = val.page
-  }
-}
-watch(() => props, (newVal) => {
-  console.log(newVal, 'newVal')
-  // 挑选需要展示的数据
-  list.value = tableData.value.filter(item => item.name === newVal.name)[0]?.list || []
-  columns.value = tableData.value.filter(item => item.name === newVal.name)[0]?.columns || []
-  // row数据后续详情编辑需要
-}, {
-  deep: true,
-  immediate: true,
-})
-// 保存数据
-watch(() => tableData, (newVal) => {
-  sessionStorage.setItem('tableData', JSON.stringify(newVal))
-},
-{ immediate: true, deep: true })
-const addRowRef = ref()
-const select = ref()
-// 添加行
-const addRowbtn = () => {
-  // addRowRef.value.initDialog({ title: '添加', name: props.name })
-  list.value.push({})
-}
-// 编辑行
-const editRow = () => {
-  if (select.value >= 0) {
-    const row: object = list.value.filter((item, index) => index === select.value)[0]
-    addRowRef.value.initDialog({ ...row, title: '编辑', name: props.name })
-  }
-  else {
-    ElMessage.warning('请先选择需要编辑的数据')
-  }
-}
-const userListRef = ref()
-const listIndex = ref(0)
-// 点击输入框中的选择按钮
-const selectPerson = (index: number, type: string) => {
-  listIndex.value = index
-  if (type === 'user') {
-    userListRef.value.initDialog()
-  }
-}
-// // 行内添加数据
-// const addRowData = (row: any, _: string) => {
-//   if (_ === 'update') {
-//     list.value = list.value.map((item, index) => {
-//       if (index === select.value) {
-//         return {
-//           ...item,
-//           ...row,
-//         }
-//       }
-//       else {
-//         return item
-//       }
-//     })
-//   }
-//   else {
-//     list.value.push(row)
-//   }
-// }
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  selectionList.value = e
-}
-// 删除行
-const removeRow = () => {
-  if (selectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // list.value = list.value.filter((item, index) => !selectionList.value.includes(item))
-      list.value.splice(listIndex.value, 1)
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 选择完人员的回调函数
-const confirmPerson = (e: any) => {
-  console.log(e)
-  list.value[listIndex.value] = e
-}
-</script>
-
-<template>
-  <div>
-    <!-- 添加证书信息组件 -->
-    <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
-        <el-button v-if="buttonType !== 'detail'" type="info" @click="removeRow">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== 'detail'" type="primary" @click="addRowbtn">
-          添加行
-        </el-button>
-        <!-- <el-button v-if="buttonType !== 'detail'" type="primary" @click="editRow">
-          编辑行
-        </el-button> -->
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="38" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column
-        v-for="item in columns"
-        :key="item.value"
-        :prop="item.value"
-        :label="item.text"
-        align="center"
-      >
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template #default="scope">
-          <el-input v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input">
-            <template v-if="item.selete" #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.type)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-  <!-- 选择用户列表组件 -->
-  <user-list-dialog ref="userListRef" @add="confirmPerson" />
-</template>
-
-<style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -4.5vh;
-  }
-}
-
-:deep(.el-radio__label) {
-  display: none;
-}
-// 样式
-</style>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 35f9aab..6b06354 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -120,8 +120,8 @@
 
 // 初始化路由
 const $router = useRouter()
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -132,7 +132,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 02d0fcc..8fa1bc7 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -126,8 +126,8 @@
 getSelectList('standardCategory') // 获取类别下拉框
 getSelectList('standardManagerState') // 获取管理状态下拉框
 
-// 获取部门信息
-getUsersDept({
+// 获取部门信息参数
+const DeptParams = ref({
   createEndTime: '',
   createstartTime: '',
   director: '',
@@ -138,7 +138,9 @@
   pdeptId: null,
   offset: 1,
   limit: 999999,
-}).then((res) => {
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
 
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index d7a0f7f..aa5845f 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -11,14 +11,6 @@
   remark: string
 }
 
-export interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 780cbfa..8a2ffb4 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -11,7 +11,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 20b5041..61f6af0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -31,11 +31,11 @@
 }
 const formInline = ref({
   createTime: null,
-  deptId: null,
+  deptId: '',
   deptName: null,
-  director: null,
+  director: '',
   effectiveCompany: null,
-  id: null,
+  id: '',
   planName: null,
   planNo: null,
   remark: null,
@@ -45,7 +45,7 @@
   trainNumber: null,
   trainPerson: null,
   trainStaffList: [],
-  trainTime: null,
+  trainTime: '',
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -140,8 +140,17 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
+// 负责人类型
+interface confirmPersonType {
+  name: string
+}
+// 负责人类型
+interface trainStaffListType {
+  updateTime: string
+  createTime: string
+}
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: confirmPersonType) => {
   console.log(object)
   formInline.value.director = object.name
 }
@@ -178,7 +187,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item) => {
+          formInline.value.trainStaffList.map((item: trainStaffListType) => {
             delete item.updateTime
             delete item.createTime
           })
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index fb2fa17..11d1a7c 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -75,6 +75,7 @@
 export interface IOptions {
   id: string
   name: string
+  planName: string
 }
 
 export interface IlistTypes {
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index df09a66..f4fc979 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -7,7 +7,7 @@
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuerys> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   ids: [],
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 433ad5d..91e9bf4 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -39,6 +39,7 @@
   problems: '',
   planId: '',
   remark: '',
+  id: '',
   trainAddress: '',
   trainContent: '',
   trainEffect: '',
@@ -154,8 +155,12 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-const addPersonListChange = (e: any) => {
-  addPersonList.value = ListDetail.value.filter(item => item.staffId === e)[0]
+// 点击删除和编辑的参数类型
+interface itemReturn {
+  staffId: string
+}
+const addPersonListChange = (e: string) => {
+  addPersonList.value = ListDetail.value.filter((item: itemReturn) => item.staffId === e)[0]
 }
 if (infoId.value && infoId.value !== '') {
   getListLogDetail({ id: infoId.value }).then((res) => {
@@ -163,8 +168,12 @@
     trainList.value = formInline.value.trainStaffList
   })
 }
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  isNameShow: boolean
+}
 // 双击表格中默认显示的name
-const dblclickName = (row: object) => {
+const dblclickName = (row: rowReturn) => {
   row.isNameShow = true
 }
 const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {