diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index 6aa1b6a..839157d 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -70,28 +70,28 @@
           activeMenu: '/person/orderList',
         },
       },
-      // {
-      //   path: 'trainList',
-      //   name: 'TrainList',
-      //   component: () => import('@/views/resource/person/train/list.vue'),
-      //   meta: {
-      //     title: '人员训练登记列表',
-      //     auth: '/resource/person/train',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'train/:type/:id?',
-      //   name: 'TrainDetail',
-      //   component: () => import('@/views/resource/person/train/detail.vue'),
-      //   meta: {
-      //     title: '人员训练登记',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/trainList',
-      //   },
-      // },
+      /* {
+        path: 'trainList',
+        name: 'TrainList',
+        component: () => import('@/views/resource/person/train/list.vue'),
+        meta: {
+          title: '人员训练登记列表',
+          auth: '/resource/person/train',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'train/:type/:id?',
+        name: 'TrainDetail',
+        component: () => import('@/views/resource/person/train/detail.vue'),
+        meta: {
+          title: '人员训练登记',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/trainList',
+        },
+      }, */
       {
         path: 'trainSignList',
         name: 'TrainSignList',
@@ -114,28 +114,28 @@
           activeMenu: '/person/trainSignList',
         },
       },
-      // {
-      //   path: 'remindList',
-      //   name: 'RemindList',
-      //   component: () => import('@/views/resource/person/remind/list.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒列表',
-      //     auth: '/resource/person/remind',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'remind/:type/:id?',
-      //   name: 'RemindDetail',
-      //   component: () => import('@/views/resource/person/remind/detail.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/remindList',
-      //   },
-      // },
+      /* {
+        path: 'remindList',
+        name: 'RemindList',
+        component: () => import('@/views/resource/person/remind/list.vue'),
+        meta: {
+          title: '证书逾期提醒列表',
+          auth: '/resource/person/remind',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'remind/:type/:id?',
+        name: 'RemindDetail',
+        component: () => import('@/views/resource/person/remind/detail.vue'),
+        meta: {
+          title: '证书逾期提醒',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/remindList',
+        },
+      }, */
       {
         path: 'certList',
         name: 'CertList',
@@ -239,6 +239,40 @@
           activeMenu: '/system/historyDocList',
         },
       },
+      {
+        path: 'dataList',
+        name: 'DataList',
+        component: () => import('@/views/resource/technology/data/list.vue'),
+        meta: {
+          title: '计量资料列表',
+          auth: '/resource/technology/data',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'data/:type/:id?',
+        name: 'DataDetail',
+        component: () => import('@/views/resource/technology/data/detail.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
+      {
+        path: 'data/stream/:filename?/:title?',
+        name: 'DataStream',
+        component: () => import('@/views/resource/common/fileStream.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
     ],
   },
   {
@@ -247,7 +281,7 @@
     redirect: '/technology/methodList',
     name: 'Technology',
     meta: {
-      title: '技术文件',
+      title: '测试校准检定方法',
       icon: 'ep:key',
       auth: '/resource/technology',
     },
@@ -287,37 +321,59 @@
         },
       },
       {
-        path: 'dataList',
-        name: 'DataList',
-        component: () => import('@/views/resource/technology/data/list.vue'),
+        path: 'methodConfirmList',
+        name: 'FileMethodConfirmList',
+        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
         meta: {
-          title: '计量资料列表',
-          auth: '/resource/technology/data',
+          title: '方法确认登记表',
+          auth: '/resource/file/methodConfirm',
           icon: 'ep:key',
         },
       },
       {
-        path: 'data/:type/:id?',
-        name: 'DataDetail',
-        component: () => import('@/views/resource/technology/data/detail.vue'),
+        path: 'methodConfirm/:type/:id?',
+        name: 'FileMethodConfirmDetail',
+        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
         },
       },
       {
-        path: 'data/stream/:filename?/:title?',
-        name: 'DataStream',
-        component: () => import('@/views/resource/common/fileStream.vue'),
+        path: 'methodConfirm/approved/:id',
+        name: 'FileMethodConfirmDetailApproved',
+        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
+        },
+      },
+      {
+        path: 'noveltySearchList',
+        name: 'FileNoveltySearchList',
+        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          auth: '/resource/file/noveltySearch',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'noveltySearch/:type/:id?',
+        name: 'FileNoveltySearchDetail',
+        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/noveltySearchList',
         },
       },
     ],
@@ -469,62 +525,6 @@
           activeMenu: '/file/recallArchiveList',
         },
       },
-      {
-        path: 'noveltySearchList',
-        name: 'FileNoveltySearchList',
-        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表',
-          auth: '/resource/file/noveltySearch',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'noveltySearch/:type/:id?',
-        name: 'FileNoveltySearchDetail',
-        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/noveltySearchList',
-        },
-      },
-      {
-        path: 'methodConfirmList',
-        name: 'FileMethodConfirmList',
-        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
-        meta: {
-          title: '方法确认登记表',
-          auth: '/resource/file/methodConfirm',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'methodConfirm/:type/:id?',
-        name: 'FileMethodConfirmDetail',
-        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
-      {
-        path: 'methodConfirm/approved/:id',
-        name: 'FileMethodConfirmDetailApproved',
-        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
     ],
   },
   {

diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index 6aa1b6a..839157d 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -70,28 +70,28 @@
           activeMenu: '/person/orderList',
         },
       },
-      // {
-      //   path: 'trainList',
-      //   name: 'TrainList',
-      //   component: () => import('@/views/resource/person/train/list.vue'),
-      //   meta: {
-      //     title: '人员训练登记列表',
-      //     auth: '/resource/person/train',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'train/:type/:id?',
-      //   name: 'TrainDetail',
-      //   component: () => import('@/views/resource/person/train/detail.vue'),
-      //   meta: {
-      //     title: '人员训练登记',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/trainList',
-      //   },
-      // },
+      /* {
+        path: 'trainList',
+        name: 'TrainList',
+        component: () => import('@/views/resource/person/train/list.vue'),
+        meta: {
+          title: '人员训练登记列表',
+          auth: '/resource/person/train',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'train/:type/:id?',
+        name: 'TrainDetail',
+        component: () => import('@/views/resource/person/train/detail.vue'),
+        meta: {
+          title: '人员训练登记',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/trainList',
+        },
+      }, */
       {
         path: 'trainSignList',
         name: 'TrainSignList',
@@ -114,28 +114,28 @@
           activeMenu: '/person/trainSignList',
         },
       },
-      // {
-      //   path: 'remindList',
-      //   name: 'RemindList',
-      //   component: () => import('@/views/resource/person/remind/list.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒列表',
-      //     auth: '/resource/person/remind',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'remind/:type/:id?',
-      //   name: 'RemindDetail',
-      //   component: () => import('@/views/resource/person/remind/detail.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/remindList',
-      //   },
-      // },
+      /* {
+        path: 'remindList',
+        name: 'RemindList',
+        component: () => import('@/views/resource/person/remind/list.vue'),
+        meta: {
+          title: '证书逾期提醒列表',
+          auth: '/resource/person/remind',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'remind/:type/:id?',
+        name: 'RemindDetail',
+        component: () => import('@/views/resource/person/remind/detail.vue'),
+        meta: {
+          title: '证书逾期提醒',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/remindList',
+        },
+      }, */
       {
         path: 'certList',
         name: 'CertList',
@@ -239,6 +239,40 @@
           activeMenu: '/system/historyDocList',
         },
       },
+      {
+        path: 'dataList',
+        name: 'DataList',
+        component: () => import('@/views/resource/technology/data/list.vue'),
+        meta: {
+          title: '计量资料列表',
+          auth: '/resource/technology/data',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'data/:type/:id?',
+        name: 'DataDetail',
+        component: () => import('@/views/resource/technology/data/detail.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
+      {
+        path: 'data/stream/:filename?/:title?',
+        name: 'DataStream',
+        component: () => import('@/views/resource/common/fileStream.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
     ],
   },
   {
@@ -247,7 +281,7 @@
     redirect: '/technology/methodList',
     name: 'Technology',
     meta: {
-      title: '技术文件',
+      title: '测试校准检定方法',
       icon: 'ep:key',
       auth: '/resource/technology',
     },
@@ -287,37 +321,59 @@
         },
       },
       {
-        path: 'dataList',
-        name: 'DataList',
-        component: () => import('@/views/resource/technology/data/list.vue'),
+        path: 'methodConfirmList',
+        name: 'FileMethodConfirmList',
+        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
         meta: {
-          title: '计量资料列表',
-          auth: '/resource/technology/data',
+          title: '方法确认登记表',
+          auth: '/resource/file/methodConfirm',
           icon: 'ep:key',
         },
       },
       {
-        path: 'data/:type/:id?',
-        name: 'DataDetail',
-        component: () => import('@/views/resource/technology/data/detail.vue'),
+        path: 'methodConfirm/:type/:id?',
+        name: 'FileMethodConfirmDetail',
+        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
         },
       },
       {
-        path: 'data/stream/:filename?/:title?',
-        name: 'DataStream',
-        component: () => import('@/views/resource/common/fileStream.vue'),
+        path: 'methodConfirm/approved/:id',
+        name: 'FileMethodConfirmDetailApproved',
+        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
+        },
+      },
+      {
+        path: 'noveltySearchList',
+        name: 'FileNoveltySearchList',
+        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          auth: '/resource/file/noveltySearch',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'noveltySearch/:type/:id?',
+        name: 'FileNoveltySearchDetail',
+        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/noveltySearchList',
         },
       },
     ],
@@ -469,62 +525,6 @@
           activeMenu: '/file/recallArchiveList',
         },
       },
-      {
-        path: 'noveltySearchList',
-        name: 'FileNoveltySearchList',
-        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表',
-          auth: '/resource/file/noveltySearch',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'noveltySearch/:type/:id?',
-        name: 'FileNoveltySearchDetail',
-        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/noveltySearchList',
-        },
-      },
-      {
-        path: 'methodConfirmList',
-        name: 'FileMethodConfirmList',
-        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
-        meta: {
-          title: '方法确认登记表',
-          auth: '/resource/file/methodConfirm',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'methodConfirm/:type/:id?',
-        name: 'FileMethodConfirmDetail',
-        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
-      {
-        path: 'methodConfirm/approved/:id',
-        name: 'FileMethodConfirmDetailApproved',
-        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
     ],
   },
   {
diff --git a/src/views/resource/technology/method/detail.vue b/src/views/resource/technology/method/detail.vue
index 615407d..b94ae0a 100644
--- a/src/views/resource/technology/method/detail.vue
+++ b/src/views/resource/technology/method/detail.vue
@@ -1,12 +1,13 @@
 <!-- 现行测试校准检定方法详情 -->
 <script name="MethodDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IFileInfo } from './method-interface'
+import type { IMethodFileInfo } from './method-interface'
 import useUserStore from '@/store/modules/user'
 import { UploadFile } from '@/api/file'
 import { addFileMethod, updateFileMethod } from '@/api/resource/fileTechnology'
-import { getPhotoUrl } from '@/api/system/tool'
 import type { IDictType } from '@/commonInterface/resource-interface'
+import FilePreviewDialog from '@/components/filePreview/filePreviewDialog.vue'
+import ImagePreviewDialog from '@/components/ImagePreview/imagePreviewDialog.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -19,48 +20,110 @@
 const title = ref('')
 
 const basicFormRef = ref()
+const refFilePreviewDlg = ref()
+const refImagePreviewDlg = ref()
 
 // 字典值
-const professGroupDict = ref<Array<IDictType>>([])
+const labCodeDict = ref<Array<IDictType>>([])
+const groupCodeDict = ref<Array<IDictType>>([])
 
-const methodFileInfo = ref<IFileInfo>({
+const methodFileInfo = ref<IMethodFileInfo>({
   id: '',
+  labCode: '',
+  labCodeName: '',
+  groupCode: '',
+  groupCodeName: '',
   fileNo: '',
   fileName: '',
   fileDistributeNo: '',
-  professionalGroup: '',
-  professionalGroupName: '',
-  versionNo: '',
   activeDate: '',
   createUserId: '',
   createUserName: '',
   createTime: '',
-  changeFormId: '',
   environmentRequire: '',
+  transmissionParams: '',
+  temperatureLowLimit: '',
+  temperatureHighLimit: '',
+  humidityLowLimit: '',
+  humidityHighLimit: '',
   remark: '',
   file: '',
 })
 
+const temperatureLowEnable = ref<boolean>(true)
+const temperatureHighEnable = ref<boolean>(true)
+const humidityLowEnable = ref<boolean>(true)
+const humidityHighEnable = ref<boolean>(true)
+
+const numberValidator = (rule: any, value: any, callback: any) => {
+  const floatReg = /^(\-|\+)?\d+(\.\d+)?$/
+  if (floatReg.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('请输入数字'))
+  }
+}
+
 const methodFileRules = ref({
+  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '文件编号不能为空', trigger: 'blur' }],
   fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
-  professionalGroup: [{ required: true, message: '专业组不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放编号不能为空', trigger: 'blur' }],
-  versionNo: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+  transmissionParams: [{ required: true, message: '开展量传参数不能为空', trigger: 'blur' }],
   activeDate: [{ required: true, message: '启用时间不能为空，请选择', trigger: 'blur' }],
-  environmentRequire: [{ required: true, message: '环境条件要求不能为空' }],
+  environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
   file: [{ required: true, message: '文件附件不能为空，请选择一个文件上传', trigger: 'blur' }],
+  temperatureLowLimit: [{ required: true, message: '温度要求下限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  temperatureHighLimit: [{ required: true, message: '温度要求上限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  humidityLowLimit: [{ required: true, message: '湿度要求下限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  humidityHighLimit: [{ required: true, message: '湿度要求上限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
 }) // 表单验证规则
 
-const minioFileUrl = ref<string>('')
-
 // 逻辑
-
 const resetForm = () => {
   sessionStorage.removeItem('methodFileInfo') // 返回列表时 将缓存中的数据删除
   router.go(-1)
 }
 
+// 验证温度要求的逻辑
+const validateTemperatureLimit = () => {
+  if (temperatureLowEnable.value === false && temperatureHighEnable.value === false) {
+    ElMessage.warning('温度上下限阈值不能同时为空，请选择')
+    return false
+  }
+
+  if (temperatureLowEnable.value === true && temperatureHighEnable.value === true) {
+    const lowVal = parseFloat(methodFileInfo.value.temperatureLowLimit)
+    const highVal = parseFloat(methodFileInfo.value.temperatureHighLimit)
+    if (lowVal >= highVal) {
+      ElMessage.warning('温度下限阈值不能超过上限阈值')
+      return false
+    }
+  }
+
+  return true
+}
+
+const validateHumidityLimit = () => {
+  if (humidityLowEnable.value === false && humidityHighEnable.value === false) {
+    ElMessage.warning('湿度上下限阈值不能同时为空，请选择')
+    return false
+  }
+
+  if (humidityLowEnable.value === true && humidityHighEnable.value === true) {
+    const lowVal = parseFloat(methodFileInfo.value.humidityLowLimit)
+    const highVal = parseFloat(methodFileInfo.value.humidityHighLimit)
+    if (lowVal >= highVal) {
+      ElMessage.warning('湿度下限阈值不能超过上限阈值')
+      return false
+    }
+  }
+
+  return true
+}
+
 // 添加
 const saveFileSystemForm = () => {
   // 将创建时间改为提交的时间
@@ -98,6 +161,17 @@
 const saveForm = async () => {
   if (!basicFormRef) { return }
 
+  let succ = false
+  succ = validateTemperatureLimit()
+  if (succ === false) {
+    return
+  }
+
+  succ = validateHumidityLimit()
+  if (succ === false) {
+    return
+  }
+
   await basicFormRef.value.validate((valid: boolean, fields: any) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -143,13 +217,14 @@
 }
 
 // 预览文件
-const previewFileSystem = (url: string) => {
-  console.log(url)
-}
-
-// 弹出选择文件更改单窗口
-const selectChangeForm = () => {
-
+const openFilePreviewDialog = (filename: string) => {
+// 手动新增的
+  if (filename.lastIndexOf('.pdf') > 0) {
+    refFilePreviewDlg.value.initDialog(filename)
+  }
+  else {
+    refImagePreviewDlg.value.initDialog(filename)
+  }
 }
 
 const initDialog = (params: any) => {
@@ -172,6 +247,18 @@
       id.value = params.id
 
       methodFileInfo.value = JSON.parse(sessionStorage.getItem('methodFileInfo')!)
+      if (methodFileInfo.value.temperatureLowLimit === '') {
+        temperatureLowEnable.value = false
+      }
+      if (methodFileInfo.value.temperatureHighLimit === '') {
+        temperatureHighEnable.value = false
+      }
+      if (methodFileInfo.value.humidityLowLimit === '') {
+        humidityLowEnable.value = false
+      }
+      if (methodFileInfo.value.humidityHighLimit === '') {
+        humidityHighEnable.value = false
+      }
 
       break
     case 'detail':
@@ -187,31 +274,53 @@
   }
 }
 
-// 监听 显示中文 立即监听
-watch(() => methodFileInfo.value.professionalGroup, (newVal) => {
-  if (professGroupDict.value.length === 0) {
-    professGroupDict.value = JSON.parse(sessionStorage.getItem('bizGroupCode')!)
+// 获取字典值
+const getLabCodeDict = () => {
+  if (sessionStorage.getItem('bizLabCode') !== null && sessionStorage.getItem('bizLabCode') !== '') {
+    labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCode')!)
   }
-  const targetList = professGroupDict.value.filter(item => item.value === newVal)
-  if (targetList.length > 0) {
-    methodFileInfo.value.professionalGroupName = targetList[0].name
+}
+const getGroupCodeDict = () => {
+  if (sessionStorage.getItem('bizGroupCode') !== null && sessionStorage.getItem('bizGroupCode') !== '') {
+    groupCodeDict.value = JSON.parse(sessionStorage.getItem('bizGroupCode')!)
   }
-  else {
-    methodFileInfo.value.professionalGroupName = ''
-  }
-}, { immediate: true })
+}
 
-watch(() => methodFileInfo.value.file, (newVal) => {
-  if (newVal !== '') {
-    getPhotoUrl(newVal).then((res) => {
-      if (res.code === 200) {
-        minioFileUrl.value = res.data
-      }
-    })
+const initDict = () => {
+  getLabCodeDict()
+  getGroupCodeDict()
+}
+
+watch(() => temperatureLowEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择温度下限时 清除下限值
+    methodFileInfo.value.temperatureLowLimit = ''
+  }
+})
+
+watch(() => temperatureHighEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择温度上限时 清除上限值
+    methodFileInfo.value.temperatureHighLimit = ''
+  }
+})
+
+watch(() => humidityLowEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择湿度下限时 清除下限值
+    methodFileInfo.value.humidityLowLimit = ''
+  }
+})
+
+watch(() => humidityHighEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择湿度上限时 清除上限值
+    methodFileInfo.value.humidityHighLimit = ''
   }
 })
 
 onMounted(async () => {
+  initDict()
   initDialog(route.query)
 })
 </script>
@@ -232,22 +341,45 @@
         <el-row :gutter="24">
           <!-- 第一行 第一列 -->
           <el-col :span="6">
-            <el-form-item label="文件编号" prop="fileNo">
-              <el-input v-model="methodFileInfo.fileNo" placeholder="请输入文件编号" tabindex="1" :clearable="true" :disabled="type === 'detail'" />
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="methodFileInfo.labCode" placeholder="请选择实验室" tabindex="1" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
             </el-form-item>
 
-            <el-form-item label="专业组" prop="professionalGroup">
-              <el-select v-model="methodFileInfo.professionalGroup" placeholder="请选择专业组" tabindex="5" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
-                <el-option v-for="dict in professGroupDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-              <el-input v-model="methodFileInfo.professionalGroupName" type="hidden" />
+            <el-form-item label="文件编号" prop="fileNo">
+              <el-input v-model="methodFileInfo.fileNo" placeholder="请输入文件编号" tabindex="3" :clearable="true" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="methodFileInfo.groupCode" placeholder="请选择部门" tabindex="2" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="文件发放编号" prop="fileDistributeNo">
-              <el-input v-model="methodFileInfo.fileDistributeNo" :clearable="true" placeholder="请输入文件发放编号" tabindex="2" :disabled="type === 'detail'" />
+              <el-input v-model="methodFileInfo.fileDistributeNo" :clearable="true" placeholder="请输入文件发放编号" tabindex="4" :disabled="type === 'detail'" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model="methodFileInfo.createUserName" :disabled="true" />
+            </el-form-item>
+
+            <el-form-item label="文件名称" prop="fileName">
+              <el-input v-model="methodFileInfo.fileName" :clearable="true" placeholder="请输入文件名称" tabindex="5" :disabled="type === 'detail'" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model="methodFileInfo.createTime" :disabled="true" />
             </el-form-item>
 
             <el-form-item label="启用时间" prop="activeDate">
@@ -259,42 +391,73 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
 
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="文件名称" prop="fileName">
-              <el-input v-model="methodFileInfo.fileName" :clearable="true" placeholder="请输入文件名称" tabindex="3" :disabled="type === 'detail'" />
-            </el-form-item>
-
-            <el-form-item label="创建人">
-              <el-input v-model="methodFileInfo.createUserName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="版本号" prop="versionNo">
-              <el-input v-model="methodFileInfo.versionNo" :clearable="true" placeholder="请输入文件版本号" tabindex="4" :disabled="type === 'detail'" />
-            </el-form-item>
-
-            <el-form-item label="创建时间">
-              <el-input v-model="methodFileInfo.createTime" :disabled="true" />
+        <!-- 第二行 -->
+        <el-row :gutter="24">
+          <!-- 第一列 -->
+          <el-col :span="12">
+            <el-form-item label="开展量传参数" prop="transmissionParams">
+              <el-input v-model="methodFileInfo.transmissionParams" placeholder="请输入开展的量传参数" tabindex="7" :clearable="true" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
 
-        <!-- 第二行 -->
-        <el-row v-if="type === 'update'" :gutter="24">
+        <el-row :gutter="24">
           <!-- 第一列 -->
           <el-col :span="12">
-            <el-form-item label="文件更改申请单">
-              <el-input v-model="methodFileInfo.changeFormId" placeholder="请选择文件更改申请单" tabindex="7" :clearable="true">
-                <template #append>
-                  <el-button size="small" @click="selectChangeForm">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
+            <el-form-item label="温度要求">
+              <el-checkbox v-model="temperatureLowEnable" label="下限" :disabled="type === 'detail'" style="margin: 0 10px;" />
+              <el-form-item v-if="temperatureLowEnable === true" prop="temperatureLowLimit">
+                <el-input
+                  v-model="methodFileInfo.temperatureLowLimit" placeholder="" tabindex="8"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ℃
+                  </template>
+                </el-input>
+              </el-form-item>
+
+              <el-checkbox v-model="temperatureHighEnable" label="上限" :disabled="type === 'detail'" style="margin: 0 10px; margin-left: 100px;" />
+              <el-form-item v-if="temperatureHighEnable === true" prop="temperatureHighLimit">
+                <el-input
+                  v-model="methodFileInfo.temperatureHighLimit" placeholder="" tabindex="9"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ℃
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="湿度要求">
+              <el-checkbox v-model="humidityLowEnable" label="下限" :disabled="type === 'detail'" style="margin: 0 10px;" />
+              <el-form-item v-if="humidityLowEnable === true" prop="humidityLowLimit">
+                <el-input
+                  v-model="methodFileInfo.humidityLowLimit" placeholder="" tabindex="10"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ％
+                  </template>
+                </el-input>
+              </el-form-item>
+
+              <el-checkbox v-model="humidityHighEnable" label="上限" :disabled="type === 'detail'" style="margin: 0 10px; margin-left: 100px;" />
+              <el-form-item v-if="humidityHighEnable === true" prop="humidityHighLimit">
+                <el-input
+                  v-model="methodFileInfo.humidityHighLimit" placeholder="" tabindex="11"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ％
+                  </template>
+                </el-input>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -303,7 +466,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="环境条件要求" prop="environmentRequire">
-              <el-input v-model="methodFileInfo.environmentRequire" placeholder="请输入环境条件要求" tabindex="8" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="5" />
+              <el-input v-model="methodFileInfo.environmentRequire" placeholder="请输入环境条件要求" tabindex="12" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="5" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -312,7 +475,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="备注">
-              <el-input v-model="methodFileInfo.remark" placeholder="请输入备注信息" tabindex="9" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="2" />
+              <el-input v-model="methodFileInfo.remark" placeholder="请输入备注信息" tabindex="13" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="2" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -322,9 +485,9 @@
           <el-col :span="20">
             <el-form-item label="文件附件" prop="file">
               <el-input v-model="methodFileInfo.file" type="hidden" />
-              <!-- <el-link :href="minioFileUrl" :underline="false" target="_blank" @click="previewFileSystem(minioFileUrl)"> -->
-              {{ methodFileInfo.file }}
-              <!-- </el-link> -->
+              <el-link @click="openFilePreviewDialog(methodFileInfo.file)">
+                {{ methodFileInfo.file }}
+              </el-link>
 
               <el-upload
                 :show-file-list="false"
@@ -345,6 +508,35 @@
         </el-row>
       </el-form>
     </detail-page>
+
+    <file-preview-dialog ref="refFilePreviewDlg" />
+    <image-preview-dialog ref="refImagePreviewDlg" />
   </app-container>
 </template>
 
+<style scoped>
+.my-el-input-number[data-unit] {
+  --el-input-number-unit-offset-x: 15px; /* 不显示控制按钮 */
+
+  /* --el-input-number-unit-offset-x: 35px; /* 显示控制按钮 */
+
+  position: relative;
+}
+
+.my-el-input-number[data-unit]::after {
+  content: attr(data-unit);
+  height: 100%;
+  display: flex;
+  align-items: center;
+  position: absolute;
+  top: 0;
+  right: var(--el-input-number-unit-offset-x);
+  color: #999;
+}
+
+.my-el-input-number[data-unit] .el-input__inner {
+  padding-left: 30px;
+  padding-right: calc(var(--el-input-number-unit-offset-x) + 12px);
+}
+</style>
+

diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index 6aa1b6a..839157d 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -70,28 +70,28 @@
           activeMenu: '/person/orderList',
         },
       },
-      // {
-      //   path: 'trainList',
-      //   name: 'TrainList',
-      //   component: () => import('@/views/resource/person/train/list.vue'),
-      //   meta: {
-      //     title: '人员训练登记列表',
-      //     auth: '/resource/person/train',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'train/:type/:id?',
-      //   name: 'TrainDetail',
-      //   component: () => import('@/views/resource/person/train/detail.vue'),
-      //   meta: {
-      //     title: '人员训练登记',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/trainList',
-      //   },
-      // },
+      /* {
+        path: 'trainList',
+        name: 'TrainList',
+        component: () => import('@/views/resource/person/train/list.vue'),
+        meta: {
+          title: '人员训练登记列表',
+          auth: '/resource/person/train',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'train/:type/:id?',
+        name: 'TrainDetail',
+        component: () => import('@/views/resource/person/train/detail.vue'),
+        meta: {
+          title: '人员训练登记',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/trainList',
+        },
+      }, */
       {
         path: 'trainSignList',
         name: 'TrainSignList',
@@ -114,28 +114,28 @@
           activeMenu: '/person/trainSignList',
         },
       },
-      // {
-      //   path: 'remindList',
-      //   name: 'RemindList',
-      //   component: () => import('@/views/resource/person/remind/list.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒列表',
-      //     auth: '/resource/person/remind',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'remind/:type/:id?',
-      //   name: 'RemindDetail',
-      //   component: () => import('@/views/resource/person/remind/detail.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/remindList',
-      //   },
-      // },
+      /* {
+        path: 'remindList',
+        name: 'RemindList',
+        component: () => import('@/views/resource/person/remind/list.vue'),
+        meta: {
+          title: '证书逾期提醒列表',
+          auth: '/resource/person/remind',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'remind/:type/:id?',
+        name: 'RemindDetail',
+        component: () => import('@/views/resource/person/remind/detail.vue'),
+        meta: {
+          title: '证书逾期提醒',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/remindList',
+        },
+      }, */
       {
         path: 'certList',
         name: 'CertList',
@@ -239,6 +239,40 @@
           activeMenu: '/system/historyDocList',
         },
       },
+      {
+        path: 'dataList',
+        name: 'DataList',
+        component: () => import('@/views/resource/technology/data/list.vue'),
+        meta: {
+          title: '计量资料列表',
+          auth: '/resource/technology/data',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'data/:type/:id?',
+        name: 'DataDetail',
+        component: () => import('@/views/resource/technology/data/detail.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
+      {
+        path: 'data/stream/:filename?/:title?',
+        name: 'DataStream',
+        component: () => import('@/views/resource/common/fileStream.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
     ],
   },
   {
@@ -247,7 +281,7 @@
     redirect: '/technology/methodList',
     name: 'Technology',
     meta: {
-      title: '技术文件',
+      title: '测试校准检定方法',
       icon: 'ep:key',
       auth: '/resource/technology',
     },
@@ -287,37 +321,59 @@
         },
       },
       {
-        path: 'dataList',
-        name: 'DataList',
-        component: () => import('@/views/resource/technology/data/list.vue'),
+        path: 'methodConfirmList',
+        name: 'FileMethodConfirmList',
+        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
         meta: {
-          title: '计量资料列表',
-          auth: '/resource/technology/data',
+          title: '方法确认登记表',
+          auth: '/resource/file/methodConfirm',
           icon: 'ep:key',
         },
       },
       {
-        path: 'data/:type/:id?',
-        name: 'DataDetail',
-        component: () => import('@/views/resource/technology/data/detail.vue'),
+        path: 'methodConfirm/:type/:id?',
+        name: 'FileMethodConfirmDetail',
+        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
         },
       },
       {
-        path: 'data/stream/:filename?/:title?',
-        name: 'DataStream',
-        component: () => import('@/views/resource/common/fileStream.vue'),
+        path: 'methodConfirm/approved/:id',
+        name: 'FileMethodConfirmDetailApproved',
+        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
+        },
+      },
+      {
+        path: 'noveltySearchList',
+        name: 'FileNoveltySearchList',
+        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          auth: '/resource/file/noveltySearch',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'noveltySearch/:type/:id?',
+        name: 'FileNoveltySearchDetail',
+        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/noveltySearchList',
         },
       },
     ],
@@ -469,62 +525,6 @@
           activeMenu: '/file/recallArchiveList',
         },
       },
-      {
-        path: 'noveltySearchList',
-        name: 'FileNoveltySearchList',
-        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表',
-          auth: '/resource/file/noveltySearch',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'noveltySearch/:type/:id?',
-        name: 'FileNoveltySearchDetail',
-        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/noveltySearchList',
-        },
-      },
-      {
-        path: 'methodConfirmList',
-        name: 'FileMethodConfirmList',
-        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
-        meta: {
-          title: '方法确认登记表',
-          auth: '/resource/file/methodConfirm',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'methodConfirm/:type/:id?',
-        name: 'FileMethodConfirmDetail',
-        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
-      {
-        path: 'methodConfirm/approved/:id',
-        name: 'FileMethodConfirmDetailApproved',
-        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
     ],
   },
   {
diff --git a/src/views/resource/technology/method/detail.vue b/src/views/resource/technology/method/detail.vue
index 615407d..b94ae0a 100644
--- a/src/views/resource/technology/method/detail.vue
+++ b/src/views/resource/technology/method/detail.vue
@@ -1,12 +1,13 @@
 <!-- 现行测试校准检定方法详情 -->
 <script name="MethodDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IFileInfo } from './method-interface'
+import type { IMethodFileInfo } from './method-interface'
 import useUserStore from '@/store/modules/user'
 import { UploadFile } from '@/api/file'
 import { addFileMethod, updateFileMethod } from '@/api/resource/fileTechnology'
-import { getPhotoUrl } from '@/api/system/tool'
 import type { IDictType } from '@/commonInterface/resource-interface'
+import FilePreviewDialog from '@/components/filePreview/filePreviewDialog.vue'
+import ImagePreviewDialog from '@/components/ImagePreview/imagePreviewDialog.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -19,48 +20,110 @@
 const title = ref('')
 
 const basicFormRef = ref()
+const refFilePreviewDlg = ref()
+const refImagePreviewDlg = ref()
 
 // 字典值
-const professGroupDict = ref<Array<IDictType>>([])
+const labCodeDict = ref<Array<IDictType>>([])
+const groupCodeDict = ref<Array<IDictType>>([])
 
-const methodFileInfo = ref<IFileInfo>({
+const methodFileInfo = ref<IMethodFileInfo>({
   id: '',
+  labCode: '',
+  labCodeName: '',
+  groupCode: '',
+  groupCodeName: '',
   fileNo: '',
   fileName: '',
   fileDistributeNo: '',
-  professionalGroup: '',
-  professionalGroupName: '',
-  versionNo: '',
   activeDate: '',
   createUserId: '',
   createUserName: '',
   createTime: '',
-  changeFormId: '',
   environmentRequire: '',
+  transmissionParams: '',
+  temperatureLowLimit: '',
+  temperatureHighLimit: '',
+  humidityLowLimit: '',
+  humidityHighLimit: '',
   remark: '',
   file: '',
 })
 
+const temperatureLowEnable = ref<boolean>(true)
+const temperatureHighEnable = ref<boolean>(true)
+const humidityLowEnable = ref<boolean>(true)
+const humidityHighEnable = ref<boolean>(true)
+
+const numberValidator = (rule: any, value: any, callback: any) => {
+  const floatReg = /^(\-|\+)?\d+(\.\d+)?$/
+  if (floatReg.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('请输入数字'))
+  }
+}
+
 const methodFileRules = ref({
+  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '文件编号不能为空', trigger: 'blur' }],
   fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
-  professionalGroup: [{ required: true, message: '专业组不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放编号不能为空', trigger: 'blur' }],
-  versionNo: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+  transmissionParams: [{ required: true, message: '开展量传参数不能为空', trigger: 'blur' }],
   activeDate: [{ required: true, message: '启用时间不能为空，请选择', trigger: 'blur' }],
-  environmentRequire: [{ required: true, message: '环境条件要求不能为空' }],
+  environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
   file: [{ required: true, message: '文件附件不能为空，请选择一个文件上传', trigger: 'blur' }],
+  temperatureLowLimit: [{ required: true, message: '温度要求下限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  temperatureHighLimit: [{ required: true, message: '温度要求上限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  humidityLowLimit: [{ required: true, message: '湿度要求下限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  humidityHighLimit: [{ required: true, message: '湿度要求上限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
 }) // 表单验证规则
 
-const minioFileUrl = ref<string>('')
-
 // 逻辑
-
 const resetForm = () => {
   sessionStorage.removeItem('methodFileInfo') // 返回列表时 将缓存中的数据删除
   router.go(-1)
 }
 
+// 验证温度要求的逻辑
+const validateTemperatureLimit = () => {
+  if (temperatureLowEnable.value === false && temperatureHighEnable.value === false) {
+    ElMessage.warning('温度上下限阈值不能同时为空，请选择')
+    return false
+  }
+
+  if (temperatureLowEnable.value === true && temperatureHighEnable.value === true) {
+    const lowVal = parseFloat(methodFileInfo.value.temperatureLowLimit)
+    const highVal = parseFloat(methodFileInfo.value.temperatureHighLimit)
+    if (lowVal >= highVal) {
+      ElMessage.warning('温度下限阈值不能超过上限阈值')
+      return false
+    }
+  }
+
+  return true
+}
+
+const validateHumidityLimit = () => {
+  if (humidityLowEnable.value === false && humidityHighEnable.value === false) {
+    ElMessage.warning('湿度上下限阈值不能同时为空，请选择')
+    return false
+  }
+
+  if (humidityLowEnable.value === true && humidityHighEnable.value === true) {
+    const lowVal = parseFloat(methodFileInfo.value.humidityLowLimit)
+    const highVal = parseFloat(methodFileInfo.value.humidityHighLimit)
+    if (lowVal >= highVal) {
+      ElMessage.warning('湿度下限阈值不能超过上限阈值')
+      return false
+    }
+  }
+
+  return true
+}
+
 // 添加
 const saveFileSystemForm = () => {
   // 将创建时间改为提交的时间
@@ -98,6 +161,17 @@
 const saveForm = async () => {
   if (!basicFormRef) { return }
 
+  let succ = false
+  succ = validateTemperatureLimit()
+  if (succ === false) {
+    return
+  }
+
+  succ = validateHumidityLimit()
+  if (succ === false) {
+    return
+  }
+
   await basicFormRef.value.validate((valid: boolean, fields: any) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -143,13 +217,14 @@
 }
 
 // 预览文件
-const previewFileSystem = (url: string) => {
-  console.log(url)
-}
-
-// 弹出选择文件更改单窗口
-const selectChangeForm = () => {
-
+const openFilePreviewDialog = (filename: string) => {
+// 手动新增的
+  if (filename.lastIndexOf('.pdf') > 0) {
+    refFilePreviewDlg.value.initDialog(filename)
+  }
+  else {
+    refImagePreviewDlg.value.initDialog(filename)
+  }
 }
 
 const initDialog = (params: any) => {
@@ -172,6 +247,18 @@
       id.value = params.id
 
       methodFileInfo.value = JSON.parse(sessionStorage.getItem('methodFileInfo')!)
+      if (methodFileInfo.value.temperatureLowLimit === '') {
+        temperatureLowEnable.value = false
+      }
+      if (methodFileInfo.value.temperatureHighLimit === '') {
+        temperatureHighEnable.value = false
+      }
+      if (methodFileInfo.value.humidityLowLimit === '') {
+        humidityLowEnable.value = false
+      }
+      if (methodFileInfo.value.humidityHighLimit === '') {
+        humidityHighEnable.value = false
+      }
 
       break
     case 'detail':
@@ -187,31 +274,53 @@
   }
 }
 
-// 监听 显示中文 立即监听
-watch(() => methodFileInfo.value.professionalGroup, (newVal) => {
-  if (professGroupDict.value.length === 0) {
-    professGroupDict.value = JSON.parse(sessionStorage.getItem('bizGroupCode')!)
+// 获取字典值
+const getLabCodeDict = () => {
+  if (sessionStorage.getItem('bizLabCode') !== null && sessionStorage.getItem('bizLabCode') !== '') {
+    labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCode')!)
   }
-  const targetList = professGroupDict.value.filter(item => item.value === newVal)
-  if (targetList.length > 0) {
-    methodFileInfo.value.professionalGroupName = targetList[0].name
+}
+const getGroupCodeDict = () => {
+  if (sessionStorage.getItem('bizGroupCode') !== null && sessionStorage.getItem('bizGroupCode') !== '') {
+    groupCodeDict.value = JSON.parse(sessionStorage.getItem('bizGroupCode')!)
   }
-  else {
-    methodFileInfo.value.professionalGroupName = ''
-  }
-}, { immediate: true })
+}
 
-watch(() => methodFileInfo.value.file, (newVal) => {
-  if (newVal !== '') {
-    getPhotoUrl(newVal).then((res) => {
-      if (res.code === 200) {
-        minioFileUrl.value = res.data
-      }
-    })
+const initDict = () => {
+  getLabCodeDict()
+  getGroupCodeDict()
+}
+
+watch(() => temperatureLowEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择温度下限时 清除下限值
+    methodFileInfo.value.temperatureLowLimit = ''
+  }
+})
+
+watch(() => temperatureHighEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择温度上限时 清除上限值
+    methodFileInfo.value.temperatureHighLimit = ''
+  }
+})
+
+watch(() => humidityLowEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择湿度下限时 清除下限值
+    methodFileInfo.value.humidityLowLimit = ''
+  }
+})
+
+watch(() => humidityHighEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择湿度上限时 清除上限值
+    methodFileInfo.value.humidityHighLimit = ''
   }
 })
 
 onMounted(async () => {
+  initDict()
   initDialog(route.query)
 })
 </script>
@@ -232,22 +341,45 @@
         <el-row :gutter="24">
           <!-- 第一行 第一列 -->
           <el-col :span="6">
-            <el-form-item label="文件编号" prop="fileNo">
-              <el-input v-model="methodFileInfo.fileNo" placeholder="请输入文件编号" tabindex="1" :clearable="true" :disabled="type === 'detail'" />
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="methodFileInfo.labCode" placeholder="请选择实验室" tabindex="1" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
             </el-form-item>
 
-            <el-form-item label="专业组" prop="professionalGroup">
-              <el-select v-model="methodFileInfo.professionalGroup" placeholder="请选择专业组" tabindex="5" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
-                <el-option v-for="dict in professGroupDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-              <el-input v-model="methodFileInfo.professionalGroupName" type="hidden" />
+            <el-form-item label="文件编号" prop="fileNo">
+              <el-input v-model="methodFileInfo.fileNo" placeholder="请输入文件编号" tabindex="3" :clearable="true" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="methodFileInfo.groupCode" placeholder="请选择部门" tabindex="2" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="文件发放编号" prop="fileDistributeNo">
-              <el-input v-model="methodFileInfo.fileDistributeNo" :clearable="true" placeholder="请输入文件发放编号" tabindex="2" :disabled="type === 'detail'" />
+              <el-input v-model="methodFileInfo.fileDistributeNo" :clearable="true" placeholder="请输入文件发放编号" tabindex="4" :disabled="type === 'detail'" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model="methodFileInfo.createUserName" :disabled="true" />
+            </el-form-item>
+
+            <el-form-item label="文件名称" prop="fileName">
+              <el-input v-model="methodFileInfo.fileName" :clearable="true" placeholder="请输入文件名称" tabindex="5" :disabled="type === 'detail'" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model="methodFileInfo.createTime" :disabled="true" />
             </el-form-item>
 
             <el-form-item label="启用时间" prop="activeDate">
@@ -259,42 +391,73 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
 
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="文件名称" prop="fileName">
-              <el-input v-model="methodFileInfo.fileName" :clearable="true" placeholder="请输入文件名称" tabindex="3" :disabled="type === 'detail'" />
-            </el-form-item>
-
-            <el-form-item label="创建人">
-              <el-input v-model="methodFileInfo.createUserName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="版本号" prop="versionNo">
-              <el-input v-model="methodFileInfo.versionNo" :clearable="true" placeholder="请输入文件版本号" tabindex="4" :disabled="type === 'detail'" />
-            </el-form-item>
-
-            <el-form-item label="创建时间">
-              <el-input v-model="methodFileInfo.createTime" :disabled="true" />
+        <!-- 第二行 -->
+        <el-row :gutter="24">
+          <!-- 第一列 -->
+          <el-col :span="12">
+            <el-form-item label="开展量传参数" prop="transmissionParams">
+              <el-input v-model="methodFileInfo.transmissionParams" placeholder="请输入开展的量传参数" tabindex="7" :clearable="true" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
 
-        <!-- 第二行 -->
-        <el-row v-if="type === 'update'" :gutter="24">
+        <el-row :gutter="24">
           <!-- 第一列 -->
           <el-col :span="12">
-            <el-form-item label="文件更改申请单">
-              <el-input v-model="methodFileInfo.changeFormId" placeholder="请选择文件更改申请单" tabindex="7" :clearable="true">
-                <template #append>
-                  <el-button size="small" @click="selectChangeForm">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
+            <el-form-item label="温度要求">
+              <el-checkbox v-model="temperatureLowEnable" label="下限" :disabled="type === 'detail'" style="margin: 0 10px;" />
+              <el-form-item v-if="temperatureLowEnable === true" prop="temperatureLowLimit">
+                <el-input
+                  v-model="methodFileInfo.temperatureLowLimit" placeholder="" tabindex="8"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ℃
+                  </template>
+                </el-input>
+              </el-form-item>
+
+              <el-checkbox v-model="temperatureHighEnable" label="上限" :disabled="type === 'detail'" style="margin: 0 10px; margin-left: 100px;" />
+              <el-form-item v-if="temperatureHighEnable === true" prop="temperatureHighLimit">
+                <el-input
+                  v-model="methodFileInfo.temperatureHighLimit" placeholder="" tabindex="9"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ℃
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="湿度要求">
+              <el-checkbox v-model="humidityLowEnable" label="下限" :disabled="type === 'detail'" style="margin: 0 10px;" />
+              <el-form-item v-if="humidityLowEnable === true" prop="humidityLowLimit">
+                <el-input
+                  v-model="methodFileInfo.humidityLowLimit" placeholder="" tabindex="10"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ％
+                  </template>
+                </el-input>
+              </el-form-item>
+
+              <el-checkbox v-model="humidityHighEnable" label="上限" :disabled="type === 'detail'" style="margin: 0 10px; margin-left: 100px;" />
+              <el-form-item v-if="humidityHighEnable === true" prop="humidityHighLimit">
+                <el-input
+                  v-model="methodFileInfo.humidityHighLimit" placeholder="" tabindex="11"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ％
+                  </template>
+                </el-input>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -303,7 +466,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="环境条件要求" prop="environmentRequire">
-              <el-input v-model="methodFileInfo.environmentRequire" placeholder="请输入环境条件要求" tabindex="8" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="5" />
+              <el-input v-model="methodFileInfo.environmentRequire" placeholder="请输入环境条件要求" tabindex="12" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="5" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -312,7 +475,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="备注">
-              <el-input v-model="methodFileInfo.remark" placeholder="请输入备注信息" tabindex="9" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="2" />
+              <el-input v-model="methodFileInfo.remark" placeholder="请输入备注信息" tabindex="13" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="2" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -322,9 +485,9 @@
           <el-col :span="20">
             <el-form-item label="文件附件" prop="file">
               <el-input v-model="methodFileInfo.file" type="hidden" />
-              <!-- <el-link :href="minioFileUrl" :underline="false" target="_blank" @click="previewFileSystem(minioFileUrl)"> -->
-              {{ methodFileInfo.file }}
-              <!-- </el-link> -->
+              <el-link @click="openFilePreviewDialog(methodFileInfo.file)">
+                {{ methodFileInfo.file }}
+              </el-link>
 
               <el-upload
                 :show-file-list="false"
@@ -345,6 +508,35 @@
         </el-row>
       </el-form>
     </detail-page>
+
+    <file-preview-dialog ref="refFilePreviewDlg" />
+    <image-preview-dialog ref="refImagePreviewDlg" />
   </app-container>
 </template>
 
+<style scoped>
+.my-el-input-number[data-unit] {
+  --el-input-number-unit-offset-x: 15px; /* 不显示控制按钮 */
+
+  /* --el-input-number-unit-offset-x: 35px; /* 显示控制按钮 */
+
+  position: relative;
+}
+
+.my-el-input-number[data-unit]::after {
+  content: attr(data-unit);
+  height: 100%;
+  display: flex;
+  align-items: center;
+  position: absolute;
+  top: 0;
+  right: var(--el-input-number-unit-offset-x);
+  color: #999;
+}
+
+.my-el-input-number[data-unit] .el-input__inner {
+  padding-left: 30px;
+  padding-right: calc(var(--el-input-number-unit-offset-x) + 12px);
+}
+</style>
+
diff --git a/src/views/resource/technology/method/list.vue b/src/views/resource/technology/method/list.vue
index 115033f..65375fe 100644
--- a/src/views/resource/technology/method/list.vue
+++ b/src/views/resource/technology/method/list.vue
@@ -1,39 +1,54 @@
 <!-- 现行测试校准检定方法列表 -->
 <script name="MethodList" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IFileInfo, IListQuery } from './method-interface'
+import type { DateModelType } from 'element-plus'
+import type { IListQuery, IMethodFileInfo } from './method-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { delFileMethod, getFileMethodList } from '@/api/resource/fileTechnology'
 import type { IDictType } from '@/commonInterface/resource-interface'
+import FilePreviewDialog from '@/components/filePreview/filePreviewDialog.vue'
+import ImagePreviewDialog from '@/components/ImagePreview/imagePreviewDialog.vue'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
-const professGroupDict = ref<Array<IDictType>>([])
+const labCodeDict = ref<Array<IDictType>>([])
+const groupCodeDict = ref<Array<IDictType>>([])
+const noveltyStatusDict = ref<Array<IDictType>>([])
+
+const refFilePreviewDlg = ref()
+const refImagePreviewDlg = ref()
 
 // 查询条件
 const searchQuery = ref<IListQuery>({
+  labCode: '',
+  groupCode: '',
   fileNo: '', // 文件编号
   fileName: '', // 文件名
   fileDistributeNo: '', // 文件发放号
-  professionalGroup: '', // 专业组
+  activeDateStart: '', //
+  activeDateEnd: '',
+  noveltyStatus: '',
   offset: 1,
   limit: 20,
 })
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
 
 // 表头
 const columns = ref<TableColumn[]>([
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '100' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '150' },
   { text: '文件编号', value: 'fileNo', align: 'center', width: '180' },
-  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center', width: '180' },
   { text: '文件名称', value: 'fileName', align: 'center' },
-  { text: '版本号', value: 'versionNo', align: 'center', width: '140' },
-  { text: '专业组', value: 'professionalGroupName', align: 'center', width: '140' },
-  { text: '启用时间', value: 'activeDateStr', align: 'center', width: '140' },
+  { text: '启用时间', value: 'activeDateStr', align: 'center', width: '120' },
+  { text: '查新状态', value: 'noveltyStatusName', align: 'center', width: '160' },
+  { text: '最新查新时间', value: 'latestNoveltyDate', align: 'center', width: '120' },
 ])
-const methodFileList = ref<Array<IFileInfo>>([]) // 表格数据
+const methodFileList = ref<Array<IMethodFileInfo>>([]) // 表格数据
 
 // 逻辑
 // 跳转到新建的页面
@@ -47,7 +62,7 @@
 }
 
 // 详情
-const detail = (row: IFileInfo) => {
+const detail = (row: IMethodFileInfo) => {
   sessionStorage.setItem('fileInfo', JSON.stringify(row))
   router.push({
     query: {
@@ -58,7 +73,7 @@
 }
 
 // 编辑
-const updateById = (row: IFileInfo) => {
+const updateById = (row: IMethodFileInfo) => {
   sessionStorage.setItem('methodFileInfo', JSON.stringify(row))
   router.push({
     query: {
@@ -110,18 +125,23 @@
 // 重置
 const reset = () => {
   searchQuery.value = {
+    labCode: '',
+    groupCode: '',
     fileNo: '', // 文件编号
     fileName: '', // 文件名
     fileDistributeNo: '', // 文件发放号
-    professionalGroup: '', // 专业组
+    activeDateStart: '', //
+    activeDateEnd: '',
+    noveltyStatus: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 删除
-const deleteById = (row: IFileInfo) => {
+const deleteById = (row: IMethodFileInfo) => {
   ElMessageBox.confirm(`是否删除文件 ${row.fileName}`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -139,18 +159,58 @@
   })
 }
 
-// 获取文件类别字典值
-const getProfessGroupDict = () => {
-  getDictByCode('bizGroupCode').then((res) => {
+const openFilePreviewDialog = (row: IMethodFileInfo) => {
+// 手动新增的
+  if (row.file.lastIndexOf('.pdf') > 0) {
+    refFilePreviewDlg.value.initDialog(row.file)
+  }
+  else {
+    refImagePreviewDlg.value.initDialog(row.file)
+  }
+}
+
+// 获取字典值
+const getLabCodeDict = () => {
+  getDictByCode('bizLabCode').then((res) => {
     if (res.code === 200) {
-      professGroupDict.value = res.data
-      sessionStorage.setItem('bizGroupCode', JSON.stringify(professGroupDict.value))
+      labCodeDict.value = res.data
+      sessionStorage.setItem('bizLabCode', JSON.stringify(labCodeDict.value))
     }
   })
 }
-const getDict = async () => {
-  getProfessGroupDict()
+const getGroupCodeDict = () => {
+  getDictByCode('bizGroupCode').then((res) => {
+    if (res.code === 200) {
+      groupCodeDict.value = res.data
+      sessionStorage.setItem('bizGroupCode', JSON.stringify(groupCodeDict.value))
+    }
+  })
 }
+const getNoveltyStatusDict = () => {
+  getDictByCode('bizNoveltyStatus').then((res) => {
+    if (res.code === 200) {
+      noveltyStatusDict.value = res.data
+      sessionStorage.setItem('bizNoveltyStatus', JSON.stringify(noveltyStatusDict.value))
+    }
+  })
+}
+
+const getDict = async () => {
+  getLabCodeDict()
+  getGroupCodeDict()
+  getNoveltyStatusDict()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.activeDateStart = dayjs(val[0]).format('YYYY-MM-DD HH:mm:ss') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD HH:mm:ss')
+    searchQuery.value.activeDateEnd = dayjs(val[1]).format('YYYY-MM-DD HH:mm:ss') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    searchQuery.value.activeDateStart = ''
+    searchQuery.value.activeDateEnd = ''
+  }
+})
 
 onMounted(async () => {
   await getDict()
@@ -162,24 +222,37 @@
   <app-container>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.labCode" placeholder="实验室" clearable>
+          <el-option v-for="item in labCodeDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.groupCode" placeholder="部门" clearable>
+          <el-option v-for="item in groupCodeDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.fileNo" placeholder="文件编号" clearable />
       </search-item>
-      <search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.fileDistributeNo" placeholder="文件发放编号" clearable />
       </search-item>
-      <search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.fileName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.professionalGroup" placeholder="专业组" clearable>
-          <el-option v-for="item in professGroupDict" :key="item.id" :value="item.value" :label="item.name" />
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="启用时间（开始）" end-placeholder="启用时间（结束）" />
+      </search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.noveltyStatus" placeholder="查新状态" clearable>
+          <el-option v-for="item in noveltyStatusDict" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="现行测试校准检定方法文件列表">
+    <table-container title="方法文件列表">
       <!-- 表头区域 -->
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(`/resource/technology/method/add`)" icon="icon-add" title="新建" @click="addMethodFile" />
@@ -200,6 +273,13 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column label="附件" align="center" width="300">
+            <template #default="scope">
+              <el-link @click="openFilePreviewDialog(scope.row)">
+                {{ scope.row.file }}
+              </el-link>
+            </template>
+          </el-table-column>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
@@ -216,5 +296,8 @@
         </template>
       </normal-table>
     </table-container>
+
+    <file-preview-dialog ref="refFilePreviewDlg" />
+    <image-preview-dialog ref="refImagePreviewDlg" />
   </app-container>
 </template>

diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index 6aa1b6a..839157d 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -70,28 +70,28 @@
           activeMenu: '/person/orderList',
         },
       },
-      // {
-      //   path: 'trainList',
-      //   name: 'TrainList',
-      //   component: () => import('@/views/resource/person/train/list.vue'),
-      //   meta: {
-      //     title: '人员训练登记列表',
-      //     auth: '/resource/person/train',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'train/:type/:id?',
-      //   name: 'TrainDetail',
-      //   component: () => import('@/views/resource/person/train/detail.vue'),
-      //   meta: {
-      //     title: '人员训练登记',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/trainList',
-      //   },
-      // },
+      /* {
+        path: 'trainList',
+        name: 'TrainList',
+        component: () => import('@/views/resource/person/train/list.vue'),
+        meta: {
+          title: '人员训练登记列表',
+          auth: '/resource/person/train',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'train/:type/:id?',
+        name: 'TrainDetail',
+        component: () => import('@/views/resource/person/train/detail.vue'),
+        meta: {
+          title: '人员训练登记',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/trainList',
+        },
+      }, */
       {
         path: 'trainSignList',
         name: 'TrainSignList',
@@ -114,28 +114,28 @@
           activeMenu: '/person/trainSignList',
         },
       },
-      // {
-      //   path: 'remindList',
-      //   name: 'RemindList',
-      //   component: () => import('@/views/resource/person/remind/list.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒列表',
-      //     auth: '/resource/person/remind',
-      //     icon: 'ep:key',
-      //   },
-      // },
-      // {
-      //   path: 'remind/:type/:id?',
-      //   name: 'RemindDetail',
-      //   component: () => import('@/views/resource/person/remind/detail.vue'),
-      //   meta: {
-      //     title: '证书逾期提醒',
-      //     icon: 'ep:key',
-      //     sidebar: false,
-      //     breadcrumb: true,
-      //     activeMenu: '/person/remindList',
-      //   },
-      // },
+      /* {
+        path: 'remindList',
+        name: 'RemindList',
+        component: () => import('@/views/resource/person/remind/list.vue'),
+        meta: {
+          title: '证书逾期提醒列表',
+          auth: '/resource/person/remind',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'remind/:type/:id?',
+        name: 'RemindDetail',
+        component: () => import('@/views/resource/person/remind/detail.vue'),
+        meta: {
+          title: '证书逾期提醒',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/person/remindList',
+        },
+      }, */
       {
         path: 'certList',
         name: 'CertList',
@@ -239,6 +239,40 @@
           activeMenu: '/system/historyDocList',
         },
       },
+      {
+        path: 'dataList',
+        name: 'DataList',
+        component: () => import('@/views/resource/technology/data/list.vue'),
+        meta: {
+          title: '计量资料列表',
+          auth: '/resource/technology/data',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'data/:type/:id?',
+        name: 'DataDetail',
+        component: () => import('@/views/resource/technology/data/detail.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
+      {
+        path: 'data/stream/:filename?/:title?',
+        name: 'DataStream',
+        component: () => import('@/views/resource/common/fileStream.vue'),
+        meta: {
+          title: '计量资料',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/dataList',
+        },
+      },
     ],
   },
   {
@@ -247,7 +281,7 @@
     redirect: '/technology/methodList',
     name: 'Technology',
     meta: {
-      title: '技术文件',
+      title: '测试校准检定方法',
       icon: 'ep:key',
       auth: '/resource/technology',
     },
@@ -287,37 +321,59 @@
         },
       },
       {
-        path: 'dataList',
-        name: 'DataList',
-        component: () => import('@/views/resource/technology/data/list.vue'),
+        path: 'methodConfirmList',
+        name: 'FileMethodConfirmList',
+        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
         meta: {
-          title: '计量资料列表',
-          auth: '/resource/technology/data',
+          title: '方法确认登记表',
+          auth: '/resource/file/methodConfirm',
           icon: 'ep:key',
         },
       },
       {
-        path: 'data/:type/:id?',
-        name: 'DataDetail',
-        component: () => import('@/views/resource/technology/data/detail.vue'),
+        path: 'methodConfirm/:type/:id?',
+        name: 'FileMethodConfirmDetail',
+        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
         },
       },
       {
-        path: 'data/stream/:filename?/:title?',
-        name: 'DataStream',
-        component: () => import('@/views/resource/common/fileStream.vue'),
+        path: 'methodConfirm/approved/:id',
+        name: 'FileMethodConfirmDetailApproved',
+        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
         meta: {
-          title: '计量资料',
+          title: '方法确认登记表详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/technology/dataList',
+          activeMenu: '/file/methodConfirmList',
+        },
+      },
+      {
+        path: 'noveltySearchList',
+        name: 'FileNoveltySearchList',
+        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          auth: '/resource/file/noveltySearch',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'noveltySearch/:type/:id?',
+        name: 'FileNoveltySearchDetail',
+        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/noveltySearchList',
         },
       },
     ],
@@ -469,62 +525,6 @@
           activeMenu: '/file/recallArchiveList',
         },
       },
-      {
-        path: 'noveltySearchList',
-        name: 'FileNoveltySearchList',
-        component: () => import('@/views/resource/file/noveltySearch/list.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表',
-          auth: '/resource/file/noveltySearch',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'noveltySearch/:type/:id?',
-        name: 'FileNoveltySearchDetail',
-        component: () => import('@/views/resource/file/noveltySearch/detail.vue'),
-        meta: {
-          title: '测试校准检定方法查新记录表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/noveltySearchList',
-        },
-      },
-      {
-        path: 'methodConfirmList',
-        name: 'FileMethodConfirmList',
-        component: () => import('@/views/resource/file/methodConfirm/list.vue'),
-        meta: {
-          title: '方法确认登记表',
-          auth: '/resource/file/methodConfirm',
-          icon: 'ep:key',
-        },
-      },
-      {
-        path: 'methodConfirm/:type/:id?',
-        name: 'FileMethodConfirmDetail',
-        component: () => import('@/views/resource/file/methodConfirm/detail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
-      {
-        path: 'methodConfirm/approved/:id',
-        name: 'FileMethodConfirmDetailApproved',
-        component: () => import('@/views/resource/file/methodConfirm/approvedDetail.vue'),
-        meta: {
-          title: '方法确认登记表详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/file/methodConfirmList',
-        },
-      },
     ],
   },
   {
diff --git a/src/views/resource/technology/method/detail.vue b/src/views/resource/technology/method/detail.vue
index 615407d..b94ae0a 100644
--- a/src/views/resource/technology/method/detail.vue
+++ b/src/views/resource/technology/method/detail.vue
@@ -1,12 +1,13 @@
 <!-- 现行测试校准检定方法详情 -->
 <script name="MethodDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IFileInfo } from './method-interface'
+import type { IMethodFileInfo } from './method-interface'
 import useUserStore from '@/store/modules/user'
 import { UploadFile } from '@/api/file'
 import { addFileMethod, updateFileMethod } from '@/api/resource/fileTechnology'
-import { getPhotoUrl } from '@/api/system/tool'
 import type { IDictType } from '@/commonInterface/resource-interface'
+import FilePreviewDialog from '@/components/filePreview/filePreviewDialog.vue'
+import ImagePreviewDialog from '@/components/ImagePreview/imagePreviewDialog.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -19,48 +20,110 @@
 const title = ref('')
 
 const basicFormRef = ref()
+const refFilePreviewDlg = ref()
+const refImagePreviewDlg = ref()
 
 // 字典值
-const professGroupDict = ref<Array<IDictType>>([])
+const labCodeDict = ref<Array<IDictType>>([])
+const groupCodeDict = ref<Array<IDictType>>([])
 
-const methodFileInfo = ref<IFileInfo>({
+const methodFileInfo = ref<IMethodFileInfo>({
   id: '',
+  labCode: '',
+  labCodeName: '',
+  groupCode: '',
+  groupCodeName: '',
   fileNo: '',
   fileName: '',
   fileDistributeNo: '',
-  professionalGroup: '',
-  professionalGroupName: '',
-  versionNo: '',
   activeDate: '',
   createUserId: '',
   createUserName: '',
   createTime: '',
-  changeFormId: '',
   environmentRequire: '',
+  transmissionParams: '',
+  temperatureLowLimit: '',
+  temperatureHighLimit: '',
+  humidityLowLimit: '',
+  humidityHighLimit: '',
   remark: '',
   file: '',
 })
 
+const temperatureLowEnable = ref<boolean>(true)
+const temperatureHighEnable = ref<boolean>(true)
+const humidityLowEnable = ref<boolean>(true)
+const humidityHighEnable = ref<boolean>(true)
+
+const numberValidator = (rule: any, value: any, callback: any) => {
+  const floatReg = /^(\-|\+)?\d+(\.\d+)?$/
+  if (floatReg.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('请输入数字'))
+  }
+}
+
 const methodFileRules = ref({
+  labCode: [{ required: true, message: '实验室不能为空，请选择', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空，请选择', trigger: ['change', 'blur'] }],
   fileNo: [{ required: true, message: '文件编号不能为空', trigger: 'blur' }],
   fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
-  professionalGroup: [{ required: true, message: '专业组不能为空，请选择', trigger: ['change', 'blur'] }],
   fileDistributeNo: [{ required: true, message: '文件发放编号不能为空', trigger: 'blur' }],
-  versionNo: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+  transmissionParams: [{ required: true, message: '开展量传参数不能为空', trigger: 'blur' }],
   activeDate: [{ required: true, message: '启用时间不能为空，请选择', trigger: 'blur' }],
-  environmentRequire: [{ required: true, message: '环境条件要求不能为空' }],
+  environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
   file: [{ required: true, message: '文件附件不能为空，请选择一个文件上传', trigger: 'blur' }],
+  temperatureLowLimit: [{ required: true, message: '温度要求下限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  temperatureHighLimit: [{ required: true, message: '温度要求上限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  humidityLowLimit: [{ required: true, message: '湿度要求下限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
+  humidityHighLimit: [{ required: true, message: '湿度要求上限不能为空', trigger: 'blur' }, { validator: numberValidator, trigger: 'blur' }],
 }) // 表单验证规则
 
-const minioFileUrl = ref<string>('')
-
 // 逻辑
-
 const resetForm = () => {
   sessionStorage.removeItem('methodFileInfo') // 返回列表时 将缓存中的数据删除
   router.go(-1)
 }
 
+// 验证温度要求的逻辑
+const validateTemperatureLimit = () => {
+  if (temperatureLowEnable.value === false && temperatureHighEnable.value === false) {
+    ElMessage.warning('温度上下限阈值不能同时为空，请选择')
+    return false
+  }
+
+  if (temperatureLowEnable.value === true && temperatureHighEnable.value === true) {
+    const lowVal = parseFloat(methodFileInfo.value.temperatureLowLimit)
+    const highVal = parseFloat(methodFileInfo.value.temperatureHighLimit)
+    if (lowVal >= highVal) {
+      ElMessage.warning('温度下限阈值不能超过上限阈值')
+      return false
+    }
+  }
+
+  return true
+}
+
+const validateHumidityLimit = () => {
+  if (humidityLowEnable.value === false && humidityHighEnable.value === false) {
+    ElMessage.warning('湿度上下限阈值不能同时为空，请选择')
+    return false
+  }
+
+  if (humidityLowEnable.value === true && humidityHighEnable.value === true) {
+    const lowVal = parseFloat(methodFileInfo.value.humidityLowLimit)
+    const highVal = parseFloat(methodFileInfo.value.humidityHighLimit)
+    if (lowVal >= highVal) {
+      ElMessage.warning('湿度下限阈值不能超过上限阈值')
+      return false
+    }
+  }
+
+  return true
+}
+
 // 添加
 const saveFileSystemForm = () => {
   // 将创建时间改为提交的时间
@@ -98,6 +161,17 @@
 const saveForm = async () => {
   if (!basicFormRef) { return }
 
+  let succ = false
+  succ = validateTemperatureLimit()
+  if (succ === false) {
+    return
+  }
+
+  succ = validateHumidityLimit()
+  if (succ === false) {
+    return
+  }
+
   await basicFormRef.value.validate((valid: boolean, fields: any) => {
     if (valid === true) {
       ElMessageBox.confirm(
@@ -143,13 +217,14 @@
 }
 
 // 预览文件
-const previewFileSystem = (url: string) => {
-  console.log(url)
-}
-
-// 弹出选择文件更改单窗口
-const selectChangeForm = () => {
-
+const openFilePreviewDialog = (filename: string) => {
+// 手动新增的
+  if (filename.lastIndexOf('.pdf') > 0) {
+    refFilePreviewDlg.value.initDialog(filename)
+  }
+  else {
+    refImagePreviewDlg.value.initDialog(filename)
+  }
 }
 
 const initDialog = (params: any) => {
@@ -172,6 +247,18 @@
       id.value = params.id
 
       methodFileInfo.value = JSON.parse(sessionStorage.getItem('methodFileInfo')!)
+      if (methodFileInfo.value.temperatureLowLimit === '') {
+        temperatureLowEnable.value = false
+      }
+      if (methodFileInfo.value.temperatureHighLimit === '') {
+        temperatureHighEnable.value = false
+      }
+      if (methodFileInfo.value.humidityLowLimit === '') {
+        humidityLowEnable.value = false
+      }
+      if (methodFileInfo.value.humidityHighLimit === '') {
+        humidityHighEnable.value = false
+      }
 
       break
     case 'detail':
@@ -187,31 +274,53 @@
   }
 }
 
-// 监听 显示中文 立即监听
-watch(() => methodFileInfo.value.professionalGroup, (newVal) => {
-  if (professGroupDict.value.length === 0) {
-    professGroupDict.value = JSON.parse(sessionStorage.getItem('bizGroupCode')!)
+// 获取字典值
+const getLabCodeDict = () => {
+  if (sessionStorage.getItem('bizLabCode') !== null && sessionStorage.getItem('bizLabCode') !== '') {
+    labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCode')!)
   }
-  const targetList = professGroupDict.value.filter(item => item.value === newVal)
-  if (targetList.length > 0) {
-    methodFileInfo.value.professionalGroupName = targetList[0].name
+}
+const getGroupCodeDict = () => {
+  if (sessionStorage.getItem('bizGroupCode') !== null && sessionStorage.getItem('bizGroupCode') !== '') {
+    groupCodeDict.value = JSON.parse(sessionStorage.getItem('bizGroupCode')!)
   }
-  else {
-    methodFileInfo.value.professionalGroupName = ''
-  }
-}, { immediate: true })
+}
 
-watch(() => methodFileInfo.value.file, (newVal) => {
-  if (newVal !== '') {
-    getPhotoUrl(newVal).then((res) => {
-      if (res.code === 200) {
-        minioFileUrl.value = res.data
-      }
-    })
+const initDict = () => {
+  getLabCodeDict()
+  getGroupCodeDict()
+}
+
+watch(() => temperatureLowEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择温度下限时 清除下限值
+    methodFileInfo.value.temperatureLowLimit = ''
+  }
+})
+
+watch(() => temperatureHighEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择温度上限时 清除上限值
+    methodFileInfo.value.temperatureHighLimit = ''
+  }
+})
+
+watch(() => humidityLowEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择湿度下限时 清除下限值
+    methodFileInfo.value.humidityLowLimit = ''
+  }
+})
+
+watch(() => humidityHighEnable.value, (newVal: boolean) => {
+  if (newVal === false) {
+    // 当取消选择湿度上限时 清除上限值
+    methodFileInfo.value.humidityHighLimit = ''
   }
 })
 
 onMounted(async () => {
+  initDict()
   initDialog(route.query)
 })
 </script>
@@ -232,22 +341,45 @@
         <el-row :gutter="24">
           <!-- 第一行 第一列 -->
           <el-col :span="6">
-            <el-form-item label="文件编号" prop="fileNo">
-              <el-input v-model="methodFileInfo.fileNo" placeholder="请输入文件编号" tabindex="1" :clearable="true" :disabled="type === 'detail'" />
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="methodFileInfo.labCode" placeholder="请选择实验室" tabindex="1" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
             </el-form-item>
 
-            <el-form-item label="专业组" prop="professionalGroup">
-              <el-select v-model="methodFileInfo.professionalGroup" placeholder="请选择专业组" tabindex="5" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
-                <el-option v-for="dict in professGroupDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-              <el-input v-model="methodFileInfo.professionalGroupName" type="hidden" />
+            <el-form-item label="文件编号" prop="fileNo">
+              <el-input v-model="methodFileInfo.fileNo" placeholder="请输入文件编号" tabindex="3" :clearable="true" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
 
           <!-- 第一行 第二列 -->
           <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="methodFileInfo.groupCode" placeholder="请选择部门" tabindex="2" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="文件发放编号" prop="fileDistributeNo">
-              <el-input v-model="methodFileInfo.fileDistributeNo" :clearable="true" placeholder="请输入文件发放编号" tabindex="2" :disabled="type === 'detail'" />
+              <el-input v-model="methodFileInfo.fileDistributeNo" :clearable="true" placeholder="请输入文件发放编号" tabindex="4" :disabled="type === 'detail'" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model="methodFileInfo.createUserName" :disabled="true" />
+            </el-form-item>
+
+            <el-form-item label="文件名称" prop="fileName">
+              <el-input v-model="methodFileInfo.fileName" :clearable="true" placeholder="请输入文件名称" tabindex="5" :disabled="type === 'detail'" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model="methodFileInfo.createTime" :disabled="true" />
             </el-form-item>
 
             <el-form-item label="启用时间" prop="activeDate">
@@ -259,42 +391,73 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
 
-          <!-- 第一行 第三列 -->
-          <el-col :span="6">
-            <el-form-item label="文件名称" prop="fileName">
-              <el-input v-model="methodFileInfo.fileName" :clearable="true" placeholder="请输入文件名称" tabindex="3" :disabled="type === 'detail'" />
-            </el-form-item>
-
-            <el-form-item label="创建人">
-              <el-input v-model="methodFileInfo.createUserName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-
-          <!-- 第一行 第四列 -->
-          <el-col :span="6">
-            <el-form-item label="版本号" prop="versionNo">
-              <el-input v-model="methodFileInfo.versionNo" :clearable="true" placeholder="请输入文件版本号" tabindex="4" :disabled="type === 'detail'" />
-            </el-form-item>
-
-            <el-form-item label="创建时间">
-              <el-input v-model="methodFileInfo.createTime" :disabled="true" />
+        <!-- 第二行 -->
+        <el-row :gutter="24">
+          <!-- 第一列 -->
+          <el-col :span="12">
+            <el-form-item label="开展量传参数" prop="transmissionParams">
+              <el-input v-model="methodFileInfo.transmissionParams" placeholder="请输入开展的量传参数" tabindex="7" :clearable="true" :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
 
-        <!-- 第二行 -->
-        <el-row v-if="type === 'update'" :gutter="24">
+        <el-row :gutter="24">
           <!-- 第一列 -->
           <el-col :span="12">
-            <el-form-item label="文件更改申请单">
-              <el-input v-model="methodFileInfo.changeFormId" placeholder="请选择文件更改申请单" tabindex="7" :clearable="true">
-                <template #append>
-                  <el-button size="small" @click="selectChangeForm">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
+            <el-form-item label="温度要求">
+              <el-checkbox v-model="temperatureLowEnable" label="下限" :disabled="type === 'detail'" style="margin: 0 10px;" />
+              <el-form-item v-if="temperatureLowEnable === true" prop="temperatureLowLimit">
+                <el-input
+                  v-model="methodFileInfo.temperatureLowLimit" placeholder="" tabindex="8"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ℃
+                  </template>
+                </el-input>
+              </el-form-item>
+
+              <el-checkbox v-model="temperatureHighEnable" label="上限" :disabled="type === 'detail'" style="margin: 0 10px; margin-left: 100px;" />
+              <el-form-item v-if="temperatureHighEnable === true" prop="temperatureHighLimit">
+                <el-input
+                  v-model="methodFileInfo.temperatureHighLimit" placeholder="" tabindex="9"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ℃
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="湿度要求">
+              <el-checkbox v-model="humidityLowEnable" label="下限" :disabled="type === 'detail'" style="margin: 0 10px;" />
+              <el-form-item v-if="humidityLowEnable === true" prop="humidityLowLimit">
+                <el-input
+                  v-model="methodFileInfo.humidityLowLimit" placeholder="" tabindex="10"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ％
+                  </template>
+                </el-input>
+              </el-form-item>
+
+              <el-checkbox v-model="humidityHighEnable" label="上限" :disabled="type === 'detail'" style="margin: 0 10px; margin-left: 100px;" />
+              <el-form-item v-if="humidityHighEnable === true" prop="humidityHighLimit">
+                <el-input
+                  v-model="methodFileInfo.humidityHighLimit" placeholder="" tabindex="11"
+                  :clearable="true" :disabled="type === 'detail'" style="width: 150px;"
+                >
+                  <template #append>
+                    ％
+                  </template>
+                </el-input>
+              </el-form-item>
             </el-form-item>
           </el-col>
         </el-row>
@@ -303,7 +466,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="环境条件要求" prop="environmentRequire">
-              <el-input v-model="methodFileInfo.environmentRequire" placeholder="请输入环境条件要求" tabindex="8" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="5" />
+              <el-input v-model="methodFileInfo.environmentRequire" placeholder="请输入环境条件要求" tabindex="12" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="5" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -312,7 +475,7 @@
         <el-row :gutter="24">
           <el-col :span="18">
             <el-form-item label="备注">
-              <el-input v-model="methodFileInfo.remark" placeholder="请输入备注信息" tabindex="9" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="2" />
+              <el-input v-model="methodFileInfo.remark" placeholder="请输入备注信息" tabindex="13" type="textarea" :clearable="true" :disabled="type === 'detail'" :rows="2" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -322,9 +485,9 @@
           <el-col :span="20">
             <el-form-item label="文件附件" prop="file">
               <el-input v-model="methodFileInfo.file" type="hidden" />
-              <!-- <el-link :href="minioFileUrl" :underline="false" target="_blank" @click="previewFileSystem(minioFileUrl)"> -->
-              {{ methodFileInfo.file }}
-              <!-- </el-link> -->
+              <el-link @click="openFilePreviewDialog(methodFileInfo.file)">
+                {{ methodFileInfo.file }}
+              </el-link>
 
               <el-upload
                 :show-file-list="false"
@@ -345,6 +508,35 @@
         </el-row>
       </el-form>
     </detail-page>
+
+    <file-preview-dialog ref="refFilePreviewDlg" />
+    <image-preview-dialog ref="refImagePreviewDlg" />
   </app-container>
 </template>
 
+<style scoped>
+.my-el-input-number[data-unit] {
+  --el-input-number-unit-offset-x: 15px; /* 不显示控制按钮 */
+
+  /* --el-input-number-unit-offset-x: 35px; /* 显示控制按钮 */
+
+  position: relative;
+}
+
+.my-el-input-number[data-unit]::after {
+  content: attr(data-unit);
+  height: 100%;
+  display: flex;
+  align-items: center;
+  position: absolute;
+  top: 0;
+  right: var(--el-input-number-unit-offset-x);
+  color: #999;
+}
+
+.my-el-input-number[data-unit] .el-input__inner {
+  padding-left: 30px;
+  padding-right: calc(var(--el-input-number-unit-offset-x) + 12px);
+}
+</style>
+
diff --git a/src/views/resource/technology/method/list.vue b/src/views/resource/technology/method/list.vue
index 115033f..65375fe 100644
--- a/src/views/resource/technology/method/list.vue
+++ b/src/views/resource/technology/method/list.vue
@@ -1,39 +1,54 @@
 <!-- 现行测试校准检定方法列表 -->
 <script name="MethodList" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IFileInfo, IListQuery } from './method-interface'
+import type { DateModelType } from 'element-plus'
+import type { IListQuery, IMethodFileInfo } from './method-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { delFileMethod, getFileMethodList } from '@/api/resource/fileTechnology'
 import type { IDictType } from '@/commonInterface/resource-interface'
+import FilePreviewDialog from '@/components/filePreview/filePreviewDialog.vue'
+import ImagePreviewDialog from '@/components/ImagePreview/imagePreviewDialog.vue'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
-const professGroupDict = ref<Array<IDictType>>([])
+const labCodeDict = ref<Array<IDictType>>([])
+const groupCodeDict = ref<Array<IDictType>>([])
+const noveltyStatusDict = ref<Array<IDictType>>([])
+
+const refFilePreviewDlg = ref()
+const refImagePreviewDlg = ref()
 
 // 查询条件
 const searchQuery = ref<IListQuery>({
+  labCode: '',
+  groupCode: '',
   fileNo: '', // 文件编号
   fileName: '', // 文件名
   fileDistributeNo: '', // 文件发放号
-  professionalGroup: '', // 专业组
+  activeDateStart: '', //
+  activeDateEnd: '',
+  noveltyStatus: '',
   offset: 1,
   limit: 20,
 })
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 const total = ref(0) // 数据条数
 const loadingTable = ref(false) // 表格loading
 
 // 表头
 const columns = ref<TableColumn[]>([
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '100' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '150' },
   { text: '文件编号', value: 'fileNo', align: 'center', width: '180' },
-  { text: '文件发放号', value: 'fileDistributeNo', align: 'center' },
+  { text: '文件发放号', value: 'fileDistributeNo', align: 'center', width: '180' },
   { text: '文件名称', value: 'fileName', align: 'center' },
-  { text: '版本号', value: 'versionNo', align: 'center', width: '140' },
-  { text: '专业组', value: 'professionalGroupName', align: 'center', width: '140' },
-  { text: '启用时间', value: 'activeDateStr', align: 'center', width: '140' },
+  { text: '启用时间', value: 'activeDateStr', align: 'center', width: '120' },
+  { text: '查新状态', value: 'noveltyStatusName', align: 'center', width: '160' },
+  { text: '最新查新时间', value: 'latestNoveltyDate', align: 'center', width: '120' },
 ])
-const methodFileList = ref<Array<IFileInfo>>([]) // 表格数据
+const methodFileList = ref<Array<IMethodFileInfo>>([]) // 表格数据
 
 // 逻辑
 // 跳转到新建的页面
@@ -47,7 +62,7 @@
 }
 
 // 详情
-const detail = (row: IFileInfo) => {
+const detail = (row: IMethodFileInfo) => {
   sessionStorage.setItem('fileInfo', JSON.stringify(row))
   router.push({
     query: {
@@ -58,7 +73,7 @@
 }
 
 // 编辑
-const updateById = (row: IFileInfo) => {
+const updateById = (row: IMethodFileInfo) => {
   sessionStorage.setItem('methodFileInfo', JSON.stringify(row))
   router.push({
     query: {
@@ -110,18 +125,23 @@
 // 重置
 const reset = () => {
   searchQuery.value = {
+    labCode: '',
+    groupCode: '',
     fileNo: '', // 文件编号
     fileName: '', // 文件名
     fileDistributeNo: '', // 文件发放号
-    professionalGroup: '', // 专业组
+    activeDateStart: '', //
+    activeDateEnd: '',
+    noveltyStatus: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 删除
-const deleteById = (row: IFileInfo) => {
+const deleteById = (row: IMethodFileInfo) => {
   ElMessageBox.confirm(`是否删除文件 ${row.fileName}`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -139,18 +159,58 @@
   })
 }
 
-// 获取文件类别字典值
-const getProfessGroupDict = () => {
-  getDictByCode('bizGroupCode').then((res) => {
+const openFilePreviewDialog = (row: IMethodFileInfo) => {
+// 手动新增的
+  if (row.file.lastIndexOf('.pdf') > 0) {
+    refFilePreviewDlg.value.initDialog(row.file)
+  }
+  else {
+    refImagePreviewDlg.value.initDialog(row.file)
+  }
+}
+
+// 获取字典值
+const getLabCodeDict = () => {
+  getDictByCode('bizLabCode').then((res) => {
     if (res.code === 200) {
-      professGroupDict.value = res.data
-      sessionStorage.setItem('bizGroupCode', JSON.stringify(professGroupDict.value))
+      labCodeDict.value = res.data
+      sessionStorage.setItem('bizLabCode', JSON.stringify(labCodeDict.value))
     }
   })
 }
-const getDict = async () => {
-  getProfessGroupDict()
+const getGroupCodeDict = () => {
+  getDictByCode('bizGroupCode').then((res) => {
+    if (res.code === 200) {
+      groupCodeDict.value = res.data
+      sessionStorage.setItem('bizGroupCode', JSON.stringify(groupCodeDict.value))
+    }
+  })
 }
+const getNoveltyStatusDict = () => {
+  getDictByCode('bizNoveltyStatus').then((res) => {
+    if (res.code === 200) {
+      noveltyStatusDict.value = res.data
+      sessionStorage.setItem('bizNoveltyStatus', JSON.stringify(noveltyStatusDict.value))
+    }
+  })
+}
+
+const getDict = async () => {
+  getLabCodeDict()
+  getGroupCodeDict()
+  getNoveltyStatusDict()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.activeDateStart = dayjs(val[0]).format('YYYY-MM-DD HH:mm:ss') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD HH:mm:ss')
+    searchQuery.value.activeDateEnd = dayjs(val[1]).format('YYYY-MM-DD HH:mm:ss') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    searchQuery.value.activeDateStart = ''
+    searchQuery.value.activeDateEnd = ''
+  }
+})
 
 onMounted(async () => {
   await getDict()
@@ -162,24 +222,37 @@
   <app-container>
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.labCode" placeholder="实验室" clearable>
+          <el-option v-for="item in labCodeDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.groupCode" placeholder="部门" clearable>
+          <el-option v-for="item in groupCodeDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.fileNo" placeholder="文件编号" clearable />
       </search-item>
-      <search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.fileDistributeNo" placeholder="文件发放编号" clearable />
       </search-item>
-      <search-item>
+      <search-item width="162px">
         <el-input v-model="searchQuery.fileName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.professionalGroup" placeholder="专业组" clearable>
-          <el-option v-for="item in professGroupDict" :key="item.id" :value="item.value" :label="item.name" />
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="启用时间（开始）" end-placeholder="启用时间（结束）" />
+      </search-item>
+      <search-item width="162px">
+        <el-select v-model="searchQuery.noveltyStatus" placeholder="查新状态" clearable>
+          <el-option v-for="item in noveltyStatusDict" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="现行测试校准检定方法文件列表">
+    <table-container title="方法文件列表">
       <!-- 表头区域 -->
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm(`/resource/technology/method/add`)" icon="icon-add" title="新建" @click="addMethodFile" />
@@ -200,6 +273,13 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column label="附件" align="center" width="300">
+            <template #default="scope">
+              <el-link @click="openFilePreviewDialog(scope.row)">
+                {{ scope.row.file }}
+              </el-link>
+            </template>
+          </el-table-column>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
@@ -216,5 +296,8 @@
         </template>
       </normal-table>
     </table-container>
+
+    <file-preview-dialog ref="refFilePreviewDlg" />
+    <image-preview-dialog ref="refImagePreviewDlg" />
   </app-container>
 </template>
diff --git a/src/views/resource/technology/method/method-interface.ts b/src/views/resource/technology/method/method-interface.ts
index 0623e81..3442454 100644
--- a/src/views/resource/technology/method/method-interface.ts
+++ b/src/views/resource/technology/method/method-interface.ts
@@ -1,29 +1,41 @@
 // 列表查询参数接口
 export interface IListQuery {
+  labCode: string // 实验室编号
+  groupCode: string // 组别编号（部门）
   fileNo: string // 文件编号
   fileName: string // 文件名
   fileDistributeNo: string // 文件发放号
-  professionalGroup: string // 专业组（字典值）
+  activeDateStart: string // 启用时间（开始）
+  activeDateEnd: string // 启用时间（结束）
+  noveltyStatus: string // 查新状态（字典值）
   offset: number
   limit: number
   sort?: string
   order?: string
 }
 
-export interface IFileInfo {
+export interface IMethodFileInfo {
   id: string
+  labCode: string
+  labCodeName?: string
+  groupCode: string
+  groupCodeName: string
   fileNo: string
   fileName: string
   fileDistributeNo: string
-  professionalGroup: string
-  professionalGroupName: string
-  versionNo: string
   activeDate: string
+  noveltyStatus?: string
+  noveltyStatusName?: string
+  latestNoveltyDate?: string
   createUserId?: string
   createUserName?: string
   createTime?: string
   environmentRequire: string
-  changeFormId?: string
+  transmissionParams: string
+  temperatureLowLimit: string
+  temperatureHighLimit: string
+  humidityLowLimit: string
+  humidityHighLimit: string
   remark?: string
   file: string
 }