diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c576c44..530bcc4 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -19,6 +19,11 @@
   remark: string
 }
 
+export interface IOptions {
+  id: string
+  areaName: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -50,12 +55,5 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: [{
-    personNo: string
-    name: string
-    department: string
-    job: string
-    phone: string
-  }]
+  traceSupplierPersonList: []
 }
-

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c576c44..530bcc4 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -19,6 +19,11 @@
   remark: string
 }
 
+export interface IOptions {
+  id: string
+  areaName: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -50,12 +55,5 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: [{
-    personNo: string
-    name: string
-    department: string
-    job: string
-    phone: string
-  }]
+  traceSupplierPersonList: []
 }
-
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index 8265ad5..3390f7f 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -2,9 +2,10 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
+import type { IOptions, IlistQuery, IlistType } from '../list_interface'
 import ListPageAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -96,6 +97,8 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -114,14 +117,31 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
@@ -269,11 +289,19 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="主管部门"
+          <el-select
+            v-model="listQuery.deptId"
             clearable
-          />
+            placeholder="主管部门"
+            size="default"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-input

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c576c44..530bcc4 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -19,6 +19,11 @@
   remark: string
 }
 
+export interface IOptions {
+  id: string
+  areaName: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -50,12 +55,5 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: [{
-    personNo: string
-    name: string
-    department: string
-    job: string
-    phone: string
-  }]
+  traceSupplierPersonList: []
 }
-
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index 8265ad5..3390f7f 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -2,9 +2,10 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
+import type { IOptions, IlistQuery, IlistType } from '../list_interface'
 import ListPageAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -96,6 +97,8 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -114,14 +117,31 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
@@ -269,11 +289,19 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="主管部门"
+          <el-select
+            v-model="listQuery.deptId"
             clearable
-          />
+            placeholder="主管部门"
+            size="default"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-input
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9707995..d8df331 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
@@ -24,7 +24,7 @@
 const infoId = ref('')
 const buttonType = ref('')
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -146,14 +146,19 @@
   show.value = true
   fetchData(true)
 }
-const handleEdit = (index: string, row: object, type: string) => {
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  planName: string
+}
+const handleEdit = (index: string, row: rowReturn, type: string) => {
   console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.planName}吗？`,
     '提示',

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c576c44..530bcc4 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -19,6 +19,11 @@
   remark: string
 }
 
+export interface IOptions {
+  id: string
+  areaName: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -50,12 +55,5 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: [{
-    personNo: string
-    name: string
-    department: string
-    job: string
-    phone: string
-  }]
+  traceSupplierPersonList: []
 }
-
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index 8265ad5..3390f7f 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -2,9 +2,10 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
+import type { IOptions, IlistQuery, IlistType } from '../list_interface'
 import ListPageAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -96,6 +97,8 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -114,14 +117,31 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
@@ -269,11 +289,19 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="主管部门"
+          <el-select
+            v-model="listQuery.deptId"
             clearable
-          />
+            placeholder="主管部门"
+            size="default"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-input
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9707995..d8df331 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
@@ -24,7 +24,7 @@
 const infoId = ref('')
 const buttonType = ref('')
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -146,14 +146,19 @@
   show.value = true
   fetchData(true)
 }
-const handleEdit = (index: string, row: object, type: string) => {
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  planName: string
+}
+const handleEdit = (index: string, row: rowReturn, type: string) => {
   console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.planName}吗？`,
     '提示',
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 22fb253..9d717c0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="PlanAdd">
+import type { IOptions } from './plan_interface'
 import {
   getDeptTree,
   getListAdd,
   getListDetail,
   getListUpdate,
 } from '@/api/system/plan'
-
 const props = defineProps({
   infoId: {
     type: String,
@@ -36,7 +36,7 @@
   trainTime: null,
 })
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -151,6 +151,9 @@
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
+        <el-button v-if=" buttonType === '编辑'" type="primary">
+          保存
+        </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c576c44..530bcc4 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -19,6 +19,11 @@
   remark: string
 }
 
+export interface IOptions {
+  id: string
+  areaName: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -50,12 +55,5 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: [{
-    personNo: string
-    name: string
-    department: string
-    job: string
-    phone: string
-  }]
+  traceSupplierPersonList: []
 }
-
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index 8265ad5..3390f7f 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -2,9 +2,10 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
+import type { IOptions, IlistQuery, IlistType } from '../list_interface'
 import ListPageAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -96,6 +97,8 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -114,14 +117,31 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
@@ -269,11 +289,19 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="主管部门"
+          <el-select
+            v-model="listQuery.deptId"
             clearable
-          />
+            placeholder="主管部门"
+            size="default"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-input
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9707995..d8df331 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
@@ -24,7 +24,7 @@
 const infoId = ref('')
 const buttonType = ref('')
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -146,14 +146,19 @@
   show.value = true
   fetchData(true)
 }
-const handleEdit = (index: string, row: object, type: string) => {
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  planName: string
+}
+const handleEdit = (index: string, row: rowReturn, type: string) => {
   console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.planName}吗？`,
     '提示',
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 22fb253..9d717c0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="PlanAdd">
+import type { IOptions } from './plan_interface'
 import {
   getDeptTree,
   getListAdd,
   getListDetail,
   getListUpdate,
 } from '@/api/system/plan'
-
 const props = defineProps({
   infoId: {
     type: String,
@@ -36,7 +36,7 @@
   trainTime: null,
 })
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -151,6 +151,9 @@
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
+        <el-button v-if=" buttonType === '编辑'" type="primary">
+          保存
+        </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2769c7a..bde995f 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -33,6 +33,11 @@
   limit: number
 }
 
+export interface IOptions {
+  id: string
+  name: string
+}
+
 export interface IlistTypes {
   createTime: string
   deptName: string

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c576c44..530bcc4 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -19,6 +19,11 @@
   remark: string
 }
 
+export interface IOptions {
+  id: string
+  areaName: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -50,12 +55,5 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: [{
-    personNo: string
-    name: string
-    department: string
-    job: string
-    phone: string
-  }]
+  traceSupplierPersonList: []
 }
-
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index 8265ad5..3390f7f 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -2,9 +2,10 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
+import type { IOptions, IlistQuery, IlistType } from '../list_interface'
 import ListPageAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -96,6 +97,8 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -114,14 +117,31 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
@@ -269,11 +289,19 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="主管部门"
+          <el-select
+            v-model="listQuery.deptId"
             clearable
-          />
+            placeholder="主管部门"
+            size="default"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-input
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9707995..d8df331 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
@@ -24,7 +24,7 @@
 const infoId = ref('')
 const buttonType = ref('')
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -146,14 +146,19 @@
   show.value = true
   fetchData(true)
 }
-const handleEdit = (index: string, row: object, type: string) => {
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  planName: string
+}
+const handleEdit = (index: string, row: rowReturn, type: string) => {
   console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.planName}吗？`,
     '提示',
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 22fb253..9d717c0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="PlanAdd">
+import type { IOptions } from './plan_interface'
 import {
   getDeptTree,
   getListAdd,
   getListDetail,
   getListUpdate,
 } from '@/api/system/plan'
-
 const props = defineProps({
   infoId: {
     type: String,
@@ -36,7 +36,7 @@
   trainTime: null,
 })
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -151,6 +151,9 @@
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
+        <el-button v-if=" buttonType === '编辑'" type="primary">
+          保存
+        </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2769c7a..bde995f 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -33,6 +33,11 @@
   limit: number
 }
 
+export interface IOptions {
+  id: string
+  name: string
+}
+
 export interface IlistTypes {
   createTime: string
   deptName: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index dcea9ee..62a5183 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -133,7 +133,11 @@
   show.value = true
   fetchData(true)
 }
-const handleEdit = (index: string, row: object, type: string) => {
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+}
+const handleEdit = (index: string, row: rowReturn, type: string) => {
   console.log(row)
   infoId.value = row.id
   buttonType.value = type

diff --git a/src/components.d.ts b/src/components.d.ts
index f202da8..b9d5f3c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -14,6 +14,7 @@
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.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']
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index ddd000a..8bc659d 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -44,7 +44,6 @@
 .bench-left-top {
   border-radius: 10px;
   margin-top: 1%;
-  overflow: hidden;
   background-color: #fff;
 }
 </style>
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
deleted file mode 100644
index c385dae..0000000
--- a/src/components/echarts/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  xAxisData: () => [],
-  yAxisData: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  xAxisData: string[]
-  yAxisData: number[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      visualMap: [
-        {
-          show: false,
-          type: 'continuous',
-          seriesIndex: 0,
-          min: 0,
-          max: 400,
-        },
-      ],
-      color: ['#000'],
-      legend: {
-        data: [props.title],
-        itemHeight: 10, // 圆点大小
-        itemWidth: 0, // 线的长度
-        x: 'right', // 居右显示
-        y: -2,
-        textStyle: { // 图例文字的样式
-          color: '#000',
-          fontSize: 12,
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        textStyle: {
-          fontSize: '13',
-        },
-        axisPointer: {
-          type: 'cross',
-          label: {
-            fontSize: '13',
-          },
-        },
-      },
-      xAxis: [
-        {
-          boundaryGap: false,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            show: true,
-          },
-          data: props.yAxisData,
-        },
-      ],
-      yAxis: [
-        {
-          type: 'value',
-          boundaryGap: true,
-          axisLabel: {
-            fontSize: 12,
-            color: '#000',
-          },
-          axisLine: {
-            show: true,
-          },
-          splitLine: {
-            show: false,
-          },
-        },
-      ],
-      grid: {
-        left: 10,
-        right: 30,
-        bottom: 60,
-        top: 20,
-        containLabel: true,
-      },
-      series: [
-
-        {
-          name: props.title,
-          type: 'line',
-          smooth: true,
-          data: props.xAxisData,
-          symbol: 'circle', // 拐点样式
-          symbolSize: 2, // 拐点大小
-          // 折线条的样式
-          lineStyle: {
-            color: '#3d7eff',
-          },
-          // 折线拐点的样式
-          itemStyle: {
-            normal: {
-              // 静止时：
-              color: 'rgb(40 184 228)',
-              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
-              borderWidth: 4,
-            },
-            emphasis: {
-              // 鼠标经过时：
-              color: 'rgb(40 184 228)',
-            },
-          },
-          areaStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: '#60b4f1',
-              },
-              {
-                offset: 1,
-                color: '#fff',
-              },
-            ]),
-          },
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-}
-</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
deleted file mode 100644
index 1bbfb93..0000000
--- a/src/components/echarts/pie.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<script lang="ts" setup>
-import { nextTick, reactive, ref } from 'vue'
-import * as echarts from 'echarts'
-const props = withDefaults(defineProps<Props>(), {
-  id: '',
-  data: () => [],
-  title: '',
-})
-// const props = withDefaults(defineProps<Props>(), {})
-const person: any = reactive({
-  markList: [],
-})
-interface Props {
-  id: string
-  data: string[]
-  title: string
-}
-const GetEchar = () => {
-  const myChart = ref<HTMLElement>()
-  const myCharts = ref<any>()
-  nextTick(() => {
-    const chartDom = document.getElementById(props.id)!
-    myCharts.value = echarts.init(chartDom)
-    const option = {
-      tooltip: {
-        trigger: 'item',
-      },
-      color: ['#3d7eff', '#ccc'],
-      legend: {
-        orient: 'vertical',
-        right: '0',
-        bottom: '40%',
-        itemGap: 10,
-      },
-      graphic: {
-        type: 'text',
-        left: 'center',
-        top: '45%',
-        style: {
-          text: props.title,
-          textAlign: 'center',
-          fill: '#333',
-          fontSize: 18,
-        },
-      },
-      series: [
-        {
-          name: '培训考核',
-          type: 'pie',
-          radius: ['50%', '70%'],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderColor: '#fff',
-            borderWidth: 0,
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 20,
-              fontWeight: 'bold',
-            },
-          },
-          label: {
-            normal: {
-              show: false,
-              position: 'center',
-            },
-          },
-          labelLine: {
-            show: false,
-          },
-          data: props.data,
-        },
-      ],
-    }
-    myCharts.value.setOption(option)
-    // 让图表跟随屏幕自动的去适应
-    window.addEventListener('resize', () => {
-      myCharts.value.resize()
-    })
-  })
-}
-watch(
-  [() => props.data], ([newName], [oldName]) => {
-    GetEchar()
-  }, { immediate: true, deep: true })
-GetEchar()
-</script>
-
-<template>
-  <div :id="props.id" class="bars_w" />
-</template>
-
-<style lang="scss" scoped>
-.bars_w {
-  width: 100%;
-  height: 90%;
-  transform: translate(-10%, -30%);
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 483b6ad..ea13629 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -61,21 +62,16 @@
   updateTime: null,
   version: null,
 })
-const checkTypeOptions = ref([])
-const transmitRangeOptions = ref([
-  { name: '国家级', id: 0, value: 0 },
-  { name: '省级', id: 1, value: 1 },
-  { name: '本所', id: 2, value: 2 },
-])
+const checkTypeOptions = ref<IOptions[]>([])
 
-const standardOwnerOptions = ref([]) // 标准负责人
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref([]) // 计量专业下拉框
-const standardManagerStateList = ref([]) // 管理状态下拉框
-const standardLevelList = ref([]) // 标准等级下拉框
-const transmitRangeList = ref([]) // 传递范围下拉框
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取下拉框
 const getSelectList = (code: string) => {
   getTypeSelect(code).then((res) => {
@@ -154,22 +150,18 @@
   assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
   uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
   mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-  abc: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  // standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' }],
-
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
+      formInline.value.fileList = res.data
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -201,18 +193,17 @@
   testForm.value.fileList = fileList
   const reader = new FileReader()
   reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
-  }
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
 }
 // 编辑获取详情的提交按钮
 const submitFormDetail = () => {
   if (props.buttonType === '编辑') {
     formInline.value.id = props.infoId
-    formInline.value.laboratoryOwner = null
     getStandardLisUpdate(formInline.value).then((res) => {
       if (res.code === 200) {
         close()
@@ -232,10 +223,10 @@
   }
 }
 // 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
+const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   if (props.buttonType === '详情') { return submitFormDetail() }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
         '确认提交吗？',
@@ -257,19 +248,29 @@
     }
   })
 }
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
 // 标准实验室发生改变
 const changeDeptList = (row: object) => {
   formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwnerName = row.director
+  formInline.value.laboratoryOwner = row.director
 }
 // 标准实验室清空时
 const clearDeptList = () => {
   formInline.value.laboratoryOwnerContact = null
-  formInline.value.laboratoryOwnerName = null
+  formInline.value.laboratoryOwner = null
 }
 // 获取详情信息
 const getInfo = () => {
   getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
     formInline.value = res.data
   })
 }
@@ -285,7 +286,11 @@
         测量标准装置
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+        >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
         <el-button type="warning" @click="close">
@@ -351,7 +356,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="建标单位名称:" prop="constructionStandardUnitName">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
                 placeholder="建标单位名称"
@@ -362,7 +370,7 @@
           <el-col :span="6">
             <el-form-item label="标准负责人:" prop="standardOwner">
               <el-select
-                v-model.trim="formInline.standardOwner"
+                v-model="formInline.standardOwner"
                 clearable
                 placeholder="标准负责人"
                 size="default"
@@ -391,7 +399,7 @@
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
-                v-model.trim="formInline.category"
+                v-model="formInline.category"
                 clearable
                 placeholder="类别"
                 size="default"
@@ -479,7 +487,7 @@
                   v-for="item in standardUsersDeptList"
                   :key="item.id"
                   :label="item.organizeName"
-                  :value="item.id"
+                  :value="item.deptId"
                   @click="changeDeptList(item)"
                 />
               </el-select>
@@ -488,7 +496,7 @@
           <el-col :span="6">
             <el-form-item label="实验室负责人:">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerName"
+                v-model.trim="formInline.laboratoryOwner"
                 placeholder="实验室负责人"
                 :disabled="buttonType === '详情'"
               />
@@ -641,10 +649,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input
-                placeholder="发证单位"
-                disabled
-              />
+              <el-input placeholder="发证单位" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e3ec8d3..35786b2 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,11 +1,379 @@
-<script lang="ts" setup name="ExpirationRemind">
+<script lang="ts" setup name="standardList">
+import { ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistType } from './standard_interface'
+import StandardListAdd from './components/standardListAdd.vue'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
+const listQuery = ref({
+  standardNo: '',
+  standardName: '',
+  category: '',
+  managerState: null,
+  standardLaboratory: null,
+  preparationDate: null,
+  id: null,
+  offset: 1,
+  limit: 10,
+})
+const list = ref([]) // 存放数据
+const isShow = ref(true) // 控制新增页面是否显示
+// 表头
+const columns = ref([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    width: '160',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    width: '90',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    width: '100',
+  },
+  {
+    text: '标准所在部门',
+    value: 'standardLaboratoryName',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '建标项目',
+    value: 'standardOwnerName',
+  },
+  {
+    text: '筹建日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+  {
+    text: '有效日期',
+    value: 'preparationDate',
+    width: '160',
+  },
+])
+const total = ref(0)
+// 表格loding
+const loadingTable = ref(false)
+// 选中的数据
+const checkoutList = ref([])
+// 编辑或者详情id
+const infoId = ref('')
+// 点击的类型
+const buttonType = ref('')
+// 类别下拉框
+const checkTypeOptions = ref<IOptions[]>([])
+// 管理状态下拉框
+const standardManagerStateList = ref<IOptions[]>([])
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取数据
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+  })
+}
+getSelectList('standardCategory') // 获取类别下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+
+// 获取部门信息
+getUsersDept({
+  createTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+}).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    standardNo: '', // 标准代码
+    standardName: '', // 标准名称
+    category: '', // 类别
+    managerState: null,
+    standardLaboratory: null,
+    preparationDate: null,
+    id: null,
+    offset: 1,
+    limit: 10,
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else if (checkoutList.value.length > 0) {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
+      name: '到期提醒列表',
+      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    ElMessage.warning('暂无数据')
+  }
+  loading.close()
+}
+// 新增
+const addList = () => {
+  buttonType.value = ''
+  isShow.value = false
+}
+// 关闭
+const close = () => {
+  isShow.value = true
+  fetchData(true)
+}
+// 点击导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getStandardListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击编辑或详情
+const handleClick = (index: number, row: rowReturn, text: string) => {
+  infoId.value = row.id
+  buttonType.value = text
+  isShow.value = false
+}
 </script>
 
 <template>
-  <app-container>
-    到期提醒
+  <app-container v-if="isShow">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item style="width: 10%;">
+        <el-select
+          v-model.trim="listQuery.category"
+          clearable
+          placeholder="类别"
+          size="default"
+        >
+          <el-option
+            v-for="item in checkTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 11%;">
+        <el-select
+          v-model.trim="listQuery.managerState"
+          clearable
+          placeholder="管理状态"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardManagerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item style="width: 12%;">
+        <el-select
+          v-model.trim="listQuery.standardLaboratory"
+          clearable
+          placeholder="标准所在部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.preparationDate"
+          type="datetime"
+          clearable
+          placeholder="筹建日期"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary" @click="exportAll">
+          导出
+        </el-button>
+        <el-button v-print="printObj" type="primary">
+          打印
+        </el-button>
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="250">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleClick(row.$index, row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleClick(row.$index, row, '详情')"
+              >
+                详情
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
+  <standard-list-add
+    v-else :info-id="infoId" :button-type="buttonType"
+    @close="close"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 329d608..4f1bfdf 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType } from './standard_interface'
+import type { IOptions, IlistType } from './standard_interface'
 import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -12,8 +12,8 @@
   standardNo: '',
   standardName: '',
   category: '',
-  managerState: '',
-  standardLaboratory: '',
+  managerState: null,
+  standardLaboratory: null,
   preparationDate: null,
   id: null,
   offset: 1,
@@ -21,6 +21,8 @@
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
+// 获得权限
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
@@ -60,7 +62,7 @@
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwner',
   },
   {
     text: '筹建日期',
@@ -83,11 +85,11 @@
 // 点击的类型
 const buttonType = ref('')
 // 类别下拉框
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
-const standardManagerStateList = ref([])
+const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
-const standardUsersDeptList = ref([])
+const standardUsersDeptList = ref<IOptions[]>([])
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -141,8 +143,8 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
+    managerState: null,
+    standardLaboratory: null,
     preparationDate: null,
     id: null,
     offset: 1,
@@ -214,8 +216,13 @@
 const exportAll = () => {
   exportExcelBtn()
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  standardName: string
+}
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -238,7 +245,7 @@
     })
 }
 // 点击编辑或详情
-const handleClick = (index: number, row: object, text: string) => {
+const handleClick = (index: number, row: rowReturn, text: string) => {
   infoId.value = row.id
   buttonType.value = text
   isShow.value = false
@@ -323,13 +330,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="addList">
+        <el-button v-if="proxy.hasPerm('/standard/list/add')" type="primary" @click="addList">
           新建
         </el-button>
-        <el-button type="primary" @click="exportAll">
+        <el-button v-if="proxy.hasPerm('/standard/list/export')" type="primary" @click="exportAll">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -341,6 +348,7 @@
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
               <el-button
+                v-if="proxy.hasPerm('/standard/list/edit')"
                 size="small"
                 type="primary"
                 link
@@ -357,6 +365,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/list/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 7883df7..4cba2c4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -10,3 +10,11 @@
   preparationDate: string
   remark: string
 }
+
+export interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 9297420..cb2ebe6 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
-import LineChart from '@/components/Echart/LineChart.vue'
-import EchartsPie from '@/components/echarts/pie.vue'
+import Linechart from '@/components/Echart/LineChart.vue'
+import Piechart from '@/components/echarts/pie.vue'
 import BenchCol from '@/components/benchCol/index.vue'
+import type { lineDataI, pieDataI } from '@/components/Echart/echart-interface'
 import useUserStore from '@/store/modules/user'
 const { username } = useUserStore()
 const buttomTypes = ref([
@@ -37,15 +39,38 @@
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate' },
 ])
-const StatisticxAxis = ref([])
-const StatisticData = ref([])
-const StaffSStatisticyAxis = ref([])
-const StaffSStatisticxAxis = ref([])
-const TrainLogSList = ref([])
-const TrainLogTitle = ref('')
+const StatisticxAxis: Ref<string[]> = ref([])
+const StatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticData: Ref<lineDataI[]> = ref([])
+const StaffSStatisticxAxis: Ref<string[]> = ref([])
+const TrainLogSList: Ref<pieDataI[]> = ref([])
+const TrainLogTitle = ref(0)
 const CertificateList = ref([])
-const CertificateObject = ref({})
-const xAxis = ref([])
+// 我的证书返回值
+interface validReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate:	number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+const CertificateObject = ref<validReturn>({
+  certificateName:	'',
+  count:	'',
+  date:	'',
+  lastValidDate:	0,
+  name:	'',
+  notQualified:	0,
+  qualified:	0,
+  qualifiedCount:	0,
+  trainCount:	0,
+  validDate:	'',
+})
 
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -62,34 +87,42 @@
   getPlanList(params).then((res) => {
     tableData.value = res.data.rows
   })
-  getStatistic().then(async (res) => {
-    StatisticxAxis.value = await res.data.map((item) => {
+  // 培训计划统计返回值
+  interface planReturn {
+    date: string
+    count: string | number
+  }
+  getStatistic().then((res) => {
+    StatisticxAxis.value = res.data.map((item: planReturn) => {
       return item.date
     })
-    StatisticData.value = await res.data.map((item) => {
+    const yValue = res.data.map((item: planReturn) => {
       return Number(item.count)
     })
-    StatisticData.value = [{ name: '', data: StatisticData.value }]
+    StatisticData.value = [{ name: '培训计划', data: yValue }]
   })
-  // StatisticData.value = [{ name: '出勤率', data: [1, 15, 10, 12, 6] }]
-  // StatisticxAxis.value = ['1月', '2月', '3月', '4月', '5月']
-  getStaffSStatistic().then(async (res) => {
-    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
-    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  getStaffSStatistic().then((res) => {
+    StaffSStatisticxAxis.value = res.data.map((item: planReturn) => item.date)
+    const yValue = res.data.map((item: planReturn) => Number(item.count))
+    StaffSStatisticData.value = [{ name: '人数', data: yValue }]
   })
   const param = {
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified || '0' },
-      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified || '0' },
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   })
+  // 返回值
+  interface CertificatReturn {
+    lastValidDate: number
+  }
   getCertificateStatistic(param).then((res) => {
     CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex, max) => {
+    CertificateObject.value = res.data.sort((nex: CertificatReturn, max: CertificatReturn) => {
       return nex.lastValidDate - max.lastValidDate
     })[0]
   })
@@ -117,35 +150,125 @@
 <template>
   <app-container>
     <div class="bench">
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrainStatistic')" title="培训计划" path-url="/train/plan" width="27.8vw" height="40vh">
-        <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrainStatistic')"
+        title="培训计划"
+        path-url="/train/plan"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="tableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/line')" title="培训计划" width="27.8vw" height="40vh">
-        <line-chart :x-axis-data="StatisticxAxis" :data="StatisticData" unit="个" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/meterTrain/line')"
+        title="培训计划"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StatisticData"
+          unit="个"
+        />
       </bench-col>
       <div class="bench-right">
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/buttom')" width="27.8vw" height="20vh">
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/buttom')"
+          width="27.8vw"
+          height="20vh"
+        >
           <div class="bench-right-top">
-            <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            <div
+              v-for="item in buttomTypes"
+              :key="item.id"
+              class="right-top-box"
+              @click="$router.push(item.url)"
+            >
               {{ item.text }}
             </div>
           </div>
         </bench-col>
-        <bench-col v-if="proxy.hasPerm('/workbench/meterTrain/train')" title="我的培训考核" width="27.8vw" height="20vh">
-          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        <bench-col
+          v-if="proxy.hasPerm('/workbench/meterTrain/train')"
+          title="我的培训考核"
+          width="27.8vw"
+          height="20vh"
+        >
+          <div class="pie-chart">
+            <pie-chart
+              :data="TrainLogSList"
+              width="200%"
+              height="200%"
+              :label-formatter="`${TrainLogTitle}`"
+            />
+            <div class="pie-chart-info">
+              <div
+                v-for="(item, index) in TrainLogSList"
+                :key="index"
+                class="chart-info-title"
+              >
+                <div class="chart-info-bg" />
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
         </bench-col>
       </div>
-      <bench-col v-if="proxy.hasPerm('/measure/file/quality')" title="计量文件" path-url="/file/quality" width="27.8vw" height="40vh">
-        <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/measure/file/quality')"
+        title="计量文件"
+        path-url="/file/quality"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="meterageTableData"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in meterageColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/remind')" title="我的证书" width="27.8vw" height="40vh" path-url="/person/remind">
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/remind')"
+        title="我的证书"
+        width="27.8vw"
+        height="40vh"
+        path-url="/person/remind"
+      >
         <div style="display: flex;">
-          <el-table :data="CertificateList" style="width: 65%;height: 31.5vh; border-radius: 10px;">
-            <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          <el-table
+            :data="CertificateList"
+            style="width: 65%; height: 31.5vh; border-radius: 10px;"
+          >
+            <el-table-column
+              v-for="item in CertificateColumns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              :width="item.width"
+            />
           </el-table>
           <div class="validDate">
             <div class="validDate-top">
@@ -158,12 +281,39 @@
           </div>
         </div>
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/list')" title="计量人员" width="27.8vw" height="40vh">
-        <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/list')"
+        title="计量人员"
+        width="27.8vw"
+        height="40vh"
+      >
+        <line-chart
+          :x-axis-data="StaffSStatisticxAxis"
+          width="100%"
+          height="75%"
+          :data="StaffSStatisticData"
+          unit="人"
+        />
       </bench-col>
-      <bench-col v-if="proxy.hasPerm('/workbench/person/certificate')" title="证书预警" path-url="/person/remind" width="27.8vw" height="40vh">
-        <el-table :data="CertificateList" style="width: 100%;height: 80%; border-radius: 10px;">
-          <el-table-column v-for="item in CertificatesColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+      <bench-col
+        v-if="proxy.hasPerm('/workbench/person/certificate')"
+        title="证书预警"
+        path-url="/person/remind"
+        width="27.8vw"
+        height="40vh"
+      >
+        <el-table
+          :data="CertificateList"
+          style="width: 100%; height: 80%; border-radius: 10px;"
+        >
+          <el-table-column
+            v-for="item in CertificatesColumns"
+            :key="item.value"
+            :prop="item.value"
+            align="center"
+            :label="item.text"
+            :width="item.width"
+          />
         </el-table>
       </bench-col>
     </div>
@@ -217,7 +367,9 @@
     width: 100px;
     height: 100px;
     margin-bottom: 30px;
-    background: url("../../../assets/images/bench/clock.png") no-repeat center / cover;
+    background:
+      url("../../../assets/images/bench/clock.png") no-repeat center /
+      cover;
   }
 
   .validDate-top span {
@@ -238,4 +390,32 @@
     color: #999;
   }
 }
+
+.pie-chart {
+  display: flex;
+  align-items: center;
+  transform: translateY(-26%);
+  width: 100%;
+  height: 80%;
+
+  .pie-chart-info {
+    width: 30vw;
+    transform: translate(-35%, -20%);
+    font-size: 12px;
+
+    .chart-info-title {
+      display: flex;
+      align-items: center;
+      margin-top: 10px;
+
+      .chart-info-bg {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        margin-right: 8px;
+        background-color: #3d7eff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 45a3806..5ddc014 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,7 +2,7 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './list_interface'
+import type { IlistQuery, IlistType, optionsType } from './list_interface'
 import ListPriceAdd from './priceAdd.vue'
 import { getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -88,11 +88,11 @@
 // 详情id
 const infoId = ref('0')
 // 校验类型下拉框数组
-const checkTypeOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
 // 类别下拉框数组
-const priceTypeOptions = ref([])
+const priceTypeOptions = ref<optionsType[]>([])
 // 项目下拉框数组
-const priceItemOptions = ref([])
+const priceItemOptions = ref<optionsType[]>([])
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
@@ -110,14 +110,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  priceName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   console.log(row)
   ElMessageBox.confirm(
     `确认删除${row.priceName}吗？`,
@@ -347,10 +352,10 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary">
             批量导入
           </el-button>
-          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary">
             模板下载
           </el-button>
           <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 86a6f2c..b75af64 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -23,3 +23,29 @@
   createTime: string
 }
 
+export interface optionsType {
+  id: string
+  name: string
+  value: string
+}
+
+export interface formInlineType {
+  checkType: string
+  createTime: string
+  directorDiscountPermission: string
+  historicalPriceList: []
+  id: string
+  isDel: number
+  model: string
+  operatorDiscountPermission: string
+  price: string
+  priceDescription: string
+  priceItem: string
+  priceLimit: string
+  priceName: string
+  priceNo: string
+  priceStandard: string
+  priceType: string
+  remark: string
+  updateTime: string
+}
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 40d1f6e..2f623df 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
+import type { formInlineType, optionsType } from './list_interface'
 import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
 const props = defineProps({
   infoId: {
@@ -13,7 +15,7 @@
   },
 })
 const emit = defineEmits(['close'])
-const formInline = ref({
+const formInline: Ref<formInlineType> = ref({
   checkType: '',
   createTime: null,
   directorDiscountPermission: '',
@@ -33,11 +35,11 @@
   remark: '',
   updateTime: null,
 })
-const checkTypeOptions = ref([])
-const priceTypeOptions = ref([])
-const priceItemOptions = ref([])
-const operatorDiscountPermissionOptions = ref([])
-const directorDiscountPermissionOptions = ref([])
+const checkTypeOptions = ref<optionsType[]>([])
+const priceTypeOptions = ref<optionsType[]>([])
+const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionOptions = ref<optionsType[]>([])
+const directorDiscountPermissionOptions = ref<optionsType[]>([])
 const close = () => {
   emit('close')
 }
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 30cd07d..e3dcf25 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="ListSource">
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
@@ -93,14 +93,19 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index a37b9be..a024688 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import type { IformInline } from './list_interface'
+import type { IOptions, IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
@@ -57,13 +57,13 @@
   { text: '职务', value: 'job' },
   { text: '联系方式', value: 'phone' },
 ]
-const provinceList = ref([])
+const provinceList = ref<IOptions[]>([])
 const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
+const cityList = ref<IOptions[]>([])
+const areaList = ref<IOptions[]>([])
+const invoiceProvince = ref<IOptions[]>([])
+const invoiceCityList = ref<IOptions[]>([])
+const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const addPersonList = ref({
   personNo: '',
@@ -228,7 +228,9 @@
 }
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       formInline.value.minioFileName = res.data.fileName
       // fileList.value.push({
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index c576c44..530bcc4 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -19,6 +19,11 @@
   remark: string
 }
 
+export interface IOptions {
+  id: string
+  areaName: string
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -50,12 +55,5 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: [{
-    personNo: string
-    name: string
-    department: string
-    job: string
-    phone: string
-  }]
+  traceSupplierPersonList: []
 }
-
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
index 8265ad5..3390f7f 100644
--- a/src/views/measure/train/components/listPage.vue
+++ b/src/views/measure/train/components/listPage.vue
@@ -2,9 +2,10 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from '../list_interface'
+import type { IOptions, IlistQuery, IlistType } from '../list_interface'
 import ListPageAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { getDeptTree } from '@/api/system/plan'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 const props = defineProps({
@@ -96,6 +97,8 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -114,14 +117,31 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
 // 点击编辑/详情
-const handleEdit = (index: string, row: object, value: string) => {
+const handleEdit = (index: string, row: rowReturn, value: string) => {
   buttonType.value = value
   infoId.value = row.id
   show.value = false
 }
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.supplierName}吗？`,
     '提示',
@@ -269,11 +289,19 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="主管部门"
+          <el-select
+            v-model="listQuery.deptId"
             clearable
-          />
+            placeholder="主管部门"
+            size="default"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-input
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9707995..d8df331 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
 import { getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
@@ -24,7 +24,7 @@
 const infoId = ref('')
 const buttonType = ref('')
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
@@ -146,14 +146,19 @@
   show.value = true
   fetchData(true)
 }
-const handleEdit = (index: string, row: object, type: string) => {
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  planName: string
+}
+const handleEdit = (index: string, row: rowReturn, type: string) => {
   console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
 }
 // 点击删除
-const handleDelete = (index: string, row: object) => {
+const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
     `确认删除${row.planName}吗？`,
     '提示',
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 22fb253..9d717c0 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="PlanAdd">
+import type { IOptions } from './plan_interface'
 import {
   getDeptTree,
   getListAdd,
   getListDetail,
   getListUpdate,
 } from '@/api/system/plan'
-
 const props = defineProps({
   infoId: {
     type: String,
@@ -36,7 +36,7 @@
   trainTime: null,
 })
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -151,6 +151,9 @@
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
+        <el-button v-if=" buttonType === '编辑'" type="primary">
+          保存
+        </el-button>
         <el-button type="warning" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2769c7a..bde995f 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -33,6 +33,11 @@
   limit: number
 }
 
+export interface IOptions {
+  id: string
+  name: string
+}
+
 export interface IlistTypes {
   createTime: string
   deptName: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index dcea9ee..62a5183 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -133,7 +133,11 @@
   show.value = true
   fetchData(true)
 }
-const handleEdit = (index: string, row: object, type: string) => {
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+}
+const handleEdit = (index: string, row: rowReturn, type: string) => {
   console.log(row)
   infoId.value = row.id
   buttonType.value = type
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index b6cdac0..5b49d76 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="PlanAdd">
+import type { IOptions } from './plan_interface'
 import {
   getListDetail,
   getListLogAdd,
@@ -36,7 +37,7 @@
   trainTime: '',
 })
 // 主管部门下拉框
-const options = ref([])
+const options = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 const columns = [
   { text: '学员名称', value: 'name' },
@@ -160,11 +161,17 @@
       </h4>
       <div>
         <el-button
-          v-print="buttonType === '详情' ? printObj : ''"
+          v-if=" buttonType !== '详情'"
           type="primary"
-          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+          @click="getAddList('提交')"
         >
-          {{ buttonType === '详情' ? '打印' : '提交' }}
+          提交
+        </el-button>
+        <el-button v-if=" buttonType === '详情'" v-print="printObj" type="primary" @click="getAddList('打印')">
+          打印
+        </el-button>
+        <el-button v-if=" buttonType === '详情'" type="primary" @click="buttonType = '编辑'">
+          编辑
         </el-button>
         <el-button type="warning" @click="close">
           关闭