diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 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-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <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>
@@ -425,82 +442,52 @@
             <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-form-item label="性别" prop="sex" class="marg-item">
               <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-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <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-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-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </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-form-item label="从事日期" prop="workDate" class="marg-item">
               <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-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <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-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <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" class="marg-item">
+              <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-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <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-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 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-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <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>
@@ -425,82 +442,52 @@
             <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-form-item label="性别" prop="sex" class="marg-item">
               <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-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <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-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-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </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-form-item label="从事日期" prop="workDate" class="marg-item">
               <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-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <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-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <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" class="marg-item">
+              <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-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <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-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 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-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <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>
@@ -425,82 +442,52 @@
             <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-form-item label="性别" prop="sex" class="marg-item">
               <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-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <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-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-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </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-form-item label="从事日期" prop="workDate" class="marg-item">
               <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-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <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-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <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" class="marg-item">
+              <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-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <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-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 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-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <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>
@@ -425,82 +442,52 @@
             <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-form-item label="性别" prop="sex" class="marg-item">
               <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-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <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-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-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </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-form-item label="从事日期" prop="workDate" class="marg-item">
               <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-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <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-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <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" class="marg-item">
+              <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-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <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-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 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-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <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>
@@ -425,82 +442,52 @@
             <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-form-item label="性别" prop="sex" class="marg-item">
               <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-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <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-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-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </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-form-item label="从事日期" prop="workDate" class="marg-item">
               <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-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <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-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <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" class="marg-item">
+              <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-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <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-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/components.d.ts b/src/components.d.ts
index 5a09663..fcb5b4a 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -13,14 +13,14 @@
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
+    BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
+    BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
-    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -30,13 +30,14 @@
     ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
     ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
+    LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
-    Pie: typeof import('./components/echarts/pie.vue')['default']
+    PieChart: typeof import('./components/Echart/PieChart.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index cdc9b25..56417d6 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -1,10 +1,13 @@
 <!-- 审批操作弹窗 -->
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
 const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
 const dialogVisibleApprove = ref(false)
 const form = reactive({
-  radio: '',
+  radio: '1',
 })
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
@@ -17,8 +20,11 @@
   form.certificateDate = ''
   form.validDate = ''
 }
+const approvetime = ref('') // 审批时间
 const initDialog = (row: any) => {
   dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
 }
 defineExpose({ initDialog })
 
@@ -28,6 +34,7 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       dialogVisibleApprove.value = false
+      emits('resetData')
     }
   })
 }
@@ -48,13 +55,13 @@
       <el-form-item label="审批意见">
         <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
         <el-radio-group v-model="form.radio">
-          <el-radio :label="1">
+          <el-radio label="1">
             同意
           </el-radio>
-          <el-radio :label="2">
+          <el-radio label="2">
             拒绝
           </el-radio>
-          <el-radio :label="3">
+          <el-radio label="3">
             驳回
           </el-radio>
         </el-radio-group>
@@ -68,12 +75,12 @@
       <el-row :gutter="24">
         <el-col :span="10">
           <el-form-item label="审批人">
-            <el-input disabled value="xxxx" />
+            <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="审批时间">
-            <el-input disabled value="2020-12-12 00:00:00" />
+            <el-input disabled :value="approvetime" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/device/stateManage/components/status/all.vue b/src/views/device/stateManage/components/status/all.vue
new file mode 100644
index 0000000..28725df
--- /dev/null
+++ b/src/views/device/stateManage/components/status/all.vue
@@ -0,0 +1,18 @@
+<!-- 全部 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/cancel.vue b/src/views/device/stateManage/components/status/cancel.vue
new file mode 100644
index 0000000..ecb2d0c
--- /dev/null
+++ b/src/views/device/stateManage/components/status/cancel.vue
@@ -0,0 +1,18 @@
+<!-- 已取消 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/drafts.vue b/src/views/device/stateManage/components/status/drafts.vue
new file mode 100644
index 0000000..226ba21
--- /dev/null
+++ b/src/views/device/stateManage/components/status/drafts.vue
@@ -0,0 +1,18 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/inApproval.vue b/src/views/device/stateManage/components/status/inApproval.vue
new file mode 100644
index 0000000..4988595
--- /dev/null
+++ b/src/views/device/stateManage/components/status/inApproval.vue
@@ -0,0 +1,18 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/passed.vue b/src/views/device/stateManage/components/status/passed.vue
new file mode 100644
index 0000000..ab87daf
--- /dev/null
+++ b/src/views/device/stateManage/components/status/passed.vue
@@ -0,0 +1,18 @@
+<!-- 已通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/pending.vue b/src/views/device/stateManage/components/status/pending.vue
new file mode 100644
index 0000000..3e0b315
--- /dev/null
+++ b/src/views/device/stateManage/components/status/pending.vue
@@ -0,0 +1,18 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/status/unPassed.vue b/src/views/device/stateManage/components/status/unPassed.vue
new file mode 100644
index 0000000..8de700e
--- /dev/null
+++ b/src/views/device/stateManage/components/status/unPassed.vue
@@ -0,0 +1,18 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="CNASfile">
+import list from '../templateList.vue'
+const props = defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+})
+</script>
+
+<template>
+  <list :title="props.title" :name="props.name" />
+</template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 9c4da0f..fc364c8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -381,10 +381,10 @@
             <el-form-item label="申请单位" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="申请单位"
+                v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 6ee2e8c..aa3963f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -8,6 +8,10 @@
     type: String,
     default: '',
   },
+  title: {
+    type: String,
+    default: '',
+  },
 })
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
@@ -179,15 +183,23 @@
 // 同意
 const agree = (row) => {
   console.log(approveRef.value)
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '1',
+  })
 }
 // 驳回
 const reject = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog({
+    radio: '3',
+  })
 }
 // 拒绝
 const refuse = (row) => {
-  approveRef.value.initDialog()
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
 }
 // 取消
 const cancel = (row) => {
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 5fb0163..fce7685 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -1,6 +1,12 @@
 <!-- 状态管理公共模板 -->
 <script lang="ts" setup name="stateMangeTemplate">
-import list from './templateList.vue'
+import all from './status/all.vue' // 全部
+import cancel from './status/cancel.vue' // 已取消
+import draft from './status/drafts.vue' // 草稿箱
+import inApproval from './status/inApproval.vue' // 审批中
+import passed from './status/passed.vue'// 已通过
+import pending from './status/pending.vue' // 待审批
+import unPassed from './status/unPassed.vue' // 未通过
 const props = defineProps({
   name: {
     type: String,
@@ -16,16 +22,16 @@
   comp: any
 }
 const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+  { name: '全部', comp: all },
+  { name: '草稿箱', comp: draft },
+  { name: '待审批', comp: pending },
+  { name: '审批中', comp: inApproval },
+  { name: '已通过', comp: passed },
+  { name: '未通过', comp: unPassed },
+  { name: '已取消', comp: cancel },
 ])
 const current = ref('全部')
-const currentComp = shallowRef(list)
+const currentComp = shallowRef(all)
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index fb5897e..703674f 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="handleApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备处置申请
+    <page name="设备处置申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 3c43781..35c2af6 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup name="openApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备启封申请
+    <page name="设备启封申请" authority="unusedApply" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
 // 样式
 </style>
+
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 7bd1a98..282ecd8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="scrapApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备报废申请
+    <page name="设备报废申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index ec6320b..1c8544d 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup name="sealupApply">
-// 逻辑代码
+import page from './components/templatePage.vue'
 </script>
 
 <template>
   <app-container>
-    设备封存申请
+    <page name="设备封存申请" authority="unusedApply" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index a1464aa..66ec7ee 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -4,8 +4,10 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
@@ -51,11 +53,16 @@
     userList.value = res.data.rows
   })
 } // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
 // 获取发布单位列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 // 弹窗初始化
@@ -73,7 +80,8 @@
   if (row.title === '新增') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publisher = ''
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
     console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
@@ -207,11 +215,12 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '已废止'
-    ruleForm.effectiveStatus = '3'
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
   }
   else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
@@ -271,15 +280,20 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -295,7 +309,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index ca26b00..2e3322a 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -32,13 +32,13 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
-  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 9252393..4dc1b17 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -10,7 +10,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
@@ -67,7 +67,7 @@
   ruleFormRef.value?.validateField('idCard').then((res) => {
     // 获取生日
     const IdCard = ruleForm.value.idCard
-    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}-${IdCard.substring(12, 14)}`
+    const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
     console.log(ruleForm.value)
   })
@@ -86,12 +86,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -343,7 +345,7 @@
   getTechnologyJobList()
   getAdministrationJob()
   if (row.title === '新建') {
-    console.log()
+    // ruleForm.value.deptId = ''
   }
   else {
     getStaffDetail({ ...row }).then((res) => {
@@ -371,7 +373,7 @@
     <div class="body-container">
       <div class="header">
         <div class="title">
-          {{ title }}计量人员
+          计量人员-{{ title }}
         </div>
         <span class="btns">
           <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
@@ -384,14 +386,13 @@
       </div>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="用户头像" prop="minioFileName">
+          <el-col :span="5">
+            <el-form-item prop="minioFileName" label-width="70px">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
-                style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
@@ -404,20 +405,36 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="ruleForm.name" placeholder="名称" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
-            <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
-            </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
+            <el-form-item label="出生年月" prop="birthday" class="marg-item">
               <el-date-picker
-                v-model="ruleForm.birthday" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 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-form-item label="工作部门" prop="deptId" class="marg-item">
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+            <el-form-item label="计量专业" prop="major" class="marg-item">
+              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+            <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
+              <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>
@@ -425,82 +442,52 @@
             <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-form-item label="性别" prop="sex" class="marg-item">
               <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-form-item label="技术职务" prop="technologyJob" class="marg-item">
+              <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-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-input v-if="title === '详情'" v-model.trim="ruleForm.deptId" disabled />
-              <com-tree-select
-                v-else
-                v-model="ruleForm.deptId" :options="PubList" placeholder="选择组织机构"
-                :tree-props="deptProps"
-              />
-            </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-form-item label="从事日期" prop="workDate" class="marg-item">
               <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-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
               <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-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
+            </el-form-item>
+            <el-form-item label="文化程度" prop="education" class="marg-item">
+              <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" class="marg-item">
+              <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-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
+              <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-form-item label="备注" prop="remark" class="marg-item">
               <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg" />
       </el-form>
       <!-- 证书基本信息 -->
       <!-- 切换 -->
@@ -551,6 +538,7 @@
     border-radius: 8px;
     padding-top: 10px;
     margin-top: 10px;
+    padding-right: 10px;
   }
 
   .header {
@@ -578,6 +566,20 @@
     display: none;
   }
 
+  :deep(.el-icon.avatar-uploader-icon) {
+    font-size: 28px;
+    color: #8c939d;
+    width: 190px;
+    height: 250px;
+    text-align: center;
+  }
+
+  :deep(.avatar-uploader .avatar) {
+    width: 190px;
+    height: 250px;
+    display: block;
+  }
+
   .isDetail {
     ::v-deep {
       .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -591,12 +593,16 @@
 .marg {
   margin-top: 20px;
 }
+
+.marg-item {
+  margin-top: 20px;
+}
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   display: block;
 }
 </style>
@@ -618,8 +624,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 178px;
-  height: 178px;
+  width: 220px;
+  height: 320px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 2928870..ae48f11 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -9,7 +9,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
-import type { userType } from '@/views/system/user/user-interface'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
@@ -59,12 +59,14 @@
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
-const PubList = ref([])
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
 // 获取组织列表
 const getPubList = () => {
   getDeptTreeList().then((res) => {
     // 转成树结构
-    PubList.value = toTreeList(res.data, '0', true)
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
   })
 }
 const sexList = ref<{ id: string; value: string; name: string }[]>()
@@ -330,7 +332,13 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -377,10 +385,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 952da9d..5e20d1b 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,6 +1,6 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
-import { getStaffList } from '@/api/measure/person'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
 const emits = defineEmits(['add'])
@@ -77,8 +77,13 @@
 // 点击保存
 const submitForm = () => {
   const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(person, 'person')
+  getStaffDetail(person).then((res) => {
+    if (res.code === 200) {
+      emits('add', res.data)
+      dialogFormVisible.value = false
+    }
+  })
 }
 // 取消
 const resetForm = () => {
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index fc8d4b4..dcd05b5 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -1,5 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
@@ -15,7 +16,7 @@
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
-const select = ref()
+const select = ref<number>(-1)
 const columns = ref([
   {
     text: '姓名',
@@ -39,7 +40,7 @@
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getUserList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -73,9 +74,15 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  emits('add', person)
-  dialogFormVisible.value = false
+  console.log(select.value)
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
@@ -104,23 +111,25 @@
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :list-loading="loadingTable" @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="选择" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
         <!-- <el-table-column label="#" width="55" align="center">
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index cdb7932..592d810 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -22,15 +22,15 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '180' },
   { text: '姓名', value: 'name', align: 'center', width: '150' },
-  { text: '学历', value: 'education', align: 'center', width: '80' },
+  { text: '学历', value: 'education', align: 'center', width: '90' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
   { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
-  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -269,7 +269,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts
index e27a855..d8ea8b5 100644
--- a/src/views/system/user/user-interface.ts
+++ b/src/views/system/user/user-interface.ts
@@ -11,7 +11,7 @@
 // 树形结构
 export interface TreeStructure {
   checked: boolean
-  children: TreeStructure[]
+  children?: TreeStructure[]
   code: string
   id: string
   name: string