diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..d0b7fcc 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,8 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
@@ -23,14 +23,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +172,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -255,6 +255,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,7 +268,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..d0b7fcc 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,8 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
@@ -23,14 +23,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +172,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -255,6 +255,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,7 +268,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..4889b45 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" />
 </template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..d0b7fcc 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,8 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
@@ -23,14 +23,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +172,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -255,6 +255,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,7 +268,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..4889b45 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" />
 </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 97799fa..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -195,8 +195,8 @@
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -223,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..d0b7fcc 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,8 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
@@ -23,14 +23,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +172,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -255,6 +255,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,7 +268,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..4889b45 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" />
 </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 97799fa..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -195,8 +195,8 @@
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -223,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 15db91c..c0d0b58 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -195,7 +195,7 @@
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..d0b7fcc 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,8 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
@@ -23,14 +23,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +172,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -255,6 +255,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,7 +268,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..4889b45 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" />
 </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 97799fa..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -195,8 +195,8 @@
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -223,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 15db91c..c0d0b58 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -195,7 +195,7 @@
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index b7f85c3..7c8c7ea 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -196,7 +196,7 @@
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..d0b7fcc 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,8 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
@@ -23,14 +23,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +172,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -255,6 +255,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,7 +268,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..4889b45 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" />
 </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 97799fa..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -195,8 +195,8 @@
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -223,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 15db91c..c0d0b58 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -195,7 +195,7 @@
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index b7f85c3..7c8c7ea 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -196,7 +196,7 @@
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/tool/showPhoto.vue b/src/views/system/tool/showPhoto.vue
index b559c41..fb142e5 100644
--- a/src/views/system/tool/showPhoto.vue
+++ b/src/views/system/tool/showPhoto.vue
@@ -9,6 +9,14 @@
   //   type: String,
   //   required: true,
   // },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -33,7 +41,7 @@
   <div class="container">
     <el-image
       v-if="props.minioFileName && isPhoto"
-      style="width: 100px; height: 100px;margin-right: 10px;"
+      :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
       fit="cover"

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 5f96d6f..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,6 +50,14 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
 // 证书记录列表
 export function getCertificateList(data: StaffListType) {
   return request({
@@ -75,3 +83,43 @@
     data,
   })
 }
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 6ae72bd..2b67e84 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -89,10 +89,12 @@
       ruleForm.effectiveStatus = session.effectiveStatus
       ruleForm.publishTime = session.publishTime
       ruleForm.createUserId = session.createUserId
-      fileList.value.push({
-        name: ruleForm.minioFileName,
-        url: '',
-      })
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
     }
   }
   else if (row.title === '详情') {
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e0c946b..cab8511 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -321,6 +321,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -341,7 +342,7 @@
                 <el-button size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aaa15eb..d71b3ee 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -227,6 +227,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,7 +240,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 172f006..b5c2975 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -3,11 +3,17 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { CertificateListList, getCertificateList, getStaffDelete } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+})
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -24,13 +30,13 @@
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '120' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
-  { text: '发证日期', value: 'certificateDate', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -127,7 +133,7 @@
     },
   )
     .then(() => {
-      getStaffDelete({ id: row.id as string }).then((res) => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -138,6 +144,28 @@
       })
     })
 }
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
 // 搜索
 const search = () => {
   getList()
@@ -189,7 +217,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    getCertificateUpload(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -259,13 +287,13 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="!props.isRemind" type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -279,6 +307,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -291,14 +320,20 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="130">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-else size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
                 <el-button size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
+                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 10e7a79..7f8e5b1 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,6 +14,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
@@ -177,7 +178,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +223,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -348,6 +375,7 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
@@ -467,12 +495,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index c7b936f..2928870 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -1,6 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
@@ -11,7 +12,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
-import { addCertificateList, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const meterStaff = ref({
@@ -25,12 +26,12 @@
   deptId: '', // 工作部门
   major: '', // 专业
   workDate: '', // 从事日期
+  id: '',
 })
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const paramsList = ref([])
 const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
 // 身份证号码验证规则
@@ -44,7 +45,8 @@
   }
 }
 const rules = ref({
-  // staffNo: [{ required: true, message: '人员编号', trigger: 'blur' }],
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
 
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -54,10 +56,6 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
-const selectWhether = ref([
-  { name: '是', value: '0' },
-  { name: '否', value: '1' },
-])
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -85,8 +83,17 @@
 }
 // 重置表单内容
 const resetFormData = () => {
-  ruleForm.value = {
-  }
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -163,11 +170,38 @@
 const certificateRef = ref() // 添加证书信息弹窗
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push({ ...row, meterStaff: meterStaff.value, staffId: ruleForm.value.staffId })
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
 }
 const currenSelect = ref<number>(-1) // 当前选中行
 // 删除行
@@ -206,22 +240,37 @@
           type: 'warning',
         },
       ).then(() => {
-        addCertificateList(changeList.value[0].data).then((res) => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
           formEl?.resetFields()
           ElMessage.success('提交成功')
           emits('resetData')
           resetFormData()
         })
-        // (title.value === '新建'
-        //   ? addCertificateList
-        //   : getStaffupdate) (changeList.value[0].data).then((res) => {
-        //   if (res.code == 200) {
-        //     formEl?.resetFields()
-        //     ElMessage.success('提交成功')
-        //     emits('resetData')
-        //     resetFormData()
-        //   }
-        // })
       })
     }
   })
@@ -236,6 +285,7 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
+  resetFormData()
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
@@ -249,10 +299,10 @@
     console.log()
   }
   else {
-    getStaffDetail({ ...row }).then((res) => {
+    getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
-        ruleForm.value = res.data
-        changeList.value[0].data = res.data.certificateList
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
       }
     })
   }
@@ -265,7 +315,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          证书记录-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -276,7 +326,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -289,7 +339,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="身份证号" prop="meterStaff.idCard">
+            <el-form-item label="身份证号" prop="idCard">
               <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
@@ -327,7 +377,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
               <com-tree-select
+                v-else
                 v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
@@ -353,12 +405,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..d0b7fcc 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,8 +3,8 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
@@ -23,14 +23,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +172,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -255,6 +255,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,7 +268,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..4889b45 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" />
 </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 97799fa..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -195,8 +195,8 @@
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -223,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 15db91c..c0d0b58 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -195,7 +195,7 @@
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index b7f85c3..7c8c7ea 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -196,7 +196,7 @@
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/tool/showPhoto.vue b/src/views/system/tool/showPhoto.vue
index b559c41..fb142e5 100644
--- a/src/views/system/tool/showPhoto.vue
+++ b/src/views/system/tool/showPhoto.vue
@@ -9,6 +9,14 @@
   //   type: String,
   //   required: true,
   // },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -33,7 +41,7 @@
   <div class="container">
     <el-image
       v-if="props.minioFileName && isPhoto"
-      style="width: 100px; height: 100px;margin-right: 10px;"
+      :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
       fit="cover"
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 8820f1e..00046f8 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -194,8 +194,8 @@
       </el-form-item> -->
       <el-form-item label="签章图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>