diff --git a/src/views/tested/device/certificate/components/detailDialog.vue b/src/views/tested/device/certificate/components/detailDialog.vue
new file mode 100644
index 0000000..a522631
--- /dev/null
+++ b/src/views/tested/device/certificate/components/detailDialog.vue
@@ -0,0 +1,47 @@
+<!-- 证书预览 -->
+<script lang="ts" setup name="certificateReportRetrieval">
+import { ElMessage } from 'element-plus'
+import VuePdfEmbed from 'vue-pdf-embed'
+import { getPdfStream } from '@/api/system/tool'
+import { getBase64 } from '@/utils/download'
+// 初始化
+const pdfUrl = ref()
+const dialogVisible = ref(false)
+const loading = ref(true)
+const initDialog = (fileName: string) => {
+  dialogVisible.value = true
+  loading.value = true
+  getPdfStream(fileName).then((res) => {
+    if (!res.data.size) {
+      ElMessage.warning('获取文件失败')
+    }
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+    ElMessage.warning('获取文件失败')
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="证书预览" width="80%" append-to-body>
+    <div v-loading="loading" style="margin: 0 auto;">
+      <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="() => dialogVisible = false">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>

diff --git a/src/views/tested/device/certificate/components/detailDialog.vue b/src/views/tested/device/certificate/components/detailDialog.vue
new file mode 100644
index 0000000..a522631
--- /dev/null
+++ b/src/views/tested/device/certificate/components/detailDialog.vue
@@ -0,0 +1,47 @@
+<!-- 证书预览 -->
+<script lang="ts" setup name="certificateReportRetrieval">
+import { ElMessage } from 'element-plus'
+import VuePdfEmbed from 'vue-pdf-embed'
+import { getPdfStream } from '@/api/system/tool'
+import { getBase64 } from '@/utils/download'
+// 初始化
+const pdfUrl = ref()
+const dialogVisible = ref(false)
+const loading = ref(true)
+const initDialog = (fileName: string) => {
+  dialogVisible.value = true
+  loading.value = true
+  getPdfStream(fileName).then((res) => {
+    if (!res.data.size) {
+      ElMessage.warning('获取文件失败')
+    }
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+    ElMessage.warning('获取文件失败')
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="证书预览" width="80%" append-to-body>
+    <div v-loading="loading" style="margin: 0 auto;">
+      <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="() => dialogVisible = false">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 1a8f0cc..1e53ddd 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="CertificateList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import detailDialog from './components/detailDialog.vue'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
@@ -112,11 +113,16 @@
 }
 const $router = useRouter()
 // 新建编辑操作
+const detailRef = ref()
 const handler = (row: any, type: string) => {
-// row.minioFileName
-  getPhotoUrl(row.minioFileName).then((res) => {
-    window.open(res.data, '_blank')
-  })
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
@@ -241,6 +247,7 @@
 <template>
   <app-container>
     <!-- 筛选条件 -->
+    <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>

diff --git a/src/views/tested/device/certificate/components/detailDialog.vue b/src/views/tested/device/certificate/components/detailDialog.vue
new file mode 100644
index 0000000..a522631
--- /dev/null
+++ b/src/views/tested/device/certificate/components/detailDialog.vue
@@ -0,0 +1,47 @@
+<!-- 证书预览 -->
+<script lang="ts" setup name="certificateReportRetrieval">
+import { ElMessage } from 'element-plus'
+import VuePdfEmbed from 'vue-pdf-embed'
+import { getPdfStream } from '@/api/system/tool'
+import { getBase64 } from '@/utils/download'
+// 初始化
+const pdfUrl = ref()
+const dialogVisible = ref(false)
+const loading = ref(true)
+const initDialog = (fileName: string) => {
+  dialogVisible.value = true
+  loading.value = true
+  getPdfStream(fileName).then((res) => {
+    if (!res.data.size) {
+      ElMessage.warning('获取文件失败')
+    }
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+    ElMessage.warning('获取文件失败')
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="证书预览" width="80%" append-to-body>
+    <div v-loading="loading" style="margin: 0 auto;">
+      <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="() => dialogVisible = false">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 1a8f0cc..1e53ddd 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="CertificateList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import detailDialog from './components/detailDialog.vue'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
@@ -112,11 +113,16 @@
 }
 const $router = useRouter()
 // 新建编辑操作
+const detailRef = ref()
 const handler = (row: any, type: string) => {
-// row.minioFileName
-  getPhotoUrl(row.minioFileName).then((res) => {
-    window.open(res.data, '_blank')
-  })
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
@@ -241,6 +247,7 @@
 <template>
   <app-container>
     <!-- 筛选条件 -->
+    <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 3f8a81b..c767d2d 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -193,7 +193,7 @@
             v-if="scope.row.editable && item.isDate && !item.isUpload" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload && !item.isDate" style="display: flex;">
+          <span v-if="item.isUpload && !item.isDate">
             <show-photo :minio-file-name="scope.row[item.value]" />
             <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload(scope.$index)">
               {{ scope.row[item.value] ? '更换' : '上传' }}

diff --git a/src/views/tested/device/certificate/components/detailDialog.vue b/src/views/tested/device/certificate/components/detailDialog.vue
new file mode 100644
index 0000000..a522631
--- /dev/null
+++ b/src/views/tested/device/certificate/components/detailDialog.vue
@@ -0,0 +1,47 @@
+<!-- 证书预览 -->
+<script lang="ts" setup name="certificateReportRetrieval">
+import { ElMessage } from 'element-plus'
+import VuePdfEmbed from 'vue-pdf-embed'
+import { getPdfStream } from '@/api/system/tool'
+import { getBase64 } from '@/utils/download'
+// 初始化
+const pdfUrl = ref()
+const dialogVisible = ref(false)
+const loading = ref(true)
+const initDialog = (fileName: string) => {
+  dialogVisible.value = true
+  loading.value = true
+  getPdfStream(fileName).then((res) => {
+    if (!res.data.size) {
+      ElMessage.warning('获取文件失败')
+    }
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+    ElMessage.warning('获取文件失败')
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="证书预览" width="80%" append-to-body>
+    <div v-loading="loading" style="margin: 0 auto;">
+      <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="() => dialogVisible = false">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 1a8f0cc..1e53ddd 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="CertificateList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import detailDialog from './components/detailDialog.vue'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
@@ -112,11 +113,16 @@
 }
 const $router = useRouter()
 // 新建编辑操作
+const detailRef = ref()
 const handler = (row: any, type: string) => {
-// row.minioFileName
-  getPhotoUrl(row.minioFileName).then((res) => {
-    window.open(res.data, '_blank')
-  })
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
@@ -241,6 +247,7 @@
 <template>
   <app-container>
     <!-- 筛选条件 -->
+    <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 3f8a81b..c767d2d 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -193,7 +193,7 @@
             v-if="scope.row.editable && item.isDate && !item.isUpload" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload && !item.isDate" style="display: flex;">
+          <span v-if="item.isUpload && !item.isDate">
             <show-photo :minio-file-name="scope.row[item.value]" />
             <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload(scope.$index)">
               {{ scope.row[item.value] ? '更换' : '上传' }}
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b3003ea..d6770bf 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -1,7 +1,7 @@
 <!-- 设备基本信息 -->
 <script lang="ts" setup name="DeviceIndoEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, formItemValidateStates } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './table.vue'
 import technology from './technology.vue'
@@ -124,21 +124,21 @@
   testTask.value.push('')
 }
 // 自动填充 证书有效日期
-watch(() => ruleForm.value, (newVal) => {
-  if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
-    // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
-    const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
-    const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
-    ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
-    // 判断日期是否大于当前
-    if (new Date(ruleForm.value.certificateValid).getTime() - new Date().getTime() < 0) {
-      // 使用状态自动变为禁用
-      ruleForm.value.usageStatus = '1'
-    }
-  }
-}, {
-  deep: true,
-})
+// watch(() => ruleForm.value, (newVal) => {
+//   if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
+//     // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
+//     const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
+//     const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
+//     ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
+//     // 判断日期是否大于当前
+//     if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) {
+//       // 使用状态自动变为禁用
+//       ruleForm.value.usageStatus = '1'
+//     }
+//   }
+// }, {
+//   deep: true,
+// })
 const radio = ref('基本信息')
 // 生产日期和购进日期的验证
 const validateProductDate = (rule: any, value: any, callback: any) => {
@@ -234,8 +234,30 @@
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
-  const res1 = await getDictByCode('eqptDeviceUseStatus')
-  useStatusList.value = res1.data
+
+  // 设备名称
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  if ($route.path.includes('update')) {
+    isFrist.value = true
+    const equipmentName = ruleForm.value.equipmentName
+    const model = ruleForm.value.model
+    ruleForm.value.equipmentName = ''
+    ruleForm.value.model = ''
+    setTimeout(() => {
+      ruleForm.value.equipmentName = equipmentName
+      ruleForm.value.model = model
+    })
+    setTimeout(() => {
+      isFrist.value = false
+    }, 500)
+  }
+}
+const fetchDict = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
   getDictByCode('eqptDeviceLevel').then((res) => {
     levelList.value = res.data
   })
@@ -251,11 +273,6 @@
   getDictByCode('eqptDeviceQuality').then((res) => {
     deviceQualityList.value = res.data
   })
-  // 设备名称
-  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
-    deviceNameList.value = res.data
-    // console.log(res.data, '设备名称')
-  })
   // 使用岗位
   getPostList({ }).then((res) => {
     usePositionList.value = res.data
@@ -267,9 +284,11 @@
     installLocationList.value = res.data
   })
 }
+fetchDict()
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  console.log()
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
     ruleForm.value.model = ''
   }
@@ -287,7 +306,7 @@
 })
 // 监听规格型号下拉框，修改辅助字段
 watch(() => ruleForm.value.model, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
   }
   setTimeout(() => {
@@ -370,10 +389,9 @@
 })
 // 监听使用部门部门变化修改 使用岗位
 watch(() => ruleForm.value.deptId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
+  if (!$route.path.includes('detail') && !isFrist.value) {
+    ruleForm.value.usePositionId = ''
   }
-  ruleForm.value.usePositionId = ''
   if (newVal) {
     getPostList({ searchId: newVal }).then((res) => {
       usePositionList.value = res.data
@@ -412,6 +430,7 @@
 getuser()
 // 弹窗初始化
 const directorId = ref()
+const loading = ref(true)
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
@@ -474,6 +493,7 @@
   }
   if ($route.params.type === 'create') {
     isFrist.value = false
+    loading.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.approvalType = '1'
     ruleForm.value.approvalTypeName = '新建设备'
@@ -507,6 +527,7 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
     else {
@@ -515,12 +536,13 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
   }
 }
 onMounted(async () => {
-  await fetchSelectData()
+  fetchSelectData()
   initDialog()
 })
 // 关闭弹窗
@@ -802,7 +824,8 @@
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
       <el-form
-        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        ref="ruleFormRef"
+        v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <detail-block-com v-show="!$route.path.includes('detail')">

diff --git a/src/views/tested/device/certificate/components/detailDialog.vue b/src/views/tested/device/certificate/components/detailDialog.vue
new file mode 100644
index 0000000..a522631
--- /dev/null
+++ b/src/views/tested/device/certificate/components/detailDialog.vue
@@ -0,0 +1,47 @@
+<!-- 证书预览 -->
+<script lang="ts" setup name="certificateReportRetrieval">
+import { ElMessage } from 'element-plus'
+import VuePdfEmbed from 'vue-pdf-embed'
+import { getPdfStream } from '@/api/system/tool'
+import { getBase64 } from '@/utils/download'
+// 初始化
+const pdfUrl = ref()
+const dialogVisible = ref(false)
+const loading = ref(true)
+const initDialog = (fileName: string) => {
+  dialogVisible.value = true
+  loading.value = true
+  getPdfStream(fileName).then((res) => {
+    if (!res.data.size) {
+      ElMessage.warning('获取文件失败')
+    }
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+    ElMessage.warning('获取文件失败')
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="证书预览" width="80%" append-to-body>
+    <div v-loading="loading" style="margin: 0 auto;">
+      <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="() => dialogVisible = false">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 1a8f0cc..1e53ddd 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="CertificateList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import detailDialog from './components/detailDialog.vue'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
@@ -112,11 +113,16 @@
 }
 const $router = useRouter()
 // 新建编辑操作
+const detailRef = ref()
 const handler = (row: any, type: string) => {
-// row.minioFileName
-  getPhotoUrl(row.minioFileName).then((res) => {
-    window.open(res.data, '_blank')
-  })
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
@@ -241,6 +247,7 @@
 <template>
   <app-container>
     <!-- 筛选条件 -->
+    <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 3f8a81b..c767d2d 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -193,7 +193,7 @@
             v-if="scope.row.editable && item.isDate && !item.isUpload" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload && !item.isDate" style="display: flex;">
+          <span v-if="item.isUpload && !item.isDate">
             <show-photo :minio-file-name="scope.row[item.value]" />
             <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload(scope.$index)">
               {{ scope.row[item.value] ? '更换' : '上传' }}
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b3003ea..d6770bf 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -1,7 +1,7 @@
 <!-- 设备基本信息 -->
 <script lang="ts" setup name="DeviceIndoEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, formItemValidateStates } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './table.vue'
 import technology from './technology.vue'
@@ -124,21 +124,21 @@
   testTask.value.push('')
 }
 // 自动填充 证书有效日期
-watch(() => ruleForm.value, (newVal) => {
-  if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
-    // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
-    const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
-    const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
-    ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
-    // 判断日期是否大于当前
-    if (new Date(ruleForm.value.certificateValid).getTime() - new Date().getTime() < 0) {
-      // 使用状态自动变为禁用
-      ruleForm.value.usageStatus = '1'
-    }
-  }
-}, {
-  deep: true,
-})
+// watch(() => ruleForm.value, (newVal) => {
+//   if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
+//     // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
+//     const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
+//     const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
+//     ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
+//     // 判断日期是否大于当前
+//     if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) {
+//       // 使用状态自动变为禁用
+//       ruleForm.value.usageStatus = '1'
+//     }
+//   }
+// }, {
+//   deep: true,
+// })
 const radio = ref('基本信息')
 // 生产日期和购进日期的验证
 const validateProductDate = (rule: any, value: any, callback: any) => {
@@ -234,8 +234,30 @@
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
-  const res1 = await getDictByCode('eqptDeviceUseStatus')
-  useStatusList.value = res1.data
+
+  // 设备名称
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  if ($route.path.includes('update')) {
+    isFrist.value = true
+    const equipmentName = ruleForm.value.equipmentName
+    const model = ruleForm.value.model
+    ruleForm.value.equipmentName = ''
+    ruleForm.value.model = ''
+    setTimeout(() => {
+      ruleForm.value.equipmentName = equipmentName
+      ruleForm.value.model = model
+    })
+    setTimeout(() => {
+      isFrist.value = false
+    }, 500)
+  }
+}
+const fetchDict = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
   getDictByCode('eqptDeviceLevel').then((res) => {
     levelList.value = res.data
   })
@@ -251,11 +273,6 @@
   getDictByCode('eqptDeviceQuality').then((res) => {
     deviceQualityList.value = res.data
   })
-  // 设备名称
-  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
-    deviceNameList.value = res.data
-    // console.log(res.data, '设备名称')
-  })
   // 使用岗位
   getPostList({ }).then((res) => {
     usePositionList.value = res.data
@@ -267,9 +284,11 @@
     installLocationList.value = res.data
   })
 }
+fetchDict()
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  console.log()
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
     ruleForm.value.model = ''
   }
@@ -287,7 +306,7 @@
 })
 // 监听规格型号下拉框，修改辅助字段
 watch(() => ruleForm.value.model, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
   }
   setTimeout(() => {
@@ -370,10 +389,9 @@
 })
 // 监听使用部门部门变化修改 使用岗位
 watch(() => ruleForm.value.deptId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
+  if (!$route.path.includes('detail') && !isFrist.value) {
+    ruleForm.value.usePositionId = ''
   }
-  ruleForm.value.usePositionId = ''
   if (newVal) {
     getPostList({ searchId: newVal }).then((res) => {
       usePositionList.value = res.data
@@ -412,6 +430,7 @@
 getuser()
 // 弹窗初始化
 const directorId = ref()
+const loading = ref(true)
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
@@ -474,6 +493,7 @@
   }
   if ($route.params.type === 'create') {
     isFrist.value = false
+    loading.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.approvalType = '1'
     ruleForm.value.approvalTypeName = '新建设备'
@@ -507,6 +527,7 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
     else {
@@ -515,12 +536,13 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
   }
 }
 onMounted(async () => {
-  await fetchSelectData()
+  fetchSelectData()
   initDialog()
 })
 // 关闭弹窗
@@ -802,7 +824,8 @@
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
       <el-form
-        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        ref="ruleFormRef"
+        v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <detail-block-com v-show="!$route.path.includes('detail')">
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
index 085f804..58ffee1 100644
--- a/src/views/tested/device/info/components/reportTable.vue
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -2,6 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import showPhoto from './showPhotoSinge.vue'
 import { useCheckList } from '@/utils/useCheckList'
+import detailDialog from '@/views/tested/device/certificate/components/detailDialog.vue'
 const $props = defineProps({
   data: {
     type: Array,
@@ -104,10 +105,22 @@
 defineExpose({
   list,
 })
+const detailRef = ref()
+const handler = (row: any) => {
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
+}
 </script>
 
 <template>
   <detail-block-switch title="证书报告">
+    <detail-dialog ref="detailRef" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary">
         扫描增加
@@ -142,8 +155,10 @@
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload" style="display: flex;">
-            <show-photo :minio-file-name="scope.row[item.value]" />
+          <span v-if="item.isUpload">
+            <el-button link type="primary" size="small" @click="handler(scope.row)">
+              查看
+            </el-button>
           </span>
         </template>
       </el-table-column>

diff --git a/src/views/tested/device/certificate/components/detailDialog.vue b/src/views/tested/device/certificate/components/detailDialog.vue
new file mode 100644
index 0000000..a522631
--- /dev/null
+++ b/src/views/tested/device/certificate/components/detailDialog.vue
@@ -0,0 +1,47 @@
+<!-- 证书预览 -->
+<script lang="ts" setup name="certificateReportRetrieval">
+import { ElMessage } from 'element-plus'
+import VuePdfEmbed from 'vue-pdf-embed'
+import { getPdfStream } from '@/api/system/tool'
+import { getBase64 } from '@/utils/download'
+// 初始化
+const pdfUrl = ref()
+const dialogVisible = ref(false)
+const loading = ref(true)
+const initDialog = (fileName: string) => {
+  dialogVisible.value = true
+  loading.value = true
+  getPdfStream(fileName).then((res) => {
+    if (!res.data.size) {
+      ElMessage.warning('获取文件失败')
+    }
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+    ElMessage.warning('获取文件失败')
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="证书预览" width="80%" append-to-body>
+    <div v-loading="loading" style="margin: 0 auto;">
+      <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="() => dialogVisible = false">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 1a8f0cc..1e53ddd 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="CertificateList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import detailDialog from './components/detailDialog.vue'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
@@ -112,11 +113,16 @@
 }
 const $router = useRouter()
 // 新建编辑操作
+const detailRef = ref()
 const handler = (row: any, type: string) => {
-// row.minioFileName
-  getPhotoUrl(row.minioFileName).then((res) => {
-    window.open(res.data, '_blank')
-  })
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
@@ -241,6 +247,7 @@
 <template>
   <app-container>
     <!-- 筛选条件 -->
+    <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 3f8a81b..c767d2d 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -193,7 +193,7 @@
             v-if="scope.row.editable && item.isDate && !item.isUpload" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload && !item.isDate" style="display: flex;">
+          <span v-if="item.isUpload && !item.isDate">
             <show-photo :minio-file-name="scope.row[item.value]" />
             <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload(scope.$index)">
               {{ scope.row[item.value] ? '更换' : '上传' }}
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b3003ea..d6770bf 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -1,7 +1,7 @@
 <!-- 设备基本信息 -->
 <script lang="ts" setup name="DeviceIndoEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, formItemValidateStates } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './table.vue'
 import technology from './technology.vue'
@@ -124,21 +124,21 @@
   testTask.value.push('')
 }
 // 自动填充 证书有效日期
-watch(() => ruleForm.value, (newVal) => {
-  if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
-    // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
-    const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
-    const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
-    ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
-    // 判断日期是否大于当前
-    if (new Date(ruleForm.value.certificateValid).getTime() - new Date().getTime() < 0) {
-      // 使用状态自动变为禁用
-      ruleForm.value.usageStatus = '1'
-    }
-  }
-}, {
-  deep: true,
-})
+// watch(() => ruleForm.value, (newVal) => {
+//   if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
+//     // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
+//     const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
+//     const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
+//     ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
+//     // 判断日期是否大于当前
+//     if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) {
+//       // 使用状态自动变为禁用
+//       ruleForm.value.usageStatus = '1'
+//     }
+//   }
+// }, {
+//   deep: true,
+// })
 const radio = ref('基本信息')
 // 生产日期和购进日期的验证
 const validateProductDate = (rule: any, value: any, callback: any) => {
@@ -234,8 +234,30 @@
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
-  const res1 = await getDictByCode('eqptDeviceUseStatus')
-  useStatusList.value = res1.data
+
+  // 设备名称
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  if ($route.path.includes('update')) {
+    isFrist.value = true
+    const equipmentName = ruleForm.value.equipmentName
+    const model = ruleForm.value.model
+    ruleForm.value.equipmentName = ''
+    ruleForm.value.model = ''
+    setTimeout(() => {
+      ruleForm.value.equipmentName = equipmentName
+      ruleForm.value.model = model
+    })
+    setTimeout(() => {
+      isFrist.value = false
+    }, 500)
+  }
+}
+const fetchDict = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
   getDictByCode('eqptDeviceLevel').then((res) => {
     levelList.value = res.data
   })
@@ -251,11 +273,6 @@
   getDictByCode('eqptDeviceQuality').then((res) => {
     deviceQualityList.value = res.data
   })
-  // 设备名称
-  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
-    deviceNameList.value = res.data
-    // console.log(res.data, '设备名称')
-  })
   // 使用岗位
   getPostList({ }).then((res) => {
     usePositionList.value = res.data
@@ -267,9 +284,11 @@
     installLocationList.value = res.data
   })
 }
+fetchDict()
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  console.log()
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
     ruleForm.value.model = ''
   }
@@ -287,7 +306,7 @@
 })
 // 监听规格型号下拉框，修改辅助字段
 watch(() => ruleForm.value.model, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
   }
   setTimeout(() => {
@@ -370,10 +389,9 @@
 })
 // 监听使用部门部门变化修改 使用岗位
 watch(() => ruleForm.value.deptId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
+  if (!$route.path.includes('detail') && !isFrist.value) {
+    ruleForm.value.usePositionId = ''
   }
-  ruleForm.value.usePositionId = ''
   if (newVal) {
     getPostList({ searchId: newVal }).then((res) => {
       usePositionList.value = res.data
@@ -412,6 +430,7 @@
 getuser()
 // 弹窗初始化
 const directorId = ref()
+const loading = ref(true)
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
@@ -474,6 +493,7 @@
   }
   if ($route.params.type === 'create') {
     isFrist.value = false
+    loading.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.approvalType = '1'
     ruleForm.value.approvalTypeName = '新建设备'
@@ -507,6 +527,7 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
     else {
@@ -515,12 +536,13 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
   }
 }
 onMounted(async () => {
-  await fetchSelectData()
+  fetchSelectData()
   initDialog()
 })
 // 关闭弹窗
@@ -802,7 +824,8 @@
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
       <el-form
-        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        ref="ruleFormRef"
+        v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <detail-block-com v-show="!$route.path.includes('detail')">
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
index 085f804..58ffee1 100644
--- a/src/views/tested/device/info/components/reportTable.vue
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -2,6 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import showPhoto from './showPhotoSinge.vue'
 import { useCheckList } from '@/utils/useCheckList'
+import detailDialog from '@/views/tested/device/certificate/components/detailDialog.vue'
 const $props = defineProps({
   data: {
     type: Array,
@@ -104,10 +105,22 @@
 defineExpose({
   list,
 })
+const detailRef = ref()
+const handler = (row: any) => {
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
+}
 </script>
 
 <template>
   <detail-block-switch title="证书报告">
+    <detail-dialog ref="detailRef" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary">
         扫描增加
@@ -142,8 +155,10 @@
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload" style="display: flex;">
-            <show-photo :minio-file-name="scope.row[item.value]" />
+          <span v-if="item.isUpload">
+            <el-button link type="primary" size="small" @click="handler(scope.row)">
+              查看
+            </el-button>
           </span>
         </template>
       </el-table-column>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index f5cf7d4..81d70b9 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -114,6 +114,12 @@
     align: 'center',
     width: '90',
   },
+  {
+    text: '检定状态',
+    value: 'checkStatusName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)

diff --git a/src/views/tested/device/certificate/components/detailDialog.vue b/src/views/tested/device/certificate/components/detailDialog.vue
new file mode 100644
index 0000000..a522631
--- /dev/null
+++ b/src/views/tested/device/certificate/components/detailDialog.vue
@@ -0,0 +1,47 @@
+<!-- 证书预览 -->
+<script lang="ts" setup name="certificateReportRetrieval">
+import { ElMessage } from 'element-plus'
+import VuePdfEmbed from 'vue-pdf-embed'
+import { getPdfStream } from '@/api/system/tool'
+import { getBase64 } from '@/utils/download'
+// 初始化
+const pdfUrl = ref()
+const dialogVisible = ref(false)
+const loading = ref(true)
+const initDialog = (fileName: string) => {
+  dialogVisible.value = true
+  loading.value = true
+  getPdfStream(fileName).then((res) => {
+    if (!res.data.size) {
+      ElMessage.warning('获取文件失败')
+    }
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
+    })
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+    ElMessage.warning('获取文件失败')
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="证书预览" width="80%" append-to-body>
+    <div v-loading="loading" style="margin: 0 auto;">
+      <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="() => dialogVisible = false">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 1a8f0cc..1e53ddd 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="CertificateList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import detailDialog from './components/detailDialog.vue'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
@@ -112,11 +113,16 @@
 }
 const $router = useRouter()
 // 新建编辑操作
+const detailRef = ref()
 const handler = (row: any, type: string) => {
-// row.minioFileName
-  getPhotoUrl(row.minioFileName).then((res) => {
-    window.open(res.data, '_blank')
-  })
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
@@ -241,6 +247,7 @@
 <template>
   <app-container>
     <!-- 筛选条件 -->
+    <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-select v-model.trim="listQuery.equipmentName" filterable placeholder="设备名称" clearable>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 3f8a81b..c767d2d 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -193,7 +193,7 @@
             v-if="scope.row.editable && item.isDate && !item.isUpload" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload && !item.isDate" style="display: flex;">
+          <span v-if="item.isUpload && !item.isDate">
             <show-photo :minio-file-name="scope.row[item.value]" />
             <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload(scope.$index)">
               {{ scope.row[item.value] ? '更换' : '上传' }}
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index b3003ea..d6770bf 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -1,7 +1,7 @@
 <!-- 设备基本信息 -->
 <script lang="ts" setup name="DeviceIndoEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, formItemValidateStates } from 'element-plus'
 import dayjs from 'dayjs'
 import tableList from './table.vue'
 import technology from './technology.vue'
@@ -124,21 +124,21 @@
   testTask.value.push('')
 }
 // 自动填充 证书有效日期
-watch(() => ruleForm.value, (newVal) => {
-  if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
-    // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
-    const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
-    const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
-    ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
-    // 判断日期是否大于当前
-    if (new Date(ruleForm.value.certificateValid).getTime() - new Date().getTime() < 0) {
-      // 使用状态自动变为禁用
-      ruleForm.value.usageStatus = '1'
-    }
-  }
-}, {
-  deep: true,
-})
+// watch(() => ruleForm.value, (newVal) => {
+//   if (newVal.checkDate && newVal.checkCycle && !newVal.certificateValid) {
+//     // ruleForm.value.certificateValid = dayjs(newVal.checkDate).add(Number(newVal.checkCycle) * 30, 'day').format('YYYY-MM-DD')
+//     const date = dayjs(newVal.checkDate).add(Number(newVal.checkCycle), 'month').format('YYYY-MM')
+//     const day = Number(newVal.checkDate.split('-')[2]) === 1 ? '1' : Number(newVal.checkDate.split('-')[2]) - 1
+//     ruleForm.value.certificateValid = dayjs(`${date}-${day}`).format('YYYY-MM-DD')
+//     // 判断日期是否大于当前
+//     if (new Date(ruleForm.value.certificateValid).getTime() - new Date(dayjs().format('YYYY-MM-DD')).getTime() < 0) {
+//       // 使用状态自动变为禁用
+//       ruleForm.value.usageStatus = '1'
+//     }
+//   }
+// }, {
+//   deep: true,
+// })
 const radio = ref('基本信息')
 // 生产日期和购进日期的验证
 const validateProductDate = (rule: any, value: any, callback: any) => {
@@ -234,8 +234,30 @@
   allList.value = res.data
   modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction))).sort()
-  const res1 = await getDictByCode('eqptDeviceUseStatus')
-  useStatusList.value = res1.data
+
+  // 设备名称
+  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
+    deviceNameList.value = res.data
+  })
+  if ($route.path.includes('update')) {
+    isFrist.value = true
+    const equipmentName = ruleForm.value.equipmentName
+    const model = ruleForm.value.model
+    ruleForm.value.equipmentName = ''
+    ruleForm.value.model = ''
+    setTimeout(() => {
+      ruleForm.value.equipmentName = equipmentName
+      ruleForm.value.model = model
+    })
+    setTimeout(() => {
+      isFrist.value = false
+    }, 500)
+  }
+}
+const fetchDict = () => {
+  getDictByCode('eqptDeviceUseStatus').then((res) => {
+    useStatusList.value = res.data
+  })
   getDictByCode('eqptDeviceLevel').then((res) => {
     levelList.value = res.data
   })
@@ -251,11 +273,6 @@
   getDictByCode('eqptDeviceQuality').then((res) => {
     deviceQualityList.value = res.data
   })
-  // 设备名称
-  getDeviceNameList({ equipmentType: $route.query.equipmentType }).then((res) => {
-    deviceNameList.value = res.data
-    // console.log(res.data, '设备名称')
-  })
   // 使用岗位
   getPostList({ }).then((res) => {
     usePositionList.value = res.data
@@ -267,9 +284,11 @@
     installLocationList.value = res.data
   })
 }
+fetchDict()
 // 监听设备名称下拉框，修改规格型号和辅助字段
 watch(() => ruleForm.value.equipmentName, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  console.log()
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
     ruleForm.value.model = ''
   }
@@ -287,7 +306,7 @@
 })
 // 监听规格型号下拉框，修改辅助字段
 watch(() => ruleForm.value.model, (newVal) => {
-  if (!($route.path.includes('detail') || isFrist.value)) {
+  if (!($route.path.includes('detail') || isFrist.value) && newVal) {
     ruleForm.value.helpInstruction = ''
   }
   setTimeout(() => {
@@ -370,10 +389,9 @@
 })
 // 监听使用部门部门变化修改 使用岗位
 watch(() => ruleForm.value.deptId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
+  if (!$route.path.includes('detail') && !isFrist.value) {
+    ruleForm.value.usePositionId = ''
   }
-  ruleForm.value.usePositionId = ''
   if (newVal) {
     getPostList({ searchId: newVal }).then((res) => {
       usePositionList.value = res.data
@@ -412,6 +430,7 @@
 getuser()
 // 弹窗初始化
 const directorId = ref()
+const loading = ref(true)
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
@@ -474,6 +493,7 @@
   }
   if ($route.params.type === 'create') {
     isFrist.value = false
+    loading.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.approvalType = '1'
     ruleForm.value.approvalTypeName = '新建设备'
@@ -507,6 +527,7 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
     else {
@@ -515,12 +536,13 @@
         directorId.value = ruleForm.value.directorId
         openSubmission()
         fetchDept()
+        loading.value = false
       })
     }
   }
 }
 onMounted(async () => {
-  await fetchSelectData()
+  fetchSelectData()
   initDialog()
 })
 // 关闭弹窗
@@ -802,7 +824,8 @@
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
       <el-form
-        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        ref="ruleFormRef"
+        v-loading="loading" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <detail-block-com v-show="!$route.path.includes('detail')">
diff --git a/src/views/tested/device/info/components/reportTable.vue b/src/views/tested/device/info/components/reportTable.vue
index 085f804..58ffee1 100644
--- a/src/views/tested/device/info/components/reportTable.vue
+++ b/src/views/tested/device/info/components/reportTable.vue
@@ -2,6 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import showPhoto from './showPhotoSinge.vue'
 import { useCheckList } from '@/utils/useCheckList'
+import detailDialog from '@/views/tested/device/certificate/components/detailDialog.vue'
 const $props = defineProps({
   data: {
     type: Array,
@@ -104,10 +105,22 @@
 defineExpose({
   list,
 })
+const detailRef = ref()
+const handler = (row: any) => {
+  if (!row.minioFileName) {
+    ElMessage.warning('暂无文件')
+    return
+  }
+  detailRef.value.initDialog(row.minioFileName)
+  // getPhotoUrl(row.minioFileName).then((res) => {
+  //   window.open(res.data, '_blank')
+  // })
+}
 </script>
 
 <template>
   <detail-block-switch title="证书报告">
+    <detail-dialog ref="detailRef" />
     <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary">
         扫描增加
@@ -142,8 +155,10 @@
             v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
           />
-          <span v-if="item.isUpload" style="display: flex;">
-            <show-photo :minio-file-name="scope.row[item.value]" />
+          <span v-if="item.isUpload">
+            <el-button link type="primary" size="small" @click="handler(scope.row)">
+              查看
+            </el-button>
           </span>
         </template>
       </el-table-column>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index f5cf7d4..81d70b9 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -114,6 +114,12 @@
     align: 'center',
     width: '90',
   },
+  {
+    text: '检定状态',
+    value: 'checkStatusName',
+    align: 'center',
+    width: '90',
+  },
 ])
 const list = ref([])
 const total = ref(0)
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 5336612..2c3dfae 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -211,6 +211,10 @@
 // 新建编辑操作
 const handler = (row: any, type: string) => {
   if (type === 'detail') {
+    if (!row.certificateReport) {
+      ElMessage.warning('暂无文件')
+      return
+    }
     getPhotoUrl(row.certificateReport).then((res) => {
       window.open(res.data, '_blank')
     })
@@ -342,7 +346,7 @@
       loading.close()
       ElMessage.error('上传失败')
     }
-    const path = uploadFlag.value === 'batch' ? '/subcontract/certificate/import' : uploadFlag.value === 'excel' ? '/subcontract/certificate/importInfo' : '/subcontract/certificate/import'
+    const path = uploadFlag.value === 'batch' ? '/subcontract/certificate/import' : uploadFlag.value === 'excel' ? '/subcontract/certificate/importInfo' : '/subcontract/certificate/importFiles'
     axios({
       url: `${window.localStorage.getItem('baseURL-eqpt')!}${path}`,
       method: 'post',