diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 0789e96..fafdb27 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,197 @@
+<script lang="ts" setup name="ListPlan">
+import { reactive, ref } from 'vue'
+const listQuery = {
+  supplierNo: '',
+  supplierName: '',
+  businessContent: '',
+  offset: 1,
+  limit: 10,
+}
+const list = ref([])
+const total = ref(0)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+const searchList = () => {}
+const clearList = () => {}
+const buttons = ref(['新建', '导出', '打印'])
+const handleEdit = (index: string, row: object, type: string) => {}
+const handleDelete = (index: string, row: object) => {}
+const handelClick = (text: string) => {}
+const handleSelectionChange = () => {}
+const handleSizeChange = (val: number) => {}
+const handleCurrentChange = (val: number) => {}
+</script>
+
 <template>
-  <div>培训计划111</div>
+  <app-container>
+    <search-area
+      type="seperate"
+      need-clear
+      :icon="false"
+      @search="searchList"
+      @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierNo"
+          placeholder="溯源供方编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierName"
+          placeholder="溯源供方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.businessContent"
+          placeholder="业务内容"
+          clearable
+        />
+      </search-item>
+    </search-area>
+  </app-container>
+  <table-container>
+    <div class="table-top">
+      <h3 />
+      <div>
+        <el-button
+          v-for="(item, index) in buttons"
+          :key="index"
+          type="primary"
+          @click="handelClick(item)"
+        >
+          {{ item }}
+        </el-button>
+        <!-- <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange" /> -->
+      </div>
+    </div>
+    <el-table
+      :data="list"
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :label="column.text"
+        :prop="column.value"
+        :width="column.width"
+        align="center"
+      />
+      <el-table-column align="center" label="操作" width="200">
+        <template #default="scope">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(scope.$index, scope.row, '编辑')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(scope.$index, scope.row, '详情')"
+          >
+            详情
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            二维码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </table-container>
+  <div class="pagination">
+    <el-pagination
+      v-model:current-page="listQuery.offset"
+      v-model:page-size="listQuery.limit"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.table-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 0789e96..fafdb27 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,197 @@
+<script lang="ts" setup name="ListPlan">
+import { reactive, ref } from 'vue'
+const listQuery = {
+  supplierNo: '',
+  supplierName: '',
+  businessContent: '',
+  offset: 1,
+  limit: 10,
+}
+const list = ref([])
+const total = ref(0)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+const searchList = () => {}
+const clearList = () => {}
+const buttons = ref(['新建', '导出', '打印'])
+const handleEdit = (index: string, row: object, type: string) => {}
+const handleDelete = (index: string, row: object) => {}
+const handelClick = (text: string) => {}
+const handleSelectionChange = () => {}
+const handleSizeChange = (val: number) => {}
+const handleCurrentChange = (val: number) => {}
+</script>
+
 <template>
-  <div>培训计划111</div>
+  <app-container>
+    <search-area
+      type="seperate"
+      need-clear
+      :icon="false"
+      @search="searchList"
+      @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierNo"
+          placeholder="溯源供方编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierName"
+          placeholder="溯源供方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.businessContent"
+          placeholder="业务内容"
+          clearable
+        />
+      </search-item>
+    </search-area>
+  </app-container>
+  <table-container>
+    <div class="table-top">
+      <h3 />
+      <div>
+        <el-button
+          v-for="(item, index) in buttons"
+          :key="index"
+          type="primary"
+          @click="handelClick(item)"
+        >
+          {{ item }}
+        </el-button>
+        <!-- <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange" /> -->
+      </div>
+    </div>
+    <el-table
+      :data="list"
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :label="column.text"
+        :prop="column.value"
+        :width="column.width"
+        align="center"
+      />
+      <el-table-column align="center" label="操作" width="200">
+        <template #default="scope">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(scope.$index, scope.row, '编辑')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(scope.$index, scope.row, '详情')"
+          >
+            详情
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            二维码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </table-container>
+  <div class="pagination">
+    <el-pagination
+      v-model:current-page="listQuery.offset"
+      v-model:page-size="listQuery.limit"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.table-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 0789e96..fafdb27 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,197 @@
+<script lang="ts" setup name="ListPlan">
+import { reactive, ref } from 'vue'
+const listQuery = {
+  supplierNo: '',
+  supplierName: '',
+  businessContent: '',
+  offset: 1,
+  limit: 10,
+}
+const list = ref([])
+const total = ref(0)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+const searchList = () => {}
+const clearList = () => {}
+const buttons = ref(['新建', '导出', '打印'])
+const handleEdit = (index: string, row: object, type: string) => {}
+const handleDelete = (index: string, row: object) => {}
+const handelClick = (text: string) => {}
+const handleSelectionChange = () => {}
+const handleSizeChange = (val: number) => {}
+const handleCurrentChange = (val: number) => {}
+</script>
+
 <template>
-  <div>培训计划111</div>
+  <app-container>
+    <search-area
+      type="seperate"
+      need-clear
+      :icon="false"
+      @search="searchList"
+      @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierNo"
+          placeholder="溯源供方编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierName"
+          placeholder="溯源供方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.businessContent"
+          placeholder="业务内容"
+          clearable
+        />
+      </search-item>
+    </search-area>
+  </app-container>
+  <table-container>
+    <div class="table-top">
+      <h3 />
+      <div>
+        <el-button
+          v-for="(item, index) in buttons"
+          :key="index"
+          type="primary"
+          @click="handelClick(item)"
+        >
+          {{ item }}
+        </el-button>
+        <!-- <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange" /> -->
+      </div>
+    </div>
+    <el-table
+      :data="list"
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :label="column.text"
+        :prop="column.value"
+        :width="column.width"
+        align="center"
+      />
+      <el-table-column align="center" label="操作" width="200">
+        <template #default="scope">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(scope.$index, scope.row, '编辑')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(scope.$index, scope.row, '详情')"
+          >
+            详情
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            二维码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </table-container>
+  <div class="pagination">
+    <el-pagination
+      v-model:current-page="listQuery.offset"
+      v-model:page-size="listQuery.limit"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.table-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 0789e96..fafdb27 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,197 @@
+<script lang="ts" setup name="ListPlan">
+import { reactive, ref } from 'vue'
+const listQuery = {
+  supplierNo: '',
+  supplierName: '',
+  businessContent: '',
+  offset: 1,
+  limit: 10,
+}
+const list = ref([])
+const total = ref(0)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+const searchList = () => {}
+const clearList = () => {}
+const buttons = ref(['新建', '导出', '打印'])
+const handleEdit = (index: string, row: object, type: string) => {}
+const handleDelete = (index: string, row: object) => {}
+const handelClick = (text: string) => {}
+const handleSelectionChange = () => {}
+const handleSizeChange = (val: number) => {}
+const handleCurrentChange = (val: number) => {}
+</script>
+
 <template>
-  <div>培训计划111</div>
+  <app-container>
+    <search-area
+      type="seperate"
+      need-clear
+      :icon="false"
+      @search="searchList"
+      @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierNo"
+          placeholder="溯源供方编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierName"
+          placeholder="溯源供方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.businessContent"
+          placeholder="业务内容"
+          clearable
+        />
+      </search-item>
+    </search-area>
+  </app-container>
+  <table-container>
+    <div class="table-top">
+      <h3 />
+      <div>
+        <el-button
+          v-for="(item, index) in buttons"
+          :key="index"
+          type="primary"
+          @click="handelClick(item)"
+        >
+          {{ item }}
+        </el-button>
+        <!-- <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange" /> -->
+      </div>
+    </div>
+    <el-table
+      :data="list"
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :label="column.text"
+        :prop="column.value"
+        :width="column.width"
+        align="center"
+      />
+      <el-table-column align="center" label="操作" width="200">
+        <template #default="scope">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(scope.$index, scope.row, '编辑')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(scope.$index, scope.row, '详情')"
+          >
+            详情
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            二维码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </table-container>
+  <div class="pagination">
+    <el-pagination
+      v-model:current-page="listQuery.offset"
+      v-model:page-size="listQuery.limit"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.table-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 0789e96..fafdb27 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,197 @@
+<script lang="ts" setup name="ListPlan">
+import { reactive, ref } from 'vue'
+const listQuery = {
+  supplierNo: '',
+  supplierName: '',
+  businessContent: '',
+  offset: 1,
+  limit: 10,
+}
+const list = ref([])
+const total = ref(0)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+const searchList = () => {}
+const clearList = () => {}
+const buttons = ref(['新建', '导出', '打印'])
+const handleEdit = (index: string, row: object, type: string) => {}
+const handleDelete = (index: string, row: object) => {}
+const handelClick = (text: string) => {}
+const handleSelectionChange = () => {}
+const handleSizeChange = (val: number) => {}
+const handleCurrentChange = (val: number) => {}
+</script>
+
 <template>
-  <div>培训计划111</div>
+  <app-container>
+    <search-area
+      type="seperate"
+      need-clear
+      :icon="false"
+      @search="searchList"
+      @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierNo"
+          placeholder="溯源供方编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierName"
+          placeholder="溯源供方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.businessContent"
+          placeholder="业务内容"
+          clearable
+        />
+      </search-item>
+    </search-area>
+  </app-container>
+  <table-container>
+    <div class="table-top">
+      <h3 />
+      <div>
+        <el-button
+          v-for="(item, index) in buttons"
+          :key="index"
+          type="primary"
+          @click="handelClick(item)"
+        >
+          {{ item }}
+        </el-button>
+        <!-- <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange" /> -->
+      </div>
+    </div>
+    <el-table
+      :data="list"
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :label="column.text"
+        :prop="column.value"
+        :width="column.width"
+        align="center"
+      />
+      <el-table-column align="center" label="操作" width="200">
+        <template #default="scope">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(scope.$index, scope.row, '编辑')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(scope.$index, scope.row, '详情')"
+          >
+            详情
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            二维码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </table-container>
+  <div class="pagination">
+    <el-pagination
+      v-model:current-page="listQuery.offset"
+      v-model:page-size="listQuery.limit"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.table-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 2d44769..aaa60ba 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '证书报告',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,16 +228,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 0789e96..fafdb27 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,197 @@
+<script lang="ts" setup name="ListPlan">
+import { reactive, ref } from 'vue'
+const listQuery = {
+  supplierNo: '',
+  supplierName: '',
+  businessContent: '',
+  offset: 1,
+  limit: 10,
+}
+const list = ref([])
+const total = ref(0)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+const searchList = () => {}
+const clearList = () => {}
+const buttons = ref(['新建', '导出', '打印'])
+const handleEdit = (index: string, row: object, type: string) => {}
+const handleDelete = (index: string, row: object) => {}
+const handelClick = (text: string) => {}
+const handleSelectionChange = () => {}
+const handleSizeChange = (val: number) => {}
+const handleCurrentChange = (val: number) => {}
+</script>
+
 <template>
-  <div>培训计划111</div>
+  <app-container>
+    <search-area
+      type="seperate"
+      need-clear
+      :icon="false"
+      @search="searchList"
+      @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierNo"
+          placeholder="溯源供方编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierName"
+          placeholder="溯源供方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.businessContent"
+          placeholder="业务内容"
+          clearable
+        />
+      </search-item>
+    </search-area>
+  </app-container>
+  <table-container>
+    <div class="table-top">
+      <h3 />
+      <div>
+        <el-button
+          v-for="(item, index) in buttons"
+          :key="index"
+          type="primary"
+          @click="handelClick(item)"
+        >
+          {{ item }}
+        </el-button>
+        <!-- <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange" /> -->
+      </div>
+    </div>
+    <el-table
+      :data="list"
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :label="column.text"
+        :prop="column.value"
+        :width="column.width"
+        align="center"
+      />
+      <el-table-column align="center" label="操作" width="200">
+        <template #default="scope">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(scope.$index, scope.row, '编辑')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(scope.$index, scope.row, '详情')"
+          >
+            详情
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            二维码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </table-container>
+  <div class="pagination">
+    <el-pagination
+      v-model:current-page="listQuery.offset"
+      v-model:page-size="listQuery.limit"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.table-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 2d44769..aaa60ba 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '证书报告',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,16 +228,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 0643a0d..1495ac2 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '原始记录',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '原始记录模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -200,18 +226,18 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
new file mode 100644
index 0000000..087460c
--- /dev/null
+++ b/src/api/measure/file.ts
@@ -0,0 +1,55 @@
+// 计量文件模块接口api
+import request from '../index'
+import type { fileSearchType } from '@/views/measure/file/file-interface'
+const prefix = 'meter/'
+// 文件列表(分页)
+export function listPageApi(data: fileSearchType) {
+  return request({
+    url: `${prefix}file/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function listPageDetailApi(data: object) {
+  return request({
+    url: `${prefix}file/listPage`,
+    method: 'post',
+    data,
+  })
+}
+// 废止
+export function updateApi(data: object) {
+  return request({
+    url: `${prefix}file/update`,
+    method: 'post',
+    data,
+  })
+}
+// 新建
+export function addApi(data: object) {
+  return request({
+    url: `${prefix}file/add`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function deleteApi(data: { id: string }) {
+  return request({
+    url: `${prefix}file/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 文件上传
+export function UploadFile(fileobj: any) {
+  const param = new FormData()
+  param.append('file', fileobj.file)
+  return request({
+    url: 'file/uploadFile',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
index 3d54784..65c14fe 100644
--- a/src/api/system/source.ts
+++ b/src/api/system/source.ts
@@ -7,7 +7,7 @@
 // 列表查询
 export function getSoucreList(data: object) {
   return request({
-    url: `${prefix}/supplier/listPage`,
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -34,12 +34,12 @@
 // 省级联动
 export function getSoucreListlevelType(pid: string) {
   return request({
-    url: `/ext/area/list?pid=${pid}`,
+    url: `/sys/area/list?pid=${pid}`,
     method: 'get',
   })
 }
 
-// 查看详情
+// 新增数据
 export function getSoucreListAdd(data: object) {
   return request({
     url: `${prefix}/supplier/add`,
@@ -47,3 +47,20 @@
     data,
   })
 }
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/assets/images/login-image/banner.png b/src/assets/images/login-image/banner.png
new file mode 100644
index 0000000..99d4983
--- /dev/null
+++ b/src/assets/images/login-image/banner.png
Binary files differ
diff --git a/src/assets/images/login-image/bg.png b/src/assets/images/login-image/bg.png
new file mode 100644
index 0000000..d0db502
--- /dev/null
+++ b/src/assets/images/login-image/bg.png
Binary files differ
diff --git a/src/assets/images/login-image/frame.png b/src/assets/images/login-image/frame.png
new file mode 100644
index 0000000..452bd65
--- /dev/null
+++ b/src/assets/images/login-image/frame.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 917956e..1833bd3 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -28,6 +28,10 @@
     type: String,
     default: '',
   }, // 按钮及输入框大小
+  icon: {
+    type: Boolean,
+    default: true,
+  }, // 是否显示图标
 })
 // 抛出事件
 const emit = defineEmits(['search', 'clear', 'toggleMore'])
@@ -80,13 +84,13 @@
       <slot name="btns" />
     </div>
     <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="Search" class="search-btn" @click="search">
+      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
         搜索
       </el-button>
       <el-button v-if="needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
         高级检索
       </el-button>
-      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="icon ? 'el-icon-delete' : ''" @click="clearInput">
         重置
       </el-button>
     </div>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 270f1bb..adfed29 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -59,15 +59,15 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <Header />
+      <header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
-          <MainSidebar />
-          <SubSidebar />
+          <main-sidebar />
+          <sub-sidebar />
         </div>
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
         <div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
-          <Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
+          <topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
           <div class="main">
             <router-view v-slot="{ Component, route }">
               <transition name="main" mode appear>
@@ -77,14 +77,14 @@
               </transition>
             </router-view>
           </div>
-          <Copyright />
+          <copyright />
         </div>
       </div>
       <el-backtop :right="20" :bottom="20" title="回到顶部" />
     </div>
-    <Search />
-    <AppSetting />
-    <HotkeysIntro />
+    <search />
+    <app-setting />
+    <hotkeys-intro />
   </div>
 </template>
 
@@ -182,7 +182,7 @@
       height: 100%;
       flex: auto;
       position: relative;
-      overflow: hidden;
+      // overflow: hidden;
       transition: 0.3s;
     }
 
diff --git a/src/main.ts b/src/main.ts
index 50dbe9f..657d9f2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
-import { has } from 'lodash-es'
+import print from 'vue3-print-nb'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
@@ -15,13 +15,14 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
-
+// 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
 
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
+app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
 app.use(router)
diff --git a/src/views/login.vue b/src/views/login.vue
index 17dbad3..1f1a316 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,8 @@
 
 const userStore = useUserStore()
 
-const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
+const banner = new URL('../assets/images/login-banner.png', import.meta.url)
+  .href
 const title = import.meta.env.VITE_APP_TITLE
 
 // 表单类型，login 登录，reset 重置密码
@@ -56,9 +57,7 @@
   remember: !!localStorage.login_username,
 })
 const loginRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -67,36 +66,40 @@
 
 // 处理登录
 function handleLogin() {
-  loginFormRef.value && loginFormRef.value.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      // 表单对象
-      const finalForm = {
-        sid: sid.value,
-        username: loginForm.value.username,
-        password: '',
-        kaptcha: loginForm.value.kaptcha,
+  loginFormRef.value
+    && loginFormRef.value.validate(async (valid) => {
+      if (valid) {
+        loading.value = true
+        // 表单对象
+        const finalForm = {
+          sid: sid.value,
+          username: loginForm.value.username,
+          password: '',
+          kaptcha: loginForm.value.kaptcha,
+        }
+        // 加密
+        finalForm.password = await RSAencrypt(loginForm.value.password)
+        userStore
+          .login(finalForm)
+          .then(() => {
+            ElMessage({
+              message: '登录成功',
+              type: 'success',
+            })
+            loading.value = false
+            if (loginForm.value.remember) {
+              localStorage.setItem('login_username', loginForm.value.username)
+            }
+            else {
+              localStorage.removeItem('login_username')
+            }
+            router.push(redirect.value)
+          })
+          .catch(() => {
+            loading.value = false
+          })
       }
-      // 加密
-      finalForm.password = await RSAencrypt(loginForm.value.password)
-      userStore.login(finalForm).then(() => {
-        ElMessage({
-          message: '登录成功',
-          type: 'success',
-        })
-        loading.value = false
-        if (loginForm.value.remember) {
-          localStorage.setItem('login_username', loginForm.value.username)
-        }
-        else {
-          localStorage.removeItem('login_username')
-        }
-        router.push(redirect.value)
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    })
 }
 // 注册
 const registerFormRef = ref<FormInstance>()
@@ -109,12 +112,8 @@
   checkPassword: '',
 })
 const registerRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   password: [
     { required: true, trigger: 'blur', message: '请输入密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -138,11 +137,12 @@
     message: '注册模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  registerFormRef.value && registerFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  registerFormRef.value
+    && registerFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 // 重置密码
@@ -154,12 +154,8 @@
   newPassword: '',
 })
 const resetRules = ref<FormRules>({
-  username: [
-    { required: true, trigger: 'blur', message: '请输入用户名' },
-  ],
-  captcha: [
-    { required: true, trigger: 'blur', message: '请输入验证码' },
-  ],
+  username: [{ required: true, trigger: 'blur', message: '请输入用户名' }],
+  captcha: [{ required: true, trigger: 'blur', message: '请输入验证码' }],
   newPassword: [
     { required: true, trigger: 'blur', message: '请输入新密码' },
     { min: 6, max: 18, trigger: 'blur', message: '密码长度为6到18位' },
@@ -170,11 +166,12 @@
     message: '重置密码模块仅提供界面演示，无实际功能，需开发者自行扩展',
     type: 'warning',
   })
-  resetFormRef.value && resetFormRef.value.validate((valid) => {
-    if (valid) {
-      // 这里编写业务代码
-    }
-  })
+  resetFormRef.value
+    && resetFormRef.value.validate((valid) => {
+      if (valid) {
+        // 这里编写业务代码
+      }
+    })
 }
 
 function showPassword(passwordEl: HTMLElement | undefined) {
@@ -197,21 +194,34 @@
 
 <template>
   <div>
+    <div class="bg-top-banner">
+      华东计量综合系统
+    </div>
     <div class="bg-banner" />
     <div id="login-box">
-      <div class="login-banner">
-        <div class="logo" />
-        <img :src="banner" class="banner">
-      </div>
-      <el-form v-show="formType === 'login'" ref="loginFormRef" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on">
+      <el-form
+        v-show="formType === 'login'"
+        ref="loginFormRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+      >
         <div class="title-container">
           <h3 class="title">
-            欢迎来到 {{ title }} !
+            用户登录
           </h3>
         </div>
         <div>
           <el-form-item prop="username">
-            <el-input ref="name" v-model="loginForm.username" placeholder="用户名" text tabindex="1" autocomplete="on">
+            <el-input
+              ref="name"
+              v-model="loginForm.username"
+              placeholder="用户名"
+              text
+              tabindex="1"
+              autocomplete="on"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:user" />
@@ -220,7 +230,15 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
+            <el-input
+              ref="loginPasswordRef"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              tabindex="2"
+              autocomplete="on"
+              @keyup.enter="handleLogin"
+            >
               <template #prefix>
                 <el-icon>
                   <svg-icon name="ep:lock" />
@@ -228,7 +246,10 @@
               </template>
               <template #suffix>
                 <el-icon>
-                  <svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
+                  <svg-icon
+                    :name="passwordType === 'password' ? 'eye' : 'eye-open'"
+                    @click="showPassword(loginPasswordRef)"
+                  />
                 </el-icon>
               </template>
             </el-input>
@@ -239,12 +260,26 @@
             记住我
           </el-checkbox>
         </div>
-        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          style="width: 100%;"
+          @click.prevent="handleLogin"
+        >
           登录
         </el-button>
-        <div v-if="showKaptcha" style="margin-top: 20px; margin-bottom: -20px; text-align: center;">
+        <div
+          v-if="showKaptcha"
+          style="margin-top: 20px; margin-bottom: -20px; text-align: center;"
+        >
           <el-divider>演示账号一键登录</el-divider>
-          <el-button type="primary" size="small" plain @click="testusername('admin')">
+          <el-button
+            type="primary"
+            size="small"
+            plain
+            @click="testusername('admin')"
+          >
             admin
           </el-button>
           <el-button size="small" plain @click="testusername('test')">
@@ -305,12 +340,30 @@
   display: none;
 }
 
+.bg-top-banner {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 17vh;
+  z-index: 999;
+  line-height: 10vh;
+  text-align: center;
+  font-size: 30px;
+  color: #fff;
+  background:
+    url("../assets/images/login-image/banner.png") no-repeat
+    center / cover;
+}
+
 .bg-banner {
   position: fixed;
   z-index: 0;
   width: 100%;
   height: 100%;
-  background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  // background: radial-gradient(circle at center, var(--el-fill-color-lighter), var(--el-bg-color-page));
+  background:
+    url("../assets/images/login-image/bg.png") no-repeat center /
+    cover;
 }
 
 #login-box {
@@ -320,7 +373,8 @@
   top: 50%;
   left: 50%;
   transform: translateX(-50%) translateY(-50%);
-  background-color: var(--el-bg-color);
+  // background-color: var(--el-bg-color);
+
   border-radius: 10px;
   overflow: hidden;
   box-shadow: var(--el-box-shadow);
@@ -357,6 +411,9 @@
     min-height: 500px;
     width: 500px;
     padding: 50px;
+    background:
+      url("../assets/images/login-image/frame.png") no-repeat
+      center / cover;
     overflow: hidden;
 
     .title-container {
@@ -364,8 +421,9 @@
 
       .title {
         font-size: 1.3em;
-        color: var(--el-text-color-primary);
+        color: #fff;
         margin: 0 auto 30px;
+        text-align: center;
         font-weight: bold;
       }
     }
@@ -426,4 +484,12 @@
   width: 100%;
   margin: 0;
 }
+
+:deep .el-input__wrapper {
+  background-color: transparent !important;
+}
+
+:deep .el-input__inner {
+  color: #fff !important;
+}
 </style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 0e34193..4aabd42 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="qualityFile"></script>
+
 <template>
-  <div>文件审批</div>
+  <div>
+    文件审批
+  </div>
 </template>
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
new file mode 100644
index 0000000..b53f401
--- /dev/null
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -0,0 +1,8 @@
+<!-- CNAS文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="CNAS文件" />
+</template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
new file mode 100644
index 0000000..ca0b90b
--- /dev/null
+++ b/src/views/measure/file/components/addDialog.vue
@@ -0,0 +1,309 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
+          <span class="btns">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="系统编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <el-upload
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  background-color: #fff;
+
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="系统编号" prop="fileNo">
+            <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fileName">
+            <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件号" prop="fileCode">
+            <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :limit="1"
+            >
+              <el-button type="primary">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
new file mode 100644
index 0000000..9d1c3c7
--- /dev/null
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -0,0 +1,8 @@
+<!-- 作业文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="作业文件" />
+</template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
new file mode 100644
index 0000000..4e9a8f1
--- /dev/null
+++ b/src/views/measure/file/components/programFile.vue
@@ -0,0 +1,8 @@
+<!-- 程序文件 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="程序文件" />
+</template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
new file mode 100644
index 0000000..d220d4e
--- /dev/null
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -0,0 +1,8 @@
+<!-- 质量手册 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="质量手册" />
+</template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
new file mode 100644
index 0000000..151649e
--- /dev/null
+++ b/src/views/measure/file/components/statute.vue
@@ -0,0 +1,8 @@
+<!-- 计量法规 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="计量法规" />
+</template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
new file mode 100644
index 0000000..c50c700
--- /dev/null
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -0,0 +1,8 @@
+<!-- 技术能力 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
+</script>
+
+<template>
+  <template-pag name="技术能力" />
+</template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './addDialog.vue'
+import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: fileListType) => {
+  addRef.value.initDialog({
+    ...row,
+    fileType: searchQuery.fileType,
+    fileTypeName: props.name,
+    title: '详情',
+  })
+}
+// 下载(单个)
+const exportSelf = (row: fileListType) => {
+  exportExcel({
+    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+    name: props.name,
+    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+    sheetName: 'sheet1',
+  })
+}
+// 废止
+const abolish = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认废止${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      updateApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '操作成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 删除
+const remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.fileNo = ''
+  searchQuery.fileName = ''
+  searchQuery.fileCode = ''
+  searchQuery.publishTime = ''
+  searchQuery.effectiveTime = ''
+  searchQuery.effectiveStatus = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    fileType: searchQuery.fileType,
+    title: '新增',
+    fileTypeName: props.name,
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
+          name: props.name,
+          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
+          sheetName: 'sheet1',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="实施时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+            <el-option
+              v-for="item in effectiveStatusSelect"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
new file mode 100644
index 0000000..04b1388
--- /dev/null
+++ b/src/views/measure/file/file-interface.ts
@@ -0,0 +1,48 @@
+// 文件查询参数类型
+export interface fileSearchType {
+  fileNo: string // 编号
+  fileName: string // 名称
+  publishTime: string // 发布时间
+  fileCode: string // 文件号
+  effectiveTime: string // 实施时间
+  effectiveStatus: string // 实施状态
+  limit: number
+  offset: number
+  fileType: string // 类型
+}
+// 文件返回值类型
+export interface fileListType {
+  createUser: string //	创建人	string
+  createUserId: string //	创建人用户id	integer(int64)
+  effectiveStatus: string //	实施状态	string
+  effectiveStatusName: string //	实施状态字典value（列表接口返回参数）	string
+  effectiveTime: string //	实施时间	string
+  fileCode: string //	文件号	string
+  fileName: string //	文件名称	string
+  fileNo: string //	文件编号	string
+  fileType: string //	文件类别字典code	string
+  fileTypeName: string //	文件类别字典value（列表接口返回参数）	string
+  id: string //	主键id（列表接口返回参数）	integer(int64)
+  minioFileName: string //	上传文件返回名称	string
+  publishTime: string //	发布时间	string
+  publisher: string //	发布单位	string
+  remark: string // 备注
+}
+// 文件类型返回值
+export interface fileResType {
+  name: string
+  id: string
+  value: string
+}
+// 发布单位类型
+export interface deptType {
+  checked: boolean
+  code: string
+  id: string
+  name: string
+  open: boolean
+  pCodes: string
+  pid: string
+  value: string
+}
+
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 62fe36a..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,3 +1,8 @@
+<!-- 计量管理办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>管理办法</div>
+  <template-pag name="计量管理办法" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index 55d12ed..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,3 +1,8 @@
+<!-- 计量规程 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>计量规程</div>
+  <template-pag name="计量规程" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index ecdcef3..1b5fffe 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -1,5 +1,53 @@
+<script lang="ts" setup name="qualityFile">
+import CNASfile from './components/CNASfile.vue' // casn文件
+import homeworkFile from './components/homeworkFile.vue' // 作业文件
+import statute from './components/statute.vue'// 计量法规
+import programFile from './components/programFile.vue' // 程序文件
+import qualityManual from './components/qualityManual.vue'// 质量手册
+import technicalCapability from './components/technicalCapability.vue' // 技术能力
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '计量法规', comp: statute },
+  { name: '质量手册', comp: qualityManual },
+  { name: '程序文件', comp: programFile },
+  { name: '作业文件', comp: homeworkFile },
+  { name: '技术能力', comp: technicalCapability },
+  { name: 'CNAS文件', comp: CNASfile },
+])
+const current = ref('计量法规')
+const currentComp = shallowRef(statute)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <view>
-    质量文件
-  </view>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 2924b2c..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,5 +1,8 @@
+<!-- 计量规章制度 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <view>
-    规章制度
-  </view>
+  <template-pag name="计量规章制度" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 73fb89f..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,3 +1,8 @@
+<!-- 校验检测办法 -->
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
+</script>
+
 <template>
-  <div>校准检测办法</div>
+  <template-pag name="校验检测办法" />
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index f23e6aa..27c0ce7 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './list_interface'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
-
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   supplierNo: '', // 业务内容
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -79,13 +81,18 @@
   })
 }
 fetchData(true)
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
 // 详情id
 const infoId = ref('0')
+const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  console.log(e)
+  checkoutList.value = e
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
@@ -95,17 +102,34 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  getSoucreListDelete({ id: row.id }).then((res) => {
-  })
+  isPopconfirmShow.value = true
 }
 // 分页
-const handleSizeChange = (val: string) => {}
+const handleSizeChange = (val: number) => {
+  listQuery.value.limit = val
+  fetchData(true)
+}
 // 分页
-const handleCurrentChange = (val: string) => {}
+const handleCurrentChange = (val: number) => {
+  listQuery.value.offset = val
+  fetchData(true)
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+const confirmEvent = () => {
+  console.log('confirm!')
+  getSoucreListDelete({ id: row.id }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -119,6 +143,56 @@
 // 关闭编辑
 const close = () => {
   show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+const upload = () => {
+  fileRef.value.click()
 }
 // 点击右上角一排按钮
 const handelClick = (type: string) => {
@@ -126,6 +200,12 @@
     buttonType.value = ''
     show.value = false
   }
+  else if (type === '导出') {
+    exportExcelBtn()
+  }
+  else if (type === '批量导入') {
+    upload()
+  }
 }
 </script>
 
@@ -135,6 +215,7 @@
       <search-area
         type="seperate"
         need-clear
+        :icon="false"
         @search="searchList"
         @clear="clearList"
       >
@@ -174,6 +255,7 @@
             >
               {{ item }}
             </el-button>
+            <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
           </div>
         </div>
         <el-table
@@ -233,7 +315,23 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
+
   <list-source-add
     v-else
     :info-id="infoId"
@@ -253,8 +351,4 @@
   position: fixed;
   bottom: 0;
 }
-
-.el-button__text--expand {
-  text-align: center !important;
-}
 </style>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bf2a4ad..b6fa653 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import { ElMessage, genFileId } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import type { IformInline } from './list_interface'
-import { getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { exportFile } from '@/utils/exportUtils'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
     type: String,
@@ -68,6 +71,7 @@
   phone: '',
 })
 const SelectionList = ref([])
+const upload = ref<UploadInstance>()
 const close = () => {
   emit('close')
 }
@@ -148,13 +152,55 @@
 }
 // 点击提交/导出按钮
 const getAddList = (type: string) => {
-  if (type === '提交') {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
     getSoucreListAdd(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
       }
     })
   }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getSoucreLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    const params = {
+      businessContent: formInline.value.businessContent,
+      supplierName: formInline.value.supplierName,
+      supplierNo: formInline.value.supplierNo,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+// 文件上传限制
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  console.log(files, 'wenjian')
+  upload.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  upload.value!.handleStart(file)
+}
+// 文件上传成功
+const uploadSuccess = (files) => {
+  formInline.value.minioFileName = files.name
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -290,7 +336,7 @@
           />
         </el-form-item>
       </div>
-      <div class="input-width">
+      <span class="input-width">
         <el-form-item label="公司业务范围:">
           <el-input
             v-model="formInline.businessScope"
@@ -298,88 +344,50 @@
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
-      </div>
-      <div class="input-width">
+      </span>
+      <span class="input-width">
         <el-form-item label="备注:">
           <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
         </el-form-item>
-      </div>
+      </span>
       <div class="info-appendix">
         <el-form-item label="附件:">
-          <span>扫描件.pdf X</span>
-          <el-button :disabled="buttonType === '详情'">
-            上传
-          </el-button>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-change="uploadSuccess"
+            :auto-upload="false"
+          >
+            <span>{{ '扫描件.pdf X ' || formInline.minioFileName }}</span>
+            <el-button :disabled="buttonType === '详情'">
+              上传
+            </el-button>
+          </el-upload>
         </el-form-item>
       </div>
     </el-form>
-    <el-tabs type="border-card">
-      <el-tab-pane label="人员信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            人员信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'" @click="deleteList">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'" @click="addRoow">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="业务记录">
-        <div class="table-top">
-          <div class="table-top-title">
-            业务记录
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="标准装置信息">
-        <div class="table-top">
-          <div class="table-top-title">
-            标准装置信息
-          </div>
-          <div class="table-top-button">
-            <el-button :disabled="buttonType === '详情'">
-              删除行
-            </el-button>
-            <el-button :disabled="buttonType === '详情'">
-              增加行
-            </el-button>
-          </div>
-        </div>
-        <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column prop="date" label="Date" />
-          <el-table-column prop="name" label="Name" />
-          <el-table-column prop="address" label="Address" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
   </div>
+  <div class="table-top">
+    <div class="table-top-title">
+      人员信息
+    </div>
+    <div class="table-top-button">
+      <el-button :disabled="buttonType === '详情'" @click="deleteList">
+        删除行
+      </el-button>
+      <el-button :disabled="buttonType === '详情'" @click="addRoow">
+        增加行
+      </el-button>
+    </div>
+  </div>
+  <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" />
+  </el-table>
   <el-dialog
     v-model="dialogVisible"
     title="添加人员信息"
@@ -406,10 +414,15 @@
 
 <style lang="scss" scoped>
 .top-info {
+  width: 100%;
+  height: 50px;
   padding: 10px 50px;
+  margin-top: 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
 
   .title {
     width: 75%;
@@ -418,7 +431,10 @@
 }
 
 .info-content {
+  margin-top: 10px;
   padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
 
   .info-dizhi {
     margin-right: 155px;
@@ -431,11 +447,11 @@
 }
 
 .info-dizhi .el-input {
-  width: 15vw;
+  width: 20vw;
 }
 
 .input-width .el-input {
-  width: 40vw;
+  width: 30vw;
 }
 
 .info-appendix span {
@@ -443,9 +459,13 @@
 }
 
 .table-top {
+  margin-top: 10px;
+  padding: 5px;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
 
   .table-top-title {
     width: 60vw;
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 9144ddc..c576c44 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -7,6 +7,18 @@
   limit: number
 }
 
+export interface IlistType {
+  businessContent: string
+  supplierName: string
+  supplierNo: string
+  briefName: string
+  director: string
+  mobile: string
+  companyCity: string
+  createTime: string
+  remark: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 0789e96..fafdb27 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,197 @@
+<script lang="ts" setup name="ListPlan">
+import { reactive, ref } from 'vue'
+const listQuery = {
+  supplierNo: '',
+  supplierName: '',
+  businessContent: '',
+  offset: 1,
+  limit: 10,
+}
+const list = ref([])
+const total = ref(0)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+const searchList = () => {}
+const clearList = () => {}
+const buttons = ref(['新建', '导出', '打印'])
+const handleEdit = (index: string, row: object, type: string) => {}
+const handleDelete = (index: string, row: object) => {}
+const handelClick = (text: string) => {}
+const handleSelectionChange = () => {}
+const handleSizeChange = (val: number) => {}
+const handleCurrentChange = (val: number) => {}
+</script>
+
 <template>
-  <div>培训计划111</div>
+  <app-container>
+    <search-area
+      type="seperate"
+      need-clear
+      :icon="false"
+      @search="searchList"
+      @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierNo"
+          placeholder="溯源供方编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.supplierName"
+          placeholder="溯源供方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.businessContent"
+          placeholder="业务内容"
+          clearable
+        />
+      </search-item>
+    </search-area>
+  </app-container>
+  <table-container>
+    <div class="table-top">
+      <h3 />
+      <div>
+        <el-button
+          v-for="(item, index) in buttons"
+          :key="index"
+          type="primary"
+          @click="handelClick(item)"
+        >
+          {{ item }}
+        </el-button>
+        <!-- <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange" /> -->
+      </div>
+    </div>
+    <el-table
+      :data="list"
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="(column, index) in columns"
+        :key="index"
+        :label="column.text"
+        :prop="column.value"
+        :width="column.width"
+        align="center"
+      />
+      <el-table-column align="center" label="操作" width="200">
+        <template #default="scope">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(scope.$index, scope.row, '编辑')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(scope.$index, scope.row, '详情')"
+          >
+            详情
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            删除
+          </el-button>
+          <el-button
+            size="small"
+            link
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)"
+          >
+            二维码
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </table-container>
+  <div class="pagination">
+    <el-pagination
+      v-model:current-page="listQuery.offset"
+      v-model:page-size="listQuery.limit"
+      :page-sizes="[10, 20, 30, 50]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.table-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 2d44769..aaa60ba 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '证书报告',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,16 +228,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 0643a0d..1495ac2 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '原始记录',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '原始记录模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -200,18 +226,18 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 001b5b3..6dc200d 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -137,9 +137,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签章管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +199,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +219,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +240,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {