diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6b522a8..ce18fc2 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -119,13 +119,13 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '4']
+        data.usageStatusList = ['0', '3']
         break
       case '4':
-        data.usageStatusList = ['0', '1', '3', '4']
+        data.usageStatusList = ['0', '4']
         break
       case '5':
-        data.usageStatusList = ['0', '1']
+        data.usageStatusList = ['0', '1', '3', '4']
         break
     }
   }

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6b522a8..ce18fc2 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -119,13 +119,13 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '4']
+        data.usageStatusList = ['0', '3']
         break
       case '4':
-        data.usageStatusList = ['0', '1', '3', '4']
+        data.usageStatusList = ['0', '4']
         break
       case '5':
-        data.usageStatusList = ['0', '1']
+        data.usageStatusList = ['0', '1', '3', '4']
         break
     }
   }
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index de13b38..4d6bb4e 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -11,7 +11,7 @@
 const $router = useRouter()
 const $route = useRoute()
 const statusName = $route.query.statusName as string
-
+const approvalId = ref('')
 // 获取审批记录
 // const approvalList = ref()
 // const fetchData = (id: string) => {
@@ -27,9 +27,9 @@
 // 获取设备流转日志
 const logRecord = ref()
 const fetchDevicelogs = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  console.log(data, 'data')
-  getTurnoverLogRecord(data.equipmentId).then((res) => {
+  getTurnoverLogRecord(approvalId.value).then((res) => {
     logRecord.value = res.data
     console.log(logRecord.value, '设备流转日志')
   })
@@ -37,15 +37,16 @@
 // 获取设备状态变更日志
 const statusList = ref()
 const fetchStatusList = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  getStatusLogRecord(data.equipmentId).then((res) => {
+  getStatusLogRecord(approvalId.value).then((res) => {
     statusList.value = res.data
     console.log(statusList.value, '状态变更记录')
   })
 }
 // 获取证书报告列表
 const baseRef = ref()
-const approvalId = ref('')
+
 const certificateList = ref()
 watch(() => baseRef?.value?.ruleForm, (newVal) => {
   if (newVal.certificateList.length) {
@@ -55,15 +56,17 @@
     certificateList.value = []
   }
   // equipmentId
-  if (newVal.equipmentId) {
+  if (newVal.equipmentId || newVal.id) {
     // fetchData(newVal.equipmentId)
-    approvalId.value = newVal.equipmentId
+    approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
+    fetchStatusList()
+    fetchDevicelogs()
   }
 }, {
   deep: true,
 })
-fetchStatusList()
-fetchDevicelogs()
+// fetchStatusList()
+// fetchDevicelogs()
 // fetchData()
 const radioMenus = ref([
   {

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6b522a8..ce18fc2 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -119,13 +119,13 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '4']
+        data.usageStatusList = ['0', '3']
         break
       case '4':
-        data.usageStatusList = ['0', '1', '3', '4']
+        data.usageStatusList = ['0', '4']
         break
       case '5':
-        data.usageStatusList = ['0', '1']
+        data.usageStatusList = ['0', '1', '3', '4']
         break
     }
   }
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index de13b38..4d6bb4e 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -11,7 +11,7 @@
 const $router = useRouter()
 const $route = useRoute()
 const statusName = $route.query.statusName as string
-
+const approvalId = ref('')
 // 获取审批记录
 // const approvalList = ref()
 // const fetchData = (id: string) => {
@@ -27,9 +27,9 @@
 // 获取设备流转日志
 const logRecord = ref()
 const fetchDevicelogs = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  console.log(data, 'data')
-  getTurnoverLogRecord(data.equipmentId).then((res) => {
+  getTurnoverLogRecord(approvalId.value).then((res) => {
     logRecord.value = res.data
     console.log(logRecord.value, '设备流转日志')
   })
@@ -37,15 +37,16 @@
 // 获取设备状态变更日志
 const statusList = ref()
 const fetchStatusList = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  getStatusLogRecord(data.equipmentId).then((res) => {
+  getStatusLogRecord(approvalId.value).then((res) => {
     statusList.value = res.data
     console.log(statusList.value, '状态变更记录')
   })
 }
 // 获取证书报告列表
 const baseRef = ref()
-const approvalId = ref('')
+
 const certificateList = ref()
 watch(() => baseRef?.value?.ruleForm, (newVal) => {
   if (newVal.certificateList.length) {
@@ -55,15 +56,17 @@
     certificateList.value = []
   }
   // equipmentId
-  if (newVal.equipmentId) {
+  if (newVal.equipmentId || newVal.id) {
     // fetchData(newVal.equipmentId)
-    approvalId.value = newVal.equipmentId
+    approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
+    fetchStatusList()
+    fetchDevicelogs()
   }
 }, {
   deep: true,
 })
-fetchStatusList()
-fetchDevicelogs()
+// fetchStatusList()
+// fetchDevicelogs()
 // fetchData()
 const radioMenus = ref([
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 89d3820..9c00785 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -305,7 +305,7 @@
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        console.log(res.data, 'res.data')
+        console.log(res.data, 'res.data1111')
         // if (ruleForm.value.testTask) {
         //   if (ruleForm.value.testTask.includes(',')) {
         //     testTask.value = ruleForm.value.testTask.split(',')

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6b522a8..ce18fc2 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -119,13 +119,13 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '4']
+        data.usageStatusList = ['0', '3']
         break
       case '4':
-        data.usageStatusList = ['0', '1', '3', '4']
+        data.usageStatusList = ['0', '4']
         break
       case '5':
-        data.usageStatusList = ['0', '1']
+        data.usageStatusList = ['0', '1', '3', '4']
         break
     }
   }
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index de13b38..4d6bb4e 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -11,7 +11,7 @@
 const $router = useRouter()
 const $route = useRoute()
 const statusName = $route.query.statusName as string
-
+const approvalId = ref('')
 // 获取审批记录
 // const approvalList = ref()
 // const fetchData = (id: string) => {
@@ -27,9 +27,9 @@
 // 获取设备流转日志
 const logRecord = ref()
 const fetchDevicelogs = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  console.log(data, 'data')
-  getTurnoverLogRecord(data.equipmentId).then((res) => {
+  getTurnoverLogRecord(approvalId.value).then((res) => {
     logRecord.value = res.data
     console.log(logRecord.value, '设备流转日志')
   })
@@ -37,15 +37,16 @@
 // 获取设备状态变更日志
 const statusList = ref()
 const fetchStatusList = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  getStatusLogRecord(data.equipmentId).then((res) => {
+  getStatusLogRecord(approvalId.value).then((res) => {
     statusList.value = res.data
     console.log(statusList.value, '状态变更记录')
   })
 }
 // 获取证书报告列表
 const baseRef = ref()
-const approvalId = ref('')
+
 const certificateList = ref()
 watch(() => baseRef?.value?.ruleForm, (newVal) => {
   if (newVal.certificateList.length) {
@@ -55,15 +56,17 @@
     certificateList.value = []
   }
   // equipmentId
-  if (newVal.equipmentId) {
+  if (newVal.equipmentId || newVal.id) {
     // fetchData(newVal.equipmentId)
-    approvalId.value = newVal.equipmentId
+    approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
+    fetchStatusList()
+    fetchDevicelogs()
   }
 }, {
   deep: true,
 })
-fetchStatusList()
-fetchDevicelogs()
+// fetchStatusList()
+// fetchDevicelogs()
 // fetchData()
 const radioMenus = ref([
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 89d3820..9c00785 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -305,7 +305,7 @@
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        console.log(res.data, 'res.data')
+        console.log(res.data, 'res.data1111')
         // if (ruleForm.value.testTask) {
         //   if (ruleForm.value.testTask.includes(',')) {
         //     testTask.value = ruleForm.value.testTask.split(',')
diff --git a/src/views/tested/device/info/components/showPhotoSinge.vue b/src/views/tested/device/info/components/showPhotoSinge.vue
index 0b7ffe0..3e1a832 100644
--- a/src/views/tested/device/info/components/showPhotoSinge.vue
+++ b/src/views/tested/device/info/components/showPhotoSinge.vue
@@ -14,6 +14,7 @@
     type: String,
     default: '100px',
   },
+
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6b522a8..ce18fc2 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -119,13 +119,13 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '4']
+        data.usageStatusList = ['0', '3']
         break
       case '4':
-        data.usageStatusList = ['0', '1', '3', '4']
+        data.usageStatusList = ['0', '4']
         break
       case '5':
-        data.usageStatusList = ['0', '1']
+        data.usageStatusList = ['0', '1', '3', '4']
         break
     }
   }
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index de13b38..4d6bb4e 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -11,7 +11,7 @@
 const $router = useRouter()
 const $route = useRoute()
 const statusName = $route.query.statusName as string
-
+const approvalId = ref('')
 // 获取审批记录
 // const approvalList = ref()
 // const fetchData = (id: string) => {
@@ -27,9 +27,9 @@
 // 获取设备流转日志
 const logRecord = ref()
 const fetchDevicelogs = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  console.log(data, 'data')
-  getTurnoverLogRecord(data.equipmentId).then((res) => {
+  getTurnoverLogRecord(approvalId.value).then((res) => {
     logRecord.value = res.data
     console.log(logRecord.value, '设备流转日志')
   })
@@ -37,15 +37,16 @@
 // 获取设备状态变更日志
 const statusList = ref()
 const fetchStatusList = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  getStatusLogRecord(data.equipmentId).then((res) => {
+  getStatusLogRecord(approvalId.value).then((res) => {
     statusList.value = res.data
     console.log(statusList.value, '状态变更记录')
   })
 }
 // 获取证书报告列表
 const baseRef = ref()
-const approvalId = ref('')
+
 const certificateList = ref()
 watch(() => baseRef?.value?.ruleForm, (newVal) => {
   if (newVal.certificateList.length) {
@@ -55,15 +56,17 @@
     certificateList.value = []
   }
   // equipmentId
-  if (newVal.equipmentId) {
+  if (newVal.equipmentId || newVal.id) {
     // fetchData(newVal.equipmentId)
-    approvalId.value = newVal.equipmentId
+    approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
+    fetchStatusList()
+    fetchDevicelogs()
   }
 }, {
   deep: true,
 })
-fetchStatusList()
-fetchDevicelogs()
+// fetchStatusList()
+// fetchDevicelogs()
 // fetchData()
 const radioMenus = ref([
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 89d3820..9c00785 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -305,7 +305,7 @@
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        console.log(res.data, 'res.data')
+        console.log(res.data, 'res.data1111')
         // if (ruleForm.value.testTask) {
         //   if (ruleForm.value.testTask.includes(',')) {
         //     testTask.value = ruleForm.value.testTask.split(',')
diff --git a/src/views/tested/device/info/components/showPhotoSinge.vue b/src/views/tested/device/info/components/showPhotoSinge.vue
index 0b7ffe0..3e1a832 100644
--- a/src/views/tested/device/info/components/showPhotoSinge.vue
+++ b/src/views/tested/device/info/components/showPhotoSinge.vue
@@ -14,6 +14,7 @@
     type: String,
     default: '100px',
   },
+
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
diff --git a/src/views/tested/status/delay/components/ApprovalDialog.vue b/src/views/tested/status/delay/components/ApprovalDialog.vue
index 7b6af97..4efa61b 100644
--- a/src/views/tested/status/delay/components/ApprovalDialog.vue
+++ b/src/views/tested/status/delay/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6b522a8..ce18fc2 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -119,13 +119,13 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '4']
+        data.usageStatusList = ['0', '3']
         break
       case '4':
-        data.usageStatusList = ['0', '1', '3', '4']
+        data.usageStatusList = ['0', '4']
         break
       case '5':
-        data.usageStatusList = ['0', '1']
+        data.usageStatusList = ['0', '1', '3', '4']
         break
     }
   }
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index de13b38..4d6bb4e 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -11,7 +11,7 @@
 const $router = useRouter()
 const $route = useRoute()
 const statusName = $route.query.statusName as string
-
+const approvalId = ref('')
 // 获取审批记录
 // const approvalList = ref()
 // const fetchData = (id: string) => {
@@ -27,9 +27,9 @@
 // 获取设备流转日志
 const logRecord = ref()
 const fetchDevicelogs = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  console.log(data, 'data')
-  getTurnoverLogRecord(data.equipmentId).then((res) => {
+  getTurnoverLogRecord(approvalId.value).then((res) => {
     logRecord.value = res.data
     console.log(logRecord.value, '设备流转日志')
   })
@@ -37,15 +37,16 @@
 // 获取设备状态变更日志
 const statusList = ref()
 const fetchStatusList = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  getStatusLogRecord(data.equipmentId).then((res) => {
+  getStatusLogRecord(approvalId.value).then((res) => {
     statusList.value = res.data
     console.log(statusList.value, '状态变更记录')
   })
 }
 // 获取证书报告列表
 const baseRef = ref()
-const approvalId = ref('')
+
 const certificateList = ref()
 watch(() => baseRef?.value?.ruleForm, (newVal) => {
   if (newVal.certificateList.length) {
@@ -55,15 +56,17 @@
     certificateList.value = []
   }
   // equipmentId
-  if (newVal.equipmentId) {
+  if (newVal.equipmentId || newVal.id) {
     // fetchData(newVal.equipmentId)
-    approvalId.value = newVal.equipmentId
+    approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
+    fetchStatusList()
+    fetchDevicelogs()
   }
 }, {
   deep: true,
 })
-fetchStatusList()
-fetchDevicelogs()
+// fetchStatusList()
+// fetchDevicelogs()
 // fetchData()
 const radioMenus = ref([
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 89d3820..9c00785 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -305,7 +305,7 @@
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        console.log(res.data, 'res.data')
+        console.log(res.data, 'res.data1111')
         // if (ruleForm.value.testTask) {
         //   if (ruleForm.value.testTask.includes(',')) {
         //     testTask.value = ruleForm.value.testTask.split(',')
diff --git a/src/views/tested/device/info/components/showPhotoSinge.vue b/src/views/tested/device/info/components/showPhotoSinge.vue
index 0b7ffe0..3e1a832 100644
--- a/src/views/tested/device/info/components/showPhotoSinge.vue
+++ b/src/views/tested/device/info/components/showPhotoSinge.vue
@@ -14,6 +14,7 @@
     type: String,
     default: '100px',
   },
+
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
diff --git a/src/views/tested/status/delay/components/ApprovalDialog.vue b/src/views/tested/status/delay/components/ApprovalDialog.vue
index 7b6af97..4efa61b 100644
--- a/src/views/tested/status/delay/components/ApprovalDialog.vue
+++ b/src/views/tested/status/delay/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue
index 13a2122..e9f74ad 100644
--- a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue
+++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"

diff --git a/src/api/request.ts b/src/api/request.ts
index fedfcda..c8b25e9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -30,7 +30,6 @@
 
 request.interceptors.request.use(
   (request) => {
-    console.log(request, 'request')
     const userStore = useUserStore()
     /**
      * 全局拦截请求发送前提交的参数
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 2bb0eef..484f431 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index 1e1a0fc..f47f144 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -64,7 +64,7 @@
       if (valid) {
         if (dialogStatus.value === '新建') {
           addRemind(data.value).then((res) => {
-            ElMessage.success('修改成功')
+            ElMessage.success('添加成功')
             dialogVisible.value = false
             emits('closeRefresh')
           })
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 2900af9..42113b4 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -110,6 +110,10 @@
       if (!checkFile(type)) {
         return
       }
+      if (ruleForm.value.minioFileName.length > 30) {
+        ElMessage.warning('文件名长度超出最大限制')
+        return
+      }
       if (title.value === '新增') {
         addeFileListPage(ruleForm.value).then((res) => {
           ElMessage({
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..27cb401 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -116,41 +116,42 @@
 const selectList = ref<any[]>([])
 // 表格多选
 const multiSelect = (e: any) => {
+  console.log(e, 'eeee')
   selectList.value = e.map((item: { id: string }) => item.id)
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要导出的数据')
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (list.value.length > 0) {
-    const param = {
-      fileName: searchQuery.fileName, // 文件名称
-      moduleName: searchQuery.moduleName, // 模块名
-      downloadNo: searchQuery.downloadNo,
-      limit: 20,
-      offset: 1,
-      ids: selectList.value,
-    }
-    exportFileListPage(param).then((res) => {
-      exportFile(res.data, '文件配置管理')
+  const param = {
+    fileName: searchQuery.fileName, // 文件名称
+    moduleName: searchQuery.moduleName, // 模块名
+    downloadNo: searchQuery.downloadNo,
+    limit: 20,
+    offset: 1,
+    ids: selectList.value,
+  }
+  exportFileListPage(param).then((res) => {
+    exportFile(res.data, '文件配置管理')
+    loading.close()
+    // searchQuery.ids = []
+  })
+    .catch((_) => {
       loading.close()
-      searchQuery.ids = []
     })
-      .catch((_) => {
-        loading.close()
-      })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
 }
 // 打印
 function printList() {
-  const selectIds = selectList.value.map((item: any) => item.id)
+  if (!selectList.value.length) {
+    ElMessage.warning('请选择需要打印的数据')
+  }
+  const selectIds = selectList.value
   // 打印列
   const properties = columns.value.map((item) => {
     return {
@@ -158,16 +159,8 @@
       displayName: item.text,
     }
   })
-  if (selectIds.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '文件配置管理')
-  }
-  else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: any) => selectIds.includes(item.id))
-    printJSON(printList, properties, '文件配置管理')
-  }
-  else {
-    ElMessage('无可打印内容')
-  }
+  const printList = list.value.filter((item: any) => selectIds.includes(item.id))
+  printJSON(printList, properties, '文件配置管理')
 }
 </script>
 
@@ -197,7 +190,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index c4984bf..95d6051 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -149,24 +149,22 @@
 }
 // 导出
 const exportExcelBtn = () => {
+  if (!selectList.value.length) {
+    ElMessage.warning('请先选择需要导出的数据')
+    return
+  }
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      exportExcel({
-        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
-        name: '通知公告',
-        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
-        sheetName: 'sheet1',
-      })
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
+  exportExcel({
+    json: selectList.value.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+    name: '通知公告',
+    titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 // 打印
 function printList() {
diff --git a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
index 6c8132f..4dc8725 100644
--- a/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/ApprovalDialog.vue
@@ -99,7 +99,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -122,7 +122,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
index 7dfad76..f8dce5d 100644
--- a/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/early/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
index 71d2291..13762a7 100644
--- a/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index 318c290..6fc4d0f 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -42,6 +42,7 @@
   planDeliverTime: '',
   receiveIllustrate: '',
   receiveStatus: '',
+  receiveStatusName: '',
   requireOverTime: '',
   undertakeTime: '',
   undertakerId: '',
@@ -179,7 +180,7 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
+    <detail-block-com class="container">
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -209,18 +210,16 @@
               <el-input v-model.trim="ruleForm.customerName" placeholder="委托方" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="委托方地址" prop="customerAddress">
               <el-input v-model.trim="ruleForm.customerAddress" placeholder="委托方地址" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="电话" prop="customerPhone">
               <el-input v-model.trim="ruleForm.customerPhone" placeholder="委托方电话" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="预计送达时间" prop="planDeliverTime">
               <!-- <el-input v-model.trim="ruleForm.planDeliverTime" /> -->
@@ -239,6 +238,8 @@
               <!-- <el-input v-model.trim="ruleForm.requireOverTime" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="是否加急" prop="isUrgent">
               <!-- <el-input v-model.trim="ruleForm.isUrgent" placeholder="是否加急" /> -->
@@ -248,31 +249,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检修专业" prop="maintainMajor">
-              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
             <el-form-item label="检定(校准)单位" prop="measureCompany">
               <el-input v-model.trim="ruleForm.measureCompany" placeholder="检定(校准)单位" disabled />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="检修专业" prop="maintainMajor">
+              <el-input v-model.trim="ruleForm.maintainMajor" placeholder="检修专业" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row v-if="$route.path.includes('detail')" :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="承接人" prop="undertakerName">
-              <el-input v-model.trim="ruleForm.undertakerName" />
+            <el-form-item label="接收状态">
+              <el-input v-model.trim="ruleForm.receiveStatusName" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="承接时间" prop="undertakeTime">
-              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
-              <el-date-picker
-                v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              />
+          <el-col :span="12">
+            <el-form-item label="接收说明">
+              <el-input v-model.trim="ruleForm.receiveIllustrate" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item label="交接单" prop="undertakeTime">
+              <a />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </detail-block-com>
@@ -283,5 +285,20 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        content: "";
+        display: none;
+      }
+    }
+  }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
+}
 </style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index e7690a9..7a7f676 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -4,8 +4,11 @@
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
+import showPhotos from '@/views/tested/device/info/components/showPhoto.vue'
 import { uploadApi } from '@/api/system/notice'
 import { useCheckList } from '@/utils/useCheckList'
+import { getInfoDetail } from '@/api/eqpt/device/info'
+
 const $props = defineProps({
   data: {
     type: Array,
@@ -14,7 +17,7 @@
 })
 const $route = useRoute()
 // 表头显示标题
-const columns = ref([
+const columnsHandler = ref([
   {
     text: '统一编号',
     value: 'sampleNo',
@@ -39,7 +42,7 @@
   {
     text: '附件',
     value: 'appendixDescn',
-    required: true,
+    required: false,
     isBtn: false,
     isUpload: true,
     width: '350px',
@@ -66,10 +69,62 @@
     isUpload: false,
   },
 ])
+const columnsDetail = ref([
+  {
+    text: '统一编号',
+    value: 'sampleNo',
+    required: true,
+    isBtn: true,
+    isUpload: false,
+  },
+  {
+    text: '设备名称',
+    value: 'sampleName',
+    required: true,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '型号',
+    value: 'sampleModel',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '附件',
+    value: 'appendixDescn',
+    required: false,
+    isBtn: false,
+    isUpload: true,
+    width: '350px',
+  },
+  {
+    text: '接收状态',
+    value: 'sampleStatusName',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定结果',
+    value: 'measureCompletePercent',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
+    text: '检定完成时间',
+    value: 'measureCompleteTime',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+])
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value, '任务单列表')
+  return useCheckList(list.value, columnsHandler.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -210,6 +265,21 @@
   currentIndex.value = index
   fileRef.value.click()
 }
+const $router = useRouter()
+const deviceDetail = (row: any) => {
+  console.log(row, 'row')
+  // 获取设备详情
+  // getInfoDetail({ equipmentId: row.sampleId }).then((res) => {
+  $router.push({
+    path: '/info/detail',
+    query: {
+      row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }),
+      id: row.sampleId,
+      statusName: '全部',
+    },
+  })
+  // })
+}
 </script>
 
 <template>
@@ -243,14 +313,18 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in ($route.path.includes('detail') ? columnsDetail : columnsHandler)" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
           <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-button v-if="!scope.row.editable && !item.isUpload && item.text === '设备名称' && $route.path.includes('detail')" link type="primary" @click="deviceDetail(scope.row)">
+            {{ scope.row[item.value] }}
+          </el-button>
+          <span v-if="!scope.row.editable && !item.isUpload && (item.text !== '设备名称' || !$route.path.includes('detail'))">{{ scope.row[item.value] }}</span>
+          <show-photos v-if="!scope.row.editable && item.isUpload" :minio-file-name="scope.row[item.value] " />
           <el-input
             v-if="scope.row.editable && !item.isBtn && !item.isUpload" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index cb47761..9598215 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -316,7 +316,6 @@
           // inside: true, // 刻度标签是否朝内，默认朝外
           // margin: 6, // 刻度标签与轴线之间的距离
           formatter: (value: string) => {
-            console.log(value, 'value')
             if (String(value).length > 6) {
               return `${String(value).substring(0, 5)}...`
             }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index 8713f07..e168b04 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -297,6 +297,11 @@
         coordinateSystem: 'polar',
         label: {
           show: true,
+          textStyle: {
+            color: props.fontColor,
+            fontWeight: 'normal',
+            fontSize: 16,
+          },
           position: 'middle',
           formatter: '{b}: {c}',
         },
@@ -394,7 +399,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
index a237371..fb18edf 100644
--- a/src/views/tested/dashboard/components/editSchedule.vue
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -39,7 +39,6 @@
 const clickConfirm = async (formEl: FormInstance | undefined) => {
   // 去掉空的日程
   const resultArr = list.value.filter(item => item.scheduleMatters)
-  console.log(resultArr)
   if (!resultArr.length) {
     ElMessage.warning('要求至少有一个日程')
     return false
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 27bf8d9..aa72de1 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -24,7 +24,6 @@
       limit: 5,
       readStatus: '0',
     }).then((res) => {
-      console.log(res.data, '审批提醒')
       notice.value = res.data.rows
     })
   }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9bfdfca..22e7f77 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -80,7 +80,6 @@
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day, 'day')
   selectDateRecord.value = day
   selectedDate.value = day.slice(0, 7)
   fetchCalendarList() // 获取日历列表
@@ -153,7 +152,12 @@
 }
 
 // -----------------------------------------设备详情-------------------------------------
-
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 const Devicedept = ref()// 所属部门
 const Devicelegend = ref({ // 饼图legend
   show: true,
@@ -180,6 +184,7 @@
   getDeviceType({ deptIds: id }).then((res) => {
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
+    resizePage()
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
@@ -189,6 +194,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
@@ -198,6 +204,7 @@
         value: item.count,
       }
     })
+    resizePage()
   })
 }
 fecthDeviceDetail(user.deptId)
@@ -230,6 +237,7 @@
 const showDevice = ref(0)
 const changeShow = (index: number) => {
   showDevice.value = index
+  resizePage()
 }
 const tableDept = ref() // 所属部门
 const columns = ref([
@@ -372,6 +380,7 @@
     else {
       inCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 待检设备
   toCheckInfo({ deptIds: id }).then((res) => {
@@ -402,6 +411,7 @@
     else {
       toCheckTable.value = data.deptList
     }
+    resizePage()
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
@@ -411,6 +421,7 @@
     inUseYAxisData.value = data.nameAggrList.map((item: any) => item.name)
     inUseData.value = data.meterAggrList.map((item: any) => item.count)
     inUseXAxisData.value = data.meterAggrList.map((item: any) => item.name)
+    resizePage()
   })
 }
 fecthDeviceStatus(user.deptId)
@@ -422,6 +433,7 @@
   else {
     fecthDeviceStatus(user.deptId)
   }
+  resizePage()
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
@@ -465,10 +477,7 @@
   })
   autoScroll(false, [])
   // ------------------------------------------------------------------------------
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 500)
+  resizePage()
 })
 onBeforeUnmount(() => {
   autoScroll(true, [])
@@ -624,7 +633,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
+          <div class="device-search-table" style="z-index: 999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6b522a8..ce18fc2 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -119,13 +119,13 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '4']
+        data.usageStatusList = ['0', '3']
         break
       case '4':
-        data.usageStatusList = ['0', '1', '3', '4']
+        data.usageStatusList = ['0', '4']
         break
       case '5':
-        data.usageStatusList = ['0', '1']
+        data.usageStatusList = ['0', '1', '3', '4']
         break
     }
   }
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index de13b38..4d6bb4e 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -11,7 +11,7 @@
 const $router = useRouter()
 const $route = useRoute()
 const statusName = $route.query.statusName as string
-
+const approvalId = ref('')
 // 获取审批记录
 // const approvalList = ref()
 // const fetchData = (id: string) => {
@@ -27,9 +27,9 @@
 // 获取设备流转日志
 const logRecord = ref()
 const fetchDevicelogs = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  console.log(data, 'data')
-  getTurnoverLogRecord(data.equipmentId).then((res) => {
+  getTurnoverLogRecord(approvalId.value).then((res) => {
     logRecord.value = res.data
     console.log(logRecord.value, '设备流转日志')
   })
@@ -37,15 +37,16 @@
 // 获取设备状态变更日志
 const statusList = ref()
 const fetchStatusList = () => {
+  if (!approvalId.value) { return }
   const data = JSON.parse($route.query.row as string)
-  getStatusLogRecord(data.equipmentId).then((res) => {
+  getStatusLogRecord(approvalId.value).then((res) => {
     statusList.value = res.data
     console.log(statusList.value, '状态变更记录')
   })
 }
 // 获取证书报告列表
 const baseRef = ref()
-const approvalId = ref('')
+
 const certificateList = ref()
 watch(() => baseRef?.value?.ruleForm, (newVal) => {
   if (newVal.certificateList.length) {
@@ -55,15 +56,17 @@
     certificateList.value = []
   }
   // equipmentId
-  if (newVal.equipmentId) {
+  if (newVal.equipmentId || newVal.id) {
     // fetchData(newVal.equipmentId)
-    approvalId.value = newVal.equipmentId
+    approvalId.value = newVal.equipmentId ? newVal.equipmentId : newVal.id
+    fetchStatusList()
+    fetchDevicelogs()
   }
 }, {
   deep: true,
 })
-fetchStatusList()
-fetchDevicelogs()
+// fetchStatusList()
+// fetchDevicelogs()
 // fetchData()
 const radioMenus = ref([
   {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 89d3820..9c00785 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -305,7 +305,7 @@
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        console.log(res.data, 'res.data')
+        console.log(res.data, 'res.data1111')
         // if (ruleForm.value.testTask) {
         //   if (ruleForm.value.testTask.includes(',')) {
         //     testTask.value = ruleForm.value.testTask.split(',')
diff --git a/src/views/tested/device/info/components/showPhotoSinge.vue b/src/views/tested/device/info/components/showPhotoSinge.vue
index 0b7ffe0..3e1a832 100644
--- a/src/views/tested/device/info/components/showPhotoSinge.vue
+++ b/src/views/tested/device/info/components/showPhotoSinge.vue
@@ -14,6 +14,7 @@
     type: String,
     default: '100px',
   },
+
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
diff --git a/src/views/tested/status/delay/components/ApprovalDialog.vue b/src/views/tested/status/delay/components/ApprovalDialog.vue
index 7b6af97..4efa61b 100644
--- a/src/views/tested/status/delay/components/ApprovalDialog.vue
+++ b/src/views/tested/status/delay/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue
index 13a2122..e9f74ad 100644
--- a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue
+++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/tested/subpackage/review/components/ApprovalDialog.vue b/src/views/tested/subpackage/review/components/ApprovalDialog.vue
index 890a64e..65e0563 100644
--- a/src/views/tested/subpackage/review/components/ApprovalDialog.vue
+++ b/src/views/tested/subpackage/review/components/ApprovalDialog.vue
@@ -101,7 +101,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="90px"
       :model="formData"
       :rules="rules"
     >
@@ -124,7 +124,7 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="审批结论:" props="comments">
+          <el-form-item label="审批结论:" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"