diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 97b4847..0f71917 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -28,7 +28,7 @@
   { text: '区域编码', value: 'id', align: 'center' },
   { text: '区域等级', value: 'levelName', align: 'center' },
   { text: '所属区域', value: 'pName', align: 'center' },
-  { text: '区域排序', value: 'num', width: 80, align: 'center' },
+  { text: '区域排序', value: 'num', width: 100, align: 'center' },
 ]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
@@ -121,8 +121,8 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
       </template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 97b4847..0f71917 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -28,7 +28,7 @@
   { text: '区域编码', value: 'id', align: 'center' },
   { text: '区域等级', value: 'levelName', align: 'center' },
   { text: '所属区域', value: 'pName', align: 'center' },
-  { text: '区域排序', value: 'num', width: 80, align: 'center' },
+  { text: '区域排序', value: 'num', width: 100, align: 'center' },
 ]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
@@ -121,8 +121,8 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
       </template>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 4bd03fa..51788c3 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -26,7 +26,7 @@
   { text: '组织名称', value: 'simpleName', align: 'left' },
   { text: '组织全称', value: 'fullName' },
   { text: '备注', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<DeptInfo[]> = ref([])
@@ -103,15 +103,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/dept/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/dept/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 97b4847..0f71917 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -28,7 +28,7 @@
   { text: '区域编码', value: 'id', align: 'center' },
   { text: '区域等级', value: 'levelName', align: 'center' },
   { text: '所属区域', value: 'pName', align: 'center' },
-  { text: '区域排序', value: 'num', width: 80, align: 'center' },
+  { text: '区域排序', value: 'num', width: 100, align: 'center' },
 ]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
@@ -121,8 +121,8 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
       </template>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 4bd03fa..51788c3 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -26,7 +26,7 @@
   { text: '组织名称', value: 'simpleName', align: 'left' },
   { text: '组织全称', value: 'fullName' },
   { text: '备注', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<DeptInfo[]> = ref([])
@@ -103,15 +103,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/dept/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/dept/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 181f209..4fc927b 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -104,7 +104,7 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
+      <template #btns-right>
         <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
           新增
         </el-button>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 97b4847..0f71917 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -28,7 +28,7 @@
   { text: '区域编码', value: 'id', align: 'center' },
   { text: '区域等级', value: 'levelName', align: 'center' },
   { text: '所属区域', value: 'pName', align: 'center' },
-  { text: '区域排序', value: 'num', width: 80, align: 'center' },
+  { text: '区域排序', value: 'num', width: 100, align: 'center' },
 ]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
@@ -121,8 +121,8 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
       </template>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 4bd03fa..51788c3 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -26,7 +26,7 @@
   { text: '组织名称', value: 'simpleName', align: 'left' },
   { text: '组织全称', value: 'fullName' },
   { text: '备注', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<DeptInfo[]> = ref([])
@@ -103,15 +103,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/dept/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/dept/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 181f209..4fc927b 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -104,7 +104,7 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
+      <template #btns-right>
         <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
           新增
         </el-button>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 0fc61c3..c225b53 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -186,8 +186,3 @@
   </div>
 </template>
 
-<style lang="scss">
-  .el-message-box {
-    overflow: auto;
-  }
-</style>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 97b4847..0f71917 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -28,7 +28,7 @@
   { text: '区域编码', value: 'id', align: 'center' },
   { text: '区域等级', value: 'levelName', align: 'center' },
   { text: '所属区域', value: 'pName', align: 'center' },
-  { text: '区域排序', value: 'num', width: 80, align: 'center' },
+  { text: '区域排序', value: 'num', width: 100, align: 'center' },
 ]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
@@ -121,8 +121,8 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
       </template>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 4bd03fa..51788c3 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -26,7 +26,7 @@
   { text: '组织名称', value: 'simpleName', align: 'left' },
   { text: '组织全称', value: 'fullName' },
   { text: '备注', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<DeptInfo[]> = ref([])
@@ -103,15 +103,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/dept/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/dept/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 181f209..4fc927b 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -104,7 +104,7 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
+      <template #btns-right>
         <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
           新增
         </el-button>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 0fc61c3..c225b53 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -186,8 +186,3 @@
   </div>
 </template>
 
-<style lang="scss">
-  .el-message-box {
-    overflow: auto;
-  }
-</style>
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index 2d564a9..7f95d0f 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -31,7 +31,7 @@
   { text: '资源名称', value: 'name', type: 'expand' },
   { text: '资源编号', value: 'code' },
   { text: '请求地址', value: 'url' },
-  { text: '资源类型', value: 'resourceTypeName', width: 80 },
+  { text: '资源类型', value: 'resourceTypeName', width: 100, align: 'center' },
   { text: '层级', value: 'levels', width: 60, align: 'center' },
   { text: '排序', value: 'num', width: 60, align: 'center' },
 ])
@@ -131,15 +131,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/resource/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/resource/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/resource/update') || proxy.hasPerm('/sys/resource/delete')" label="操作" width="140" align="center">
           <template #default="scope">

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 97b4847..0f71917 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -28,7 +28,7 @@
   { text: '区域编码', value: 'id', align: 'center' },
   { text: '区域等级', value: 'levelName', align: 'center' },
   { text: '所属区域', value: 'pName', align: 'center' },
-  { text: '区域排序', value: 'num', width: 80, align: 'center' },
+  { text: '区域排序', value: 'num', width: 100, align: 'center' },
 ]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
@@ -121,8 +121,8 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
       </template>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 4bd03fa..51788c3 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -26,7 +26,7 @@
   { text: '组织名称', value: 'simpleName', align: 'left' },
   { text: '组织全称', value: 'fullName' },
   { text: '备注', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<DeptInfo[]> = ref([])
@@ -103,15 +103,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/dept/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/dept/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 181f209..4fc927b 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -104,7 +104,7 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
+      <template #btns-right>
         <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
           新增
         </el-button>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 0fc61c3..c225b53 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -186,8 +186,3 @@
   </div>
 </template>
 
-<style lang="scss">
-  .el-message-box {
-    overflow: auto;
-  }
-</style>
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index 2d564a9..7f95d0f 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -31,7 +31,7 @@
   { text: '资源名称', value: 'name', type: 'expand' },
   { text: '资源编号', value: 'code' },
   { text: '请求地址', value: 'url' },
-  { text: '资源类型', value: 'resourceTypeName', width: 80 },
+  { text: '资源类型', value: 'resourceTypeName', width: 100, align: 'center' },
   { text: '层级', value: 'levels', width: 60, align: 'center' },
   { text: '排序', value: 'num', width: 60, align: 'center' },
 ])
@@ -131,15 +131,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/resource/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/resource/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/resource/update') || proxy.hasPerm('/sys/resource/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 2b58e5f..41b8ddc 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -38,7 +38,7 @@
   { text: '所在组织机构', value: 'deptName' },
   { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -139,15 +139,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/role/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/role/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column
           v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
         />

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
new file mode 100644
index 0000000..a193040
--- /dev/null
+++ b/src/api/measure/person.ts
@@ -0,0 +1,51 @@
+// 计量人员相关接口api
+import request from '../index'
+import type { StaffListType } from '@/views/measure/person/person-interface'
+// 计量人员列表
+export function getStaffList(data: StaffListType) {
+  return request({
+    url: `/staff/selectStaffList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 人员详细信息
+export function getStaffDetail(data: object) {
+  return request({
+    url: '/staff/selectStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 删除人员
+export function getStaffDelete(data: object) {
+  return request({
+    url: '/staff/deleteStaff',
+    method: 'post',
+    data,
+  })
+}
+// 新增人员
+export function getStaffAdd(data: object) {
+  return request({
+    url: '/staff/addStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 编辑人员
+export function getStaffupdate(data: object) {
+  return request({
+    url: '/staff/updateStaffInfo',
+    method: 'post',
+    data,
+  })
+}
+// 列表导出
+export function exportList(data: object) {
+  return request({
+    url: '/staff/exportStaffList',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/login.ts b/src/api/system/login.ts
index 9569655..9b594da 100644
--- a/src/api/system/login.ts
+++ b/src/api/system/login.ts
@@ -1,8 +1,15 @@
 import request from '../index'
 const prefix = 'sys/'
 // 登录
-export function doLogin(data: { username: string; password: string; kaptcha: string }) {
-  return request.post(`${prefix}user/login`, data)
+export function doLogin(data: { sid: string; username: string; password: string; kaptcha: string }) {
+  return request({
+    url: `${prefix}user/login`,
+    method: 'post',
+    headers: {
+      sid: data.sid,
+    },
+    data,
+  })
 }
 
 // 获取用户信息
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 1a20584..2aa9097 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table id="print" 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" border stripe :size="size" 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/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 833c96e..3adef93 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -24,9 +24,10 @@
   margin-bottom: 10px;
   vertical-align: top;
   box-sizing: inherit;
+  margin-right: 5px;
 }
 
-.search-item + .search-item {
-  margin-left: 5px;
+.search-item:last-child {
+  margin-right: 0;
 }
 </style>
diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue
index 1833bd3..ba55463 100644
--- a/src/components/SearchArea/index.vue
+++ b/src/components/SearchArea/index.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   type: {
     type: String,
-    default: 'default',
+    default: 'seperate',
   }, // 显示类型，default表示正常连续显示，'seperate'表示两边分散显示
   needClear: {
     type: Boolean,
@@ -66,33 +66,39 @@
 <template>
   <div class="search-div">
     <div :class="{ 'search-left': type === 'seperate', 'search-all': type === 'default' }">
-      <slot />
+      <div class="input-div">
+        <slot />
+      </div>
+
       <el-collapse-transition>
         <div v-if="needSearchMore && searchMoreType === 'default'" v-show="data.searchMoreShow">
           <slot name="searchMore" />
         </div>
       </el-collapse-transition>
-      <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
-        搜索
-      </el-button>
-      <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
-        高级检索
-      </el-button>
-      <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
-        重置
-      </el-button>
-      <slot name="btns" />
+      <div v-if="type === 'default'">
+        <el-button v-if="type === 'default'" :size="size" type="primary" class="search-btn" :icon="Search" @click="search">
+          搜索
+        </el-button>
+        <el-button v-if="type === 'default' && needSearchMore" :size="size" type="primary" class="search-btn" :icon="More" @click="toggleSearchMore">
+          高级检索
+        </el-button>
+        <el-button v-if="type === 'default' && needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
+          重置
+        </el-button>
+        <slot name="btns" />
+      </div>
     </div>
-    <div v-if="type === 'seperate'" class="search-right">
-      <el-button :size="size" type="primary" :icon="icon ? 'el-icon-search' : ''" class="search-btn" @click="search">
+    <div v-if="type === 'seperate'" class="search-right" :style="{ width: `${90 + (needClear ? 100 : 0) + (needSearchMore ? +100 : 0)}px` }">
+      <el-button :size="size" type="primary" :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="icon ? 'el-icon-delete' : ''" @click="clearInput">
+      <el-button v-if="needClear" :size="size" type="warning" class="search-btn" :icon="Delete" @click="clearInput">
         重置
       </el-button>
+      <slot name="btns" />
     </div>
   </div>
 </template>
@@ -108,9 +114,24 @@
   justify-content: space-between;
   border-radius: 7px;
 
+  .input-div {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-content: flex-start;
+  }
+
   .search-btn {
     margin-bottom: 10px;
   }
+
+  .search-right {
+    width: auto;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
 }
 
 .dialog-footer {
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 031e444..2b68cb2 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -5,12 +5,23 @@
     type: String,
     default: '0',
   },
+  titleShow: {
+    type: Boolean,
+    default: true,
+  },
+  title: {
+    type: String,
+    default: '数据列表',
+  },
 })
 </script>
 
 <template>
   <div class="table-container">
     <div class="button-area">
+      <div v-if="titleShow" class="title-left">
+        {{ title }}
+      </div>
       <div class="button-left">
         <slot name="btns-left" />
       </div>
@@ -36,6 +47,11 @@
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
+    align-items: center;
+
+    .title-left {
+      margin-left: 5px;
+    }
 
     .button-left {
       display: flex;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index da5da9a..4a98f23 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="Header">
+<script lang="ts" setup name="NewHeader">
 import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import TopMenu from '../TopMenu/topMenu.vue'
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index adfed29..2cb0d56 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="Layout">
 import hotkeys from 'hotkeys-js'
-import Header from './components/Header/index.vue'
+import NewHeader from './components/Header/index.vue'
 import MainSidebar from './components/MainSidebar/index.vue'
 import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
@@ -59,7 +59,7 @@
 <template>
   <div class="layout">
     <div id="app-main">
-      <header />
+      <new-header />
       <div class="wrapper">
         <div v-if="settingsStore.menu.menuMode !== 'top'" class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
           <main-sidebar />
diff --git a/src/settings.ts b/src/settings.ts
index df7ad55..f89a3ab 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -9,6 +9,10 @@
   layout: {
     enableMobileAdaptation: false,
   },
+  dashboard: {
+    enable: false,
+    title: '控制台',
+  },
   menu: {
     baseOn: 'backend',
     menuMode: 'head',
diff --git a/src/utils/exportXlsx.ts b/src/utils/exportXlsx.ts
index e532b1a..82d436b 100644
--- a/src/utils/exportXlsx.ts
+++ b/src/utils/exportXlsx.ts
@@ -1,5 +1,4 @@
 import * as XLSX from 'xlsx'
-console.log(XLSX)
 
 /*
     * @description:
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index 4aabd42..b410767 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -1,7 +1,56 @@
-<script lang="ts" setup name="qualityFile"></script>
+<!-- 文件审批 -->
+<script lang="ts" setup name="qualityFile">
+import all from './components/approve/all.vue' // 全部
+import drafts from './components/approve/drafts.vue' // 草稿箱
+import pending from './components/approve/pending.vue' // 待审批
+import inApprove from './components/approve/inApproval.vue' // 审批中
+import passed from './components/approve/passed.vue' // 已通过
+import unPassed from './components/approve/unPassed.vue' // 未通过
+import cancel from './components/approve/cancel.vue' // 未通过
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: drafts },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApprove },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
+])
+const current = ref('全部')
+const currentComp = shallowRef(all)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
 
 <template>
-  <div>
-    文件审批
+  <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/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index ca0b90b..a0d1d16 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -174,13 +174,13 @@
             新建{{ fileTypeName }}
           </div>
           <span class="btns">
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" plain @click="resetForm(ruleFormRef)">
+            <el-button type="info" @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
diff --git a/src/views/measure/file/components/approve/all.vue b/src/views/measure/file/components/approve/all.vue
new file mode 100644
index 0000000..8f0a408
--- /dev/null
+++ b/src/views/measure/file/components/approve/all.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/approve/cancel.vue b/src/views/measure/file/components/approve/cancel.vue
new file mode 100644
index 0000000..37f69fe
--- /dev/null
+++ b/src/views/measure/file/components/approve/cancel.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/approve/drafts.vue b/src/views/measure/file/components/approve/drafts.vue
new file mode 100644
index 0000000..033e874
--- /dev/null
+++ b/src/views/measure/file/components/approve/drafts.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/approve/inApproval.vue b/src/views/measure/file/components/approve/inApproval.vue
new file mode 100644
index 0000000..78adba8
--- /dev/null
+++ b/src/views/measure/file/components/approve/inApproval.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/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
new file mode 100644
index 0000000..8e08302
--- /dev/null
+++ b/src/views/measure/file/components/approve/passed.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/approve/pending.vue b/src/views/measure/file/components/approve/pending.vue
new file mode 100644
index 0000000..8f06880
--- /dev/null
+++ b/src/views/measure/file/components/approve/pending.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/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
new file mode 100644
index 0000000..d028774
--- /dev/null
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -0,0 +1,405 @@
+<!-- 文件审批公共模板 -->
+<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({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+  create: '', // 创建人
+}) // 查询参数
+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: 'create', 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([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter(item => 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) => {
+  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, 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;"
+          /> -->
+          <el-input v-model="searchQuery.create" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
+        </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">
+            打印
+          </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>
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link>
+                  取消
+                </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/components/approve/unPassed.vue b/src/views/measure/file/components/approve/unPassed.vue
new file mode 100644
index 0000000..eb00217
--- /dev/null
+++ b/src/views/measure/file/components/approve/unPassed.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/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
new file mode 100644
index 0000000..c3cb837
--- /dev/null
+++ b/src/views/measure/person/components/addPerson.vue
@@ -0,0 +1,481 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import certificateAddDialog from './certificateAddDialog.vue'
+import type { deptType } from '@/views/measure/file/file-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = ref({
+  name: '', // 姓名
+  minioFileName: '', // 照片
+  idCard: '', // 省份证号
+  birthday: '', // 出生年月
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  staffNo: '', // 人员编号
+  sex: '', // 性别
+  education: '', // 文化程度
+  deptId: '', // 工作部门   科室
+  major: '', // 计量专业
+  workDate: '', // 从事日期
+  mainExaminer: '', // 是否主考人
+  specialOperator: '', // 是否特操人
+  technologyExam: '', // 技术考核
+  remark: '', // 备注
+  certificateList: [], // 证书列表
+
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const rules = ref<FormRules>({
+  // fileName: [{ 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 selectWhether = ref([
+  { name: '是', value: '1' },
+  { name: '否', value: '0' },
+])
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+const technologyJobList = ref([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.minioFileName = res.data.fileId
+    }
+  })
+}
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [],
+    column: [
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog()
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any) => {
+  changeList.value[0].data.push(row)
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        (title.value === '新建'
+          ? getStaffAdd
+          : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+          if (res.code == 200) {
+            formEl?.resetFields()
+            ElMessage.success('提交成功')
+            emits('resetData')
+          }
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  changeList.value[0].data = []
+  dialogVisible.value = true
+  title.value = row.title
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getStaffDetail({ ...row }).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value = res.data
+        changeList.value[0].data = res.data.certificateList
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</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">
+            {{ title }}计量人员
+          </div>
+          <span class="btns">
+            <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+              完成
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </div>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="用户头像">
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                style="margin-left: 50px;"
+                :disabled="title === '详情'"
+              >
+                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="出生年月" :disabled="title === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="技术职务" prop="technologyJob">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="ruleForm.staffNo" placeholder="人员编号" disabled />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行政职务" prop="administrationJob">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-model="ruleForm.deptId" 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="deptId">
+              <el-select v-model="ruleForm.deptId" 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="major">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="是否主考人" prop="mainExaminer">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否特操人" prop="specialOperator">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否技术考核" prop="technologyExam">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+                <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
+              </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-radio-group v-model="current" style="margin-bottom: -15px;">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group> -->
+        <div class="header marg">
+          <div class="title">
+            {{ current }}
+          </div>
+          <span class="btns">
+            <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+              删除行
+            </el-button>
+            <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+              添加行
+            </el-button>
+          </span>
+        </div>
+        <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;">
+          <el-table-column width="55" align="center">
+            <template #default="scope">
+              <el-radio-group v-model="currenSelect" class="ml-4">
+                <el-radio :label="scope.$index" />
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+        </el-table>
+        <el-row :gutter="24" class="marg" />
+      </el-form>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+  </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;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
new file mode 100644
index 0000000..547e11a
--- /dev/null
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -0,0 +1,84 @@
+<!-- 添加证书信息弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const formLabelWidth = '140px'
+const form = reactive({
+  certificateNo: '', // 证书号
+  certificateName: '', // 证书名称
+  certificateCompany: '', // 发证单位
+  certificateDate: '', // 发证日期
+  validDate: '', // 有效日期
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+  certificateNo: [
+    { required: true, message: '请输入证书号', trigger: 'blur' },
+    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
+  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+})
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      emits('add', form)
+      dialogFormVisible.value = false
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules"
+    >
+      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="证书号" />
+      </el-form-item>
+      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+        <el-input v-model="form.certificateName" placeholder="证书名称" />
+      </el-form-item>
+      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+      </el-form-item>
+      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+        <el-date-picker
+          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发证日期"
+        />
+      </el-form-item>
+      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+        <el-date-picker
+          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择有效日期"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
new file mode 100644
index 0000000..0e46cbd
--- /dev/null
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -0,0 +1,25 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+// 点击保存
+// 取消
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="用户列表">
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button> -->
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 3d55142..43435ab 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,3 +1,312 @@
+<!-- 计量人员列表 -->
+<script lang="ts" setup name="person">
+import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addPerson.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
+import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '计量专业', value: 'major', align: 'center', width: '90' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '技术考核', value: 'technologyExam', align: 'center', width: '80' },
+]) // 表格
+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绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getStaffList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女' }))
+      list.value = res.data.records
+      total.value = Number(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: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStaffDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.major = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    exportFile(res.data, '计量人员列表')
+    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(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>计量人员列表</div>
+  <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.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </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="240">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button size="small" type="primary" link @click="detail(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/person/person-interface.ts b/src/views/measure/person/person-interface.ts
new file mode 100644
index 0000000..9eae3a2
--- /dev/null
+++ b/src/views/measure/person/person-interface.ts
@@ -0,0 +1,39 @@
+// 计量人员列表查询参数类型
+export interface StaffListType {
+  staffNo: string // 人员编号
+  name: string // 姓名
+  deptId: string // 工作部门
+  major: string // 计量专业
+  verifierCertificateNo: string // 证书号
+  certificateStatus: string // 证书状态
+  limit: number
+  offset: number
+}
+// 计量人员类型
+export interface StaffType {
+  account: string
+  administrationJob: string
+  birthday: string
+  certificateCompany: string
+  certificateDate: string
+  certificateList: string
+  createTime: string
+  deptId: string
+  education: string
+  id: string
+  idCard: string
+  isDel: string
+  mainExaminer: string
+  major: string
+  minioFileName: string
+  name: string
+  remark: string
+  sex: string
+  specialOperator: string
+  staffNo: string
+  technologyExam: string
+  technologyJob: string
+  updateTime: string
+  verifierCertificateNo: string
+  workDate: string
+}
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 97b4847..0f71917 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -28,7 +28,7 @@
   { text: '区域编码', value: 'id', align: 'center' },
   { text: '区域等级', value: 'levelName', align: 'center' },
   { text: '所属区域', value: 'pName', align: 'center' },
-  { text: '区域排序', value: 'num', width: 80, align: 'center' },
+  { text: '区域排序', value: 'num', width: 100, align: 'center' },
 ]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
@@ -121,8 +121,8 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm(Perm.ADD)" class="filter-item" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
       </template>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 4bd03fa..51788c3 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -26,7 +26,7 @@
   { text: '组织名称', value: 'simpleName', align: 'left' },
   { text: '组织全称', value: 'fullName' },
   { text: '备注', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<DeptInfo[]> = ref([])
@@ -103,15 +103,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/dept/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/dept/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index 181f209..4fc927b 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -104,7 +104,7 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
+      <template #btns-right>
         <el-button v-if="proxy.hasPerm('/sys/dict/add')" :icon="Plus" @click="add">
           新增
         </el-button>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index 0fc61c3..c225b53 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -186,8 +186,3 @@
   </div>
 </template>
 
-<style lang="scss">
-  .el-message-box {
-    overflow: auto;
-  }
-</style>
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index 2d564a9..7f95d0f 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -31,7 +31,7 @@
   { text: '资源名称', value: 'name', type: 'expand' },
   { text: '资源编号', value: 'code' },
   { text: '请求地址', value: 'url' },
-  { text: '资源类型', value: 'resourceTypeName', width: 80 },
+  { text: '资源类型', value: 'resourceTypeName', width: 100, align: 'center' },
   { text: '层级', value: 'levels', width: 60, align: 'center' },
   { text: '排序', value: 'num', width: 60, align: 'center' },
 ])
@@ -131,15 +131,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/resource/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/resource/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/resource/update') || proxy.hasPerm('/sys/resource/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 2b58e5f..41b8ddc 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -38,7 +38,7 @@
   { text: '所在组织机构', value: 'deptName' },
   { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '排序', value: 'num', width: 80, align: 'center' },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -139,15 +139,15 @@
       </search-item>
     </search-area>
     <table-container>
-      <template #btns-left>
-        <el-button v-if="proxy.hasPerm('/sys/role/add')" :icon="Plus" @click="add">
+      <template #btns-right>
+        <el-button v-if="proxy.hasPerm('/sys/role/add')" type="primary" :icon="Plus" @click="add">
           新增
         </el-button>
         <el-button :icon="Switch" @click="expandOrCollapse">
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column
           v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
         />
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index ecc7266..7905ce2 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -248,7 +248,7 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false">
           <template #btns-left>
             <!-- 操作 -->
             <div>