diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index f025735..e5253b5 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -60,7 +60,7 @@
 // 受检设备应检数量趋势
 export function getShouldMeasured(data: object) {
   return request({
-    url: '/data/sample/performance/list',
+    url: '/data/sample/shouldMeasure/amount',
     method: 'post',
     data
   })
@@ -89,3 +89,13 @@
     data
   })
 }
+// 受检设备种类数量分析-列表导出
+export function exportDeviceType(data: object) {
+  return request({
+    url: '/data/sample/category/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index f025735..e5253b5 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -60,7 +60,7 @@
 // 受检设备应检数量趋势
 export function getShouldMeasured(data: object) {
   return request({
-    url: '/data/sample/performance/list',
+    url: '/data/sample/shouldMeasure/amount',
     method: 'post',
     data
   })
@@ -89,3 +89,13 @@
     data
   })
 }
+// 受检设备种类数量分析-列表导出
+export function exportDeviceType(data: object) {
+  return request({
+    url: '/data/sample/category/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 60196c7..6f963b1 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -2,9 +2,25 @@
 <script name="EqptDeviceTrend" lang="ts" setup>
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
-import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import type { deptType, dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getCustomerInfoList } from '@/api/resource/customer'
+import {
+  getBaseInfo,
+  getNoVerificationAmount,
+  getDeviceSource,
+  getDeviceType,
+  getAlreadyMeasured,
+  getShouldMeasured,
+  getDevicePerformance,
+  exportDeviceType,
+  getDeviceSourceDept,
+  getDeviceTypeList
+} from '@/api/dataManagement/data/eqptDevice'
 import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
@@ -15,6 +31,11 @@
 // 日期查询条件
 const dateRef = ref()
 const current = ref('')
+// 组别
+const groupCodeList = ref<dictType[]>([])
+const checkDestinationList = ref<dictType[]>([])
+// 委托方
+const customerList = ref<any[]>([])
 setTimeout(() => {
   current.value = '近7日'
 })
@@ -101,12 +122,176 @@
     }
   }
 )
+// 公共查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
   timeEnd: ''
 })
+// 受检设备各种类数量分析 查询条件
+const searchQueryForTypeSoure = ref({
+  // labCode: '',
+  groupCode: '',
+  customerId: ''
+})
+// 获取受检设备各种类数量分析数据
+const fetchQueryForTypeSoure = () => {
+  getDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const current = showChart.value.filter(
+      item => item.name === '受检设备各种类数量分析'
+    )[0]
+    current.data = []
+    const data = []
+    for (const i in res.data) {
+      data.push({
+        name: i,
+        value: res.data[i]
+      })
+    }
+    current.data = data
+    // console.log(data, 'data 1')
+  })
+}
+// 改变受检设备各种类数量分析 查询条件
+const changeSearchQueryForTypeSoure = () => {
+  fetchQueryForTypeSoure()
+}
+// 受检设备已检数量趋势 查询条件
+const searchQueryForMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForMeasured = ref([])
+watch(() => selectForMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+
+  }
+  else {
+    searchQueryForMeasured.value.timeStart = ''
+    searchQueryForMeasured.value.timeEnd = ''
+  }
+  fetchQueryForMeasured()
+})
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForMeasured = () => {
+  getAlreadyMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForMeasured.value,
+    timeStart: searchQueryForMeasured.value.timeStart ? searchQueryForMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备已检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备已检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'emptyCircle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备已检数量趋势 查询条件
+const changeSearchQueryForMeasured = () => {
+  fetchQueryForMeasured()
+}
+// 受检设备应检数量趋势 查询条件
+const searchQueryForShouldMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForShouldMeasured = ref([])
+watch(() => selectForShouldMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForShouldMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+    fetchQueryForShouldMeasured()
+  }
+  else {
+    searchQueryForShouldMeasured.value.timeStart = ''
+    searchQueryForShouldMeasured.value.timeEnd = ''
+  }
+  fetchQueryForShouldMeasured()
+})
+const contextmenu = (name: string) => {
+  console.log(name)
+  if (name === '受检设备已检数量趋势') {
+    selectForMeasured.value = []
+    // fetchQueryForMeasured()
+  } else if (name === '受检设备应检数量趋势') {
+    selectForShouldMeasured.value = []
+    // fetchQueryForShouldMeasured()
+  }
+}
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForShouldMeasured = () => {
+  getShouldMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForShouldMeasured.value,
+    timeStart: searchQueryForShouldMeasured.value.timeStart ? searchQueryForShouldMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备应检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备应检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'circle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备应检数量趋势 查询条件
+const changeSearchQueryForShouldMeasured = () => {
+  fetchQueryForShouldMeasured()
+}
 watch(
   () => props.lab,
   newVal => {
@@ -118,7 +303,6 @@
 )
 // 基础信息展示数据
 const baseInfo = ref([
-
   {
     name: '任务单总量',
     value: 'orderAmount',
@@ -165,13 +349,13 @@
       {
         text: '部门',
         value: 'dept',
-        align: 'center',
+        align: 'center'
       },
       {
         text: '数量',
         value: 'count',
         align: 'center'
-      },
+      }
     ]
   },
   {
@@ -184,23 +368,25 @@
     data: []
   },
   {
-    name: '任务单来源分析',
+    name: '受检设备各种类数量分析',
     type: 'pie',
     source: 'system',
+    // labelPosition: 'outside',
+    // radius: '70%',
     center: ['50%', '60%'],
-    labelPosition: 'outside',
-    radius: '70%',
     data: []
   },
-
   {
-    name: '受检设备种类分析',
-    type: 'pie',
+    name: '受检设备已检数量趋势',
+    type: 'line',
     source: 'system',
-    data: []
+    xAxisData: [],
+    data: [],
+    smooth: false,
+    gradient: false
   },
   {
-    name: '受检设备数量趋势',
+    name: '受检设备应检数量趋势',
     type: 'line',
     source: 'system',
     xAxisData: [],
@@ -210,12 +396,52 @@
   },
   {
     name: '受检设备性能趋势',
-    type: 'line',
+    type: 'rank-table',
     source: 'system',
-    xAxisData: [],
     data: [],
-    smooth: true,
-    gradient: true
+    columns: [
+      // {
+      //   text: '序号',
+      //   value: 'index',
+      //   align: 'center',
+      //   width: '70'
+      // },
+      {
+        text: '设备名称',
+        value: 'sampleName',
+        align: 'center'
+      },
+      {
+        text: '规格型号',
+        value: 'model',
+        align: 'center'
+      },
+      {
+        text: '辅助字段',
+        value: 'helpInstruction',
+        align: 'center'
+      },
+      {
+        text: '生产厂家',
+        value: 'manufacturer',
+        align: 'center'
+      },
+      {
+        text: '报废次数',
+        value: 'discardAmount',
+        align: 'center'
+      },
+      {
+        text: '维修次数',
+        value: 'repairAmount',
+        align: 'center'
+      },
+      {
+        text: '总次数',
+        value: 'totalAmount',
+        align: 'center'
+      }
+    ]
   }
 ])
 watch(
@@ -246,7 +472,7 @@
     console.log(selectCurrentTime.value, 'selectCurrentTime.value')
   }
   searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
-    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
   // 获取基础数据
   getBaseInfo(searchQueryResult.value).then(res => {
     baseInfo.value.forEach(item => {
@@ -255,12 +481,12 @@
   })
   // 未检定数量分析
   getNoVerificationAmount(searchQueryResult.value).then(res => {
-    console.log(res.data, '未检定数量分析')
+    // console.log(res.data, '未检定数量分析')
     const current = showChart.value.filter(
       item => item.name === '未检定设备数量分析'
     )[0]
     current.data = []
-    for(const i in res.data) {
+    for (const i in res.data) {
       current.data.push({
         dept: i,
         count: res.data[i]
@@ -270,7 +496,48 @@
   // 受检设备来源分析
   getDeviceSource(searchQueryResult.value).then(res => {
     console.log(res.data, '受检设备来源分析')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备来源分析'
+    )[0]
+    const data = []
+    for (const i in res.data) {
+      const obj = {
+        name: '',
+        id: '',
+        value: ''
+      }
+      obj.name = i
+      for (const j in res.data[i]) {
+        obj.id = j
+        obj.value = res.data[i][j]
+      }
+      data.push(obj)
+    }
+    current.data = data
+    console.log(data, '受检设备来源分析')
   })
+  // 受检设备各种类数量分析
+  fetchQueryForTypeSoure()
+  // 受检设备已检数量趋势
+  fetchQueryForMeasured()
+  // 受检设备应检数量趋势
+  fetchQueryForShouldMeasured()
+  // 受检设备性能趋势
+  getDevicePerformance({
+    ...searchQueryResult.value,
+    offset: 1,
+    limit: 9999
+  }).then(res => {
+    console.log(res.data, '受检设备性能趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备性能趋势'
+    )[0]
+    current.data = res.data.rows.map((item: any, index: number) => ({
+      ...item,
+      index: index + 1
+    }))
+  })
+  //
   // loading.value = true
   // setTimeout(() => {
   //   // 任务单来源分析
@@ -326,6 +593,127 @@
     // }, 10)
   }
 })
+// 获取字典
+const fetchDict = () => {
+  // 组别
+  getDictByCode('bizGroupCode').then(response => {
+    const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
+    tempMenu.forEach(item => {
+      const tempFindData = response.data.find(
+        (e: { name: string; value: string }) => e.name === item
+      )
+      if (tempFindData) {
+        groupCodeList.value.push({
+          name: tempFindData.name,
+          id: `${tempFindData.id}`,
+          value: `${tempFindData.value}`
+        })
+      }
+    })
+  })
+  // 检定去向
+  getDictByCode('eqptCheckDirection').then(res => {
+    checkDestinationList.value = res.data
+  })
+  // 获取委托方列表
+  getCustomerInfoList({
+    limit: 9999,
+    offset: 1,
+    approvalStatus: '0',
+    formId: 'zyglwtfml'
+  }).then(res => {
+    customerList.value = res.data.rows.map((item: any) => ({
+      name: item.customerName,
+      id: item.id,
+      value: item.id
+    }))
+  })
+}
+fetchDict()
+// 受检设备种类数量分析-列表导出
+const exportType = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '受检设备种类数量分析.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
+}
+// 备份数据 -- 受检设备来源分析
+const deviceSourceData = ref({})
+// 备份数据 -- 受检设备各种类数量分析
+const deviceTypeData = ref({})
+// 点击饼图
+const clickPie = (params: any, ele: any) => {
+  console.log(params, ele, '点击饼图')
+  const current = showChart.value.filter((item: any) => item.name === ele.name)[0]
+  if (ele.name === '受检设备来源分析') {
+    deviceSourceData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceSourceDept({ ...searchQueryResult.value, customerId: params.data.id }).then(res => {
+      current.data = res.data.rows.map((item: any) => ({ ...item, companyName: params.data.name}))
+    })
+  }
+  else if (ele.name === '受检设备各种类数量分析') {
+    deviceTypeData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceTypeList({
+      ...searchQueryResult.value,
+      ...searchQueryForTypeSoure.value,
+      sampleName: params.data.name
+    }).then(res => {
+      // console.log(res.data, '123')
+      current.data = res.data.rows
+    })
+  }
+  current.type = 'rank-table'
+  current.columns = [
+    {
+      text: '单位名称',
+      value: 'companyName',
+      align: 'center',
+    },
+    {
+      text: '设备名称',
+      value: 'equipmentName',
+      align: 'center',
+    },
+    {
+      text: '规格型号',
+      value: 'model',
+      align: 'center',
+    },
+    {
+      text: '辅助字段',
+      value: 'helpInstruction',
+      align: 'center',
+    },
+    {
+      text: '负责人',
+      value: 'directorName',
+      align: 'center',
+    },
+  ]
+}
+// 切换表格
+const changeTable = (name: string) => {
+  if (name !== '受检设备来源分析' && name !== '受检设备各种类数量分析') {
+    return
+  }
+  // if (name === '受检设备来源分析') {
+  let current = showChart.value.findIndex((item: any) => item.name === name)
+  showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // }
+}
 </script>
 
 <template>
@@ -340,25 +728,11 @@
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <div
-          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
-        >
-          <el-date-picker
-            style="width: 101px"
-            ref="dateRef"
-            v-model="selectCurrentTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            class="time-daterange"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD"
-            :disabled-date="pickerOptions"
-            @calendar-change="calendarChange"
-            @focus="handlerFocus"
-            @blur="handlerBlur"
-          />
+        <div style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0">
+          <el-date-picker style="width: 101px" ref="dateRef" v-model="selectCurrentTime" type="daterange"
+            range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="pickerOptions"
+            @calendar-change="calendarChange" @focus="handlerFocus" @blur="handlerBlur" />
         </div>
       </div>
     </div>
@@ -382,69 +756,91 @@
       </div>
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
-      <draggable
-        v-model="showChart"
-        item-key="name"
-        class="chart"
-        animation="300"
-        drag-class="dragClass"
-        ghost-class="ghostClass"
-        chosen-class="chosenClass"
-        @end="onEnd"
-      >
+      <draggable v-model="showChart" item-key="name" class="chart" animation="300" drag-class="dragClass"
+        ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
-          <div
-          :style="{
-              width: `${
-                 '31.5%'
-              }`
-            }"
-            class="chart-item"
-          >
+          <div :style="{
+            width: `${'31.5%'}`
+          }" class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
               <div style="width: 100%; height: 100%">
-                <div
-                  class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
-                >
+                <div class="chart-name"
+                  :class="element.name === '受检设备各种类数量分析' || element.name === '受检设备来源分析' ? 'point' : ''" style="
+                    width: 100%;
+                    height: 10%;
+                    display: flex;
+                    margin-top: 25px;" @click="changeTable(element.name)">
                   {{ element.name }}
-                  <div
-                    v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
-                  >
-                    <el-date-picker
-                      v-model="datetimerange"
-                      type="daterange"
-                      value-format="YYYY-MM-DD"
-                      format="YYYY-MM-DD"
-                      range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                    />
+                  <div v-if="element.name === '受检设备各种类数量分析'" style="margin-left: 40px">
+                    <!-- 部门 -->
+                    <el-select v-model="searchQueryForTypeSoure.groupCode" style="width: 130px" class="short-input"
+                      placeholder="组别" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForTypeSoure.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 导出 -->
+                    <el-button type="primary" @click="exportType">导出</el-button>
+                  </div>
+                  <div v-if="element.name === '受检设备已检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
+                  </div>
+                  <div v-if="element.name === '受检设备应检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForShouldMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForShouldMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForShouldMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
-                  <pie-chart
-                    v-if="element.type === 'pie'"
-                    :title="element.title"
-                    :show-total="element.showTotal"
-                    :data="element.data"
-                    :colors="colors"
-                    :center="element.center"
-                    label-formatter="{style1|{c}}"
-                    :label-position="element.labelPosition"
-                    :radius="element.radius"
-                    :grid="{
+                <div style="width: 100%; height: 80%">
+                  <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal"
+                    :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition" :radius="element.radius" :grid="{
                       top: 50,
                       left: 15,
                       right: 15,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -452,23 +848,17 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <line-chart
-                    v-if="element.type === 'line'"
-                    :colors="colors"
-                    :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData"
-                    :data="element.data"
-                    :smooth="element.smooth"
-                    :grid="{
+                    }" @clickPie="(params: any) => {
+                      clickPie(params, element)
+                    }" />
+                  <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 2,
                       type: 'scroll',
@@ -476,15 +866,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '5'
-                    }"
-                  />
-                  <bar-chart-double
-                    v-if="element.type === 'bar-double'"
-                    :legend-data="element.legendData"
-                    :data1="element.data1"
-                    :data2="element.data2"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-double v-if="element.type === 'bar-double'" :legend-data="element.legendData"
+                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -492,14 +876,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-vertical
-                    v-if="element.type === 'bar-vertical'"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data"
+                    :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -507,15 +886,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-horizontal
-                    v-if="element.type === 'bar-horizontal'"
-                    bar-width="10"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0"
+                    :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -523,15 +896,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <scroll-table
-                    v-if="element.type === 'rank-table'"
-                    style="width: 100%"
-                    :height="300"
-                    :data="element.data"
-                    :columns="element.columns"
-                  />
+                    }" />
+                  <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="300"
+                    :data="element.data" :columns="element.columns" />
                 </div>
               </div>
             </div>
@@ -544,6 +911,12 @@
 </template>
 
 <style lang="scss" scoped>
+.point {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .dragClass {
   /* background-color: blueviolet !important; */
   opacity: 1 !important;
@@ -636,7 +1009,7 @@
     flex-wrap: wrap;
     justify-content: space-around;
     // margin-top: 15px;
-    padding-top: 20px;
+    padding-top: 10px;
 
     .chart-item {
       width: 33%;

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index f025735..e5253b5 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -60,7 +60,7 @@
 // 受检设备应检数量趋势
 export function getShouldMeasured(data: object) {
   return request({
-    url: '/data/sample/performance/list',
+    url: '/data/sample/shouldMeasure/amount',
     method: 'post',
     data
   })
@@ -89,3 +89,13 @@
     data
   })
 }
+// 受检设备种类数量分析-列表导出
+export function exportDeviceType(data: object) {
+  return request({
+    url: '/data/sample/category/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 60196c7..6f963b1 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -2,9 +2,25 @@
 <script name="EqptDeviceTrend" lang="ts" setup>
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
-import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import type { deptType, dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getCustomerInfoList } from '@/api/resource/customer'
+import {
+  getBaseInfo,
+  getNoVerificationAmount,
+  getDeviceSource,
+  getDeviceType,
+  getAlreadyMeasured,
+  getShouldMeasured,
+  getDevicePerformance,
+  exportDeviceType,
+  getDeviceSourceDept,
+  getDeviceTypeList
+} from '@/api/dataManagement/data/eqptDevice'
 import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
@@ -15,6 +31,11 @@
 // 日期查询条件
 const dateRef = ref()
 const current = ref('')
+// 组别
+const groupCodeList = ref<dictType[]>([])
+const checkDestinationList = ref<dictType[]>([])
+// 委托方
+const customerList = ref<any[]>([])
 setTimeout(() => {
   current.value = '近7日'
 })
@@ -101,12 +122,176 @@
     }
   }
 )
+// 公共查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
   timeEnd: ''
 })
+// 受检设备各种类数量分析 查询条件
+const searchQueryForTypeSoure = ref({
+  // labCode: '',
+  groupCode: '',
+  customerId: ''
+})
+// 获取受检设备各种类数量分析数据
+const fetchQueryForTypeSoure = () => {
+  getDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const current = showChart.value.filter(
+      item => item.name === '受检设备各种类数量分析'
+    )[0]
+    current.data = []
+    const data = []
+    for (const i in res.data) {
+      data.push({
+        name: i,
+        value: res.data[i]
+      })
+    }
+    current.data = data
+    // console.log(data, 'data 1')
+  })
+}
+// 改变受检设备各种类数量分析 查询条件
+const changeSearchQueryForTypeSoure = () => {
+  fetchQueryForTypeSoure()
+}
+// 受检设备已检数量趋势 查询条件
+const searchQueryForMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForMeasured = ref([])
+watch(() => selectForMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+
+  }
+  else {
+    searchQueryForMeasured.value.timeStart = ''
+    searchQueryForMeasured.value.timeEnd = ''
+  }
+  fetchQueryForMeasured()
+})
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForMeasured = () => {
+  getAlreadyMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForMeasured.value,
+    timeStart: searchQueryForMeasured.value.timeStart ? searchQueryForMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备已检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备已检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'emptyCircle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备已检数量趋势 查询条件
+const changeSearchQueryForMeasured = () => {
+  fetchQueryForMeasured()
+}
+// 受检设备应检数量趋势 查询条件
+const searchQueryForShouldMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForShouldMeasured = ref([])
+watch(() => selectForShouldMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForShouldMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+    fetchQueryForShouldMeasured()
+  }
+  else {
+    searchQueryForShouldMeasured.value.timeStart = ''
+    searchQueryForShouldMeasured.value.timeEnd = ''
+  }
+  fetchQueryForShouldMeasured()
+})
+const contextmenu = (name: string) => {
+  console.log(name)
+  if (name === '受检设备已检数量趋势') {
+    selectForMeasured.value = []
+    // fetchQueryForMeasured()
+  } else if (name === '受检设备应检数量趋势') {
+    selectForShouldMeasured.value = []
+    // fetchQueryForShouldMeasured()
+  }
+}
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForShouldMeasured = () => {
+  getShouldMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForShouldMeasured.value,
+    timeStart: searchQueryForShouldMeasured.value.timeStart ? searchQueryForShouldMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备应检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备应检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'circle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备应检数量趋势 查询条件
+const changeSearchQueryForShouldMeasured = () => {
+  fetchQueryForShouldMeasured()
+}
 watch(
   () => props.lab,
   newVal => {
@@ -118,7 +303,6 @@
 )
 // 基础信息展示数据
 const baseInfo = ref([
-
   {
     name: '任务单总量',
     value: 'orderAmount',
@@ -165,13 +349,13 @@
       {
         text: '部门',
         value: 'dept',
-        align: 'center',
+        align: 'center'
       },
       {
         text: '数量',
         value: 'count',
         align: 'center'
-      },
+      }
     ]
   },
   {
@@ -184,23 +368,25 @@
     data: []
   },
   {
-    name: '任务单来源分析',
+    name: '受检设备各种类数量分析',
     type: 'pie',
     source: 'system',
+    // labelPosition: 'outside',
+    // radius: '70%',
     center: ['50%', '60%'],
-    labelPosition: 'outside',
-    radius: '70%',
     data: []
   },
-
   {
-    name: '受检设备种类分析',
-    type: 'pie',
+    name: '受检设备已检数量趋势',
+    type: 'line',
     source: 'system',
-    data: []
+    xAxisData: [],
+    data: [],
+    smooth: false,
+    gradient: false
   },
   {
-    name: '受检设备数量趋势',
+    name: '受检设备应检数量趋势',
     type: 'line',
     source: 'system',
     xAxisData: [],
@@ -210,12 +396,52 @@
   },
   {
     name: '受检设备性能趋势',
-    type: 'line',
+    type: 'rank-table',
     source: 'system',
-    xAxisData: [],
     data: [],
-    smooth: true,
-    gradient: true
+    columns: [
+      // {
+      //   text: '序号',
+      //   value: 'index',
+      //   align: 'center',
+      //   width: '70'
+      // },
+      {
+        text: '设备名称',
+        value: 'sampleName',
+        align: 'center'
+      },
+      {
+        text: '规格型号',
+        value: 'model',
+        align: 'center'
+      },
+      {
+        text: '辅助字段',
+        value: 'helpInstruction',
+        align: 'center'
+      },
+      {
+        text: '生产厂家',
+        value: 'manufacturer',
+        align: 'center'
+      },
+      {
+        text: '报废次数',
+        value: 'discardAmount',
+        align: 'center'
+      },
+      {
+        text: '维修次数',
+        value: 'repairAmount',
+        align: 'center'
+      },
+      {
+        text: '总次数',
+        value: 'totalAmount',
+        align: 'center'
+      }
+    ]
   }
 ])
 watch(
@@ -246,7 +472,7 @@
     console.log(selectCurrentTime.value, 'selectCurrentTime.value')
   }
   searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
-    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
   // 获取基础数据
   getBaseInfo(searchQueryResult.value).then(res => {
     baseInfo.value.forEach(item => {
@@ -255,12 +481,12 @@
   })
   // 未检定数量分析
   getNoVerificationAmount(searchQueryResult.value).then(res => {
-    console.log(res.data, '未检定数量分析')
+    // console.log(res.data, '未检定数量分析')
     const current = showChart.value.filter(
       item => item.name === '未检定设备数量分析'
     )[0]
     current.data = []
-    for(const i in res.data) {
+    for (const i in res.data) {
       current.data.push({
         dept: i,
         count: res.data[i]
@@ -270,7 +496,48 @@
   // 受检设备来源分析
   getDeviceSource(searchQueryResult.value).then(res => {
     console.log(res.data, '受检设备来源分析')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备来源分析'
+    )[0]
+    const data = []
+    for (const i in res.data) {
+      const obj = {
+        name: '',
+        id: '',
+        value: ''
+      }
+      obj.name = i
+      for (const j in res.data[i]) {
+        obj.id = j
+        obj.value = res.data[i][j]
+      }
+      data.push(obj)
+    }
+    current.data = data
+    console.log(data, '受检设备来源分析')
   })
+  // 受检设备各种类数量分析
+  fetchQueryForTypeSoure()
+  // 受检设备已检数量趋势
+  fetchQueryForMeasured()
+  // 受检设备应检数量趋势
+  fetchQueryForShouldMeasured()
+  // 受检设备性能趋势
+  getDevicePerformance({
+    ...searchQueryResult.value,
+    offset: 1,
+    limit: 9999
+  }).then(res => {
+    console.log(res.data, '受检设备性能趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备性能趋势'
+    )[0]
+    current.data = res.data.rows.map((item: any, index: number) => ({
+      ...item,
+      index: index + 1
+    }))
+  })
+  //
   // loading.value = true
   // setTimeout(() => {
   //   // 任务单来源分析
@@ -326,6 +593,127 @@
     // }, 10)
   }
 })
+// 获取字典
+const fetchDict = () => {
+  // 组别
+  getDictByCode('bizGroupCode').then(response => {
+    const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
+    tempMenu.forEach(item => {
+      const tempFindData = response.data.find(
+        (e: { name: string; value: string }) => e.name === item
+      )
+      if (tempFindData) {
+        groupCodeList.value.push({
+          name: tempFindData.name,
+          id: `${tempFindData.id}`,
+          value: `${tempFindData.value}`
+        })
+      }
+    })
+  })
+  // 检定去向
+  getDictByCode('eqptCheckDirection').then(res => {
+    checkDestinationList.value = res.data
+  })
+  // 获取委托方列表
+  getCustomerInfoList({
+    limit: 9999,
+    offset: 1,
+    approvalStatus: '0',
+    formId: 'zyglwtfml'
+  }).then(res => {
+    customerList.value = res.data.rows.map((item: any) => ({
+      name: item.customerName,
+      id: item.id,
+      value: item.id
+    }))
+  })
+}
+fetchDict()
+// 受检设备种类数量分析-列表导出
+const exportType = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '受检设备种类数量分析.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
+}
+// 备份数据 -- 受检设备来源分析
+const deviceSourceData = ref({})
+// 备份数据 -- 受检设备各种类数量分析
+const deviceTypeData = ref({})
+// 点击饼图
+const clickPie = (params: any, ele: any) => {
+  console.log(params, ele, '点击饼图')
+  const current = showChart.value.filter((item: any) => item.name === ele.name)[0]
+  if (ele.name === '受检设备来源分析') {
+    deviceSourceData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceSourceDept({ ...searchQueryResult.value, customerId: params.data.id }).then(res => {
+      current.data = res.data.rows.map((item: any) => ({ ...item, companyName: params.data.name}))
+    })
+  }
+  else if (ele.name === '受检设备各种类数量分析') {
+    deviceTypeData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceTypeList({
+      ...searchQueryResult.value,
+      ...searchQueryForTypeSoure.value,
+      sampleName: params.data.name
+    }).then(res => {
+      // console.log(res.data, '123')
+      current.data = res.data.rows
+    })
+  }
+  current.type = 'rank-table'
+  current.columns = [
+    {
+      text: '单位名称',
+      value: 'companyName',
+      align: 'center',
+    },
+    {
+      text: '设备名称',
+      value: 'equipmentName',
+      align: 'center',
+    },
+    {
+      text: '规格型号',
+      value: 'model',
+      align: 'center',
+    },
+    {
+      text: '辅助字段',
+      value: 'helpInstruction',
+      align: 'center',
+    },
+    {
+      text: '负责人',
+      value: 'directorName',
+      align: 'center',
+    },
+  ]
+}
+// 切换表格
+const changeTable = (name: string) => {
+  if (name !== '受检设备来源分析' && name !== '受检设备各种类数量分析') {
+    return
+  }
+  // if (name === '受检设备来源分析') {
+  let current = showChart.value.findIndex((item: any) => item.name === name)
+  showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // }
+}
 </script>
 
 <template>
@@ -340,25 +728,11 @@
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <div
-          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
-        >
-          <el-date-picker
-            style="width: 101px"
-            ref="dateRef"
-            v-model="selectCurrentTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            class="time-daterange"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD"
-            :disabled-date="pickerOptions"
-            @calendar-change="calendarChange"
-            @focus="handlerFocus"
-            @blur="handlerBlur"
-          />
+        <div style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0">
+          <el-date-picker style="width: 101px" ref="dateRef" v-model="selectCurrentTime" type="daterange"
+            range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="pickerOptions"
+            @calendar-change="calendarChange" @focus="handlerFocus" @blur="handlerBlur" />
         </div>
       </div>
     </div>
@@ -382,69 +756,91 @@
       </div>
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
-      <draggable
-        v-model="showChart"
-        item-key="name"
-        class="chart"
-        animation="300"
-        drag-class="dragClass"
-        ghost-class="ghostClass"
-        chosen-class="chosenClass"
-        @end="onEnd"
-      >
+      <draggable v-model="showChart" item-key="name" class="chart" animation="300" drag-class="dragClass"
+        ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
-          <div
-          :style="{
-              width: `${
-                 '31.5%'
-              }`
-            }"
-            class="chart-item"
-          >
+          <div :style="{
+            width: `${'31.5%'}`
+          }" class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
               <div style="width: 100%; height: 100%">
-                <div
-                  class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
-                >
+                <div class="chart-name"
+                  :class="element.name === '受检设备各种类数量分析' || element.name === '受检设备来源分析' ? 'point' : ''" style="
+                    width: 100%;
+                    height: 10%;
+                    display: flex;
+                    margin-top: 25px;" @click="changeTable(element.name)">
                   {{ element.name }}
-                  <div
-                    v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
-                  >
-                    <el-date-picker
-                      v-model="datetimerange"
-                      type="daterange"
-                      value-format="YYYY-MM-DD"
-                      format="YYYY-MM-DD"
-                      range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                    />
+                  <div v-if="element.name === '受检设备各种类数量分析'" style="margin-left: 40px">
+                    <!-- 部门 -->
+                    <el-select v-model="searchQueryForTypeSoure.groupCode" style="width: 130px" class="short-input"
+                      placeholder="组别" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForTypeSoure.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 导出 -->
+                    <el-button type="primary" @click="exportType">导出</el-button>
+                  </div>
+                  <div v-if="element.name === '受检设备已检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
+                  </div>
+                  <div v-if="element.name === '受检设备应检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForShouldMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForShouldMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForShouldMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
-                  <pie-chart
-                    v-if="element.type === 'pie'"
-                    :title="element.title"
-                    :show-total="element.showTotal"
-                    :data="element.data"
-                    :colors="colors"
-                    :center="element.center"
-                    label-formatter="{style1|{c}}"
-                    :label-position="element.labelPosition"
-                    :radius="element.radius"
-                    :grid="{
+                <div style="width: 100%; height: 80%">
+                  <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal"
+                    :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition" :radius="element.radius" :grid="{
                       top: 50,
                       left: 15,
                       right: 15,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -452,23 +848,17 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <line-chart
-                    v-if="element.type === 'line'"
-                    :colors="colors"
-                    :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData"
-                    :data="element.data"
-                    :smooth="element.smooth"
-                    :grid="{
+                    }" @clickPie="(params: any) => {
+                      clickPie(params, element)
+                    }" />
+                  <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 2,
                       type: 'scroll',
@@ -476,15 +866,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '5'
-                    }"
-                  />
-                  <bar-chart-double
-                    v-if="element.type === 'bar-double'"
-                    :legend-data="element.legendData"
-                    :data1="element.data1"
-                    :data2="element.data2"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-double v-if="element.type === 'bar-double'" :legend-data="element.legendData"
+                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -492,14 +876,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-vertical
-                    v-if="element.type === 'bar-vertical'"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data"
+                    :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -507,15 +886,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-horizontal
-                    v-if="element.type === 'bar-horizontal'"
-                    bar-width="10"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0"
+                    :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -523,15 +896,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <scroll-table
-                    v-if="element.type === 'rank-table'"
-                    style="width: 100%"
-                    :height="300"
-                    :data="element.data"
-                    :columns="element.columns"
-                  />
+                    }" />
+                  <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="300"
+                    :data="element.data" :columns="element.columns" />
                 </div>
               </div>
             </div>
@@ -544,6 +911,12 @@
 </template>
 
 <style lang="scss" scoped>
+.point {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .dragClass {
   /* background-color: blueviolet !important; */
   opacity: 1 !important;
@@ -636,7 +1009,7 @@
     flex-wrap: wrap;
     justify-content: space-around;
     // margin-top: 15px;
-    padding-top: 20px;
+    padding-top: 10px;
 
     .chart-item {
       width: 33%;
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index b1e68dd..02380b0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -299,7 +299,7 @@
     searchQueryResult.value.labCode = props.lab
     // 组别
     getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
       tempMenu.forEach(item => {
         const tempFindData = response.data.find(
           (e: { name: string; value: string }) => e.name === item

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index f025735..e5253b5 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -60,7 +60,7 @@
 // 受检设备应检数量趋势
 export function getShouldMeasured(data: object) {
   return request({
-    url: '/data/sample/performance/list',
+    url: '/data/sample/shouldMeasure/amount',
     method: 'post',
     data
   })
@@ -89,3 +89,13 @@
     data
   })
 }
+// 受检设备种类数量分析-列表导出
+export function exportDeviceType(data: object) {
+  return request({
+    url: '/data/sample/category/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 60196c7..6f963b1 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -2,9 +2,25 @@
 <script name="EqptDeviceTrend" lang="ts" setup>
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
-import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import type { deptType, dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getCustomerInfoList } from '@/api/resource/customer'
+import {
+  getBaseInfo,
+  getNoVerificationAmount,
+  getDeviceSource,
+  getDeviceType,
+  getAlreadyMeasured,
+  getShouldMeasured,
+  getDevicePerformance,
+  exportDeviceType,
+  getDeviceSourceDept,
+  getDeviceTypeList
+} from '@/api/dataManagement/data/eqptDevice'
 import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
@@ -15,6 +31,11 @@
 // 日期查询条件
 const dateRef = ref()
 const current = ref('')
+// 组别
+const groupCodeList = ref<dictType[]>([])
+const checkDestinationList = ref<dictType[]>([])
+// 委托方
+const customerList = ref<any[]>([])
 setTimeout(() => {
   current.value = '近7日'
 })
@@ -101,12 +122,176 @@
     }
   }
 )
+// 公共查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
   timeEnd: ''
 })
+// 受检设备各种类数量分析 查询条件
+const searchQueryForTypeSoure = ref({
+  // labCode: '',
+  groupCode: '',
+  customerId: ''
+})
+// 获取受检设备各种类数量分析数据
+const fetchQueryForTypeSoure = () => {
+  getDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const current = showChart.value.filter(
+      item => item.name === '受检设备各种类数量分析'
+    )[0]
+    current.data = []
+    const data = []
+    for (const i in res.data) {
+      data.push({
+        name: i,
+        value: res.data[i]
+      })
+    }
+    current.data = data
+    // console.log(data, 'data 1')
+  })
+}
+// 改变受检设备各种类数量分析 查询条件
+const changeSearchQueryForTypeSoure = () => {
+  fetchQueryForTypeSoure()
+}
+// 受检设备已检数量趋势 查询条件
+const searchQueryForMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForMeasured = ref([])
+watch(() => selectForMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+
+  }
+  else {
+    searchQueryForMeasured.value.timeStart = ''
+    searchQueryForMeasured.value.timeEnd = ''
+  }
+  fetchQueryForMeasured()
+})
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForMeasured = () => {
+  getAlreadyMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForMeasured.value,
+    timeStart: searchQueryForMeasured.value.timeStart ? searchQueryForMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备已检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备已检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'emptyCircle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备已检数量趋势 查询条件
+const changeSearchQueryForMeasured = () => {
+  fetchQueryForMeasured()
+}
+// 受检设备应检数量趋势 查询条件
+const searchQueryForShouldMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForShouldMeasured = ref([])
+watch(() => selectForShouldMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForShouldMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+    fetchQueryForShouldMeasured()
+  }
+  else {
+    searchQueryForShouldMeasured.value.timeStart = ''
+    searchQueryForShouldMeasured.value.timeEnd = ''
+  }
+  fetchQueryForShouldMeasured()
+})
+const contextmenu = (name: string) => {
+  console.log(name)
+  if (name === '受检设备已检数量趋势') {
+    selectForMeasured.value = []
+    // fetchQueryForMeasured()
+  } else if (name === '受检设备应检数量趋势') {
+    selectForShouldMeasured.value = []
+    // fetchQueryForShouldMeasured()
+  }
+}
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForShouldMeasured = () => {
+  getShouldMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForShouldMeasured.value,
+    timeStart: searchQueryForShouldMeasured.value.timeStart ? searchQueryForShouldMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备应检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备应检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'circle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备应检数量趋势 查询条件
+const changeSearchQueryForShouldMeasured = () => {
+  fetchQueryForShouldMeasured()
+}
 watch(
   () => props.lab,
   newVal => {
@@ -118,7 +303,6 @@
 )
 // 基础信息展示数据
 const baseInfo = ref([
-
   {
     name: '任务单总量',
     value: 'orderAmount',
@@ -165,13 +349,13 @@
       {
         text: '部门',
         value: 'dept',
-        align: 'center',
+        align: 'center'
       },
       {
         text: '数量',
         value: 'count',
         align: 'center'
-      },
+      }
     ]
   },
   {
@@ -184,23 +368,25 @@
     data: []
   },
   {
-    name: '任务单来源分析',
+    name: '受检设备各种类数量分析',
     type: 'pie',
     source: 'system',
+    // labelPosition: 'outside',
+    // radius: '70%',
     center: ['50%', '60%'],
-    labelPosition: 'outside',
-    radius: '70%',
     data: []
   },
-
   {
-    name: '受检设备种类分析',
-    type: 'pie',
+    name: '受检设备已检数量趋势',
+    type: 'line',
     source: 'system',
-    data: []
+    xAxisData: [],
+    data: [],
+    smooth: false,
+    gradient: false
   },
   {
-    name: '受检设备数量趋势',
+    name: '受检设备应检数量趋势',
     type: 'line',
     source: 'system',
     xAxisData: [],
@@ -210,12 +396,52 @@
   },
   {
     name: '受检设备性能趋势',
-    type: 'line',
+    type: 'rank-table',
     source: 'system',
-    xAxisData: [],
     data: [],
-    smooth: true,
-    gradient: true
+    columns: [
+      // {
+      //   text: '序号',
+      //   value: 'index',
+      //   align: 'center',
+      //   width: '70'
+      // },
+      {
+        text: '设备名称',
+        value: 'sampleName',
+        align: 'center'
+      },
+      {
+        text: '规格型号',
+        value: 'model',
+        align: 'center'
+      },
+      {
+        text: '辅助字段',
+        value: 'helpInstruction',
+        align: 'center'
+      },
+      {
+        text: '生产厂家',
+        value: 'manufacturer',
+        align: 'center'
+      },
+      {
+        text: '报废次数',
+        value: 'discardAmount',
+        align: 'center'
+      },
+      {
+        text: '维修次数',
+        value: 'repairAmount',
+        align: 'center'
+      },
+      {
+        text: '总次数',
+        value: 'totalAmount',
+        align: 'center'
+      }
+    ]
   }
 ])
 watch(
@@ -246,7 +472,7 @@
     console.log(selectCurrentTime.value, 'selectCurrentTime.value')
   }
   searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
-    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
   // 获取基础数据
   getBaseInfo(searchQueryResult.value).then(res => {
     baseInfo.value.forEach(item => {
@@ -255,12 +481,12 @@
   })
   // 未检定数量分析
   getNoVerificationAmount(searchQueryResult.value).then(res => {
-    console.log(res.data, '未检定数量分析')
+    // console.log(res.data, '未检定数量分析')
     const current = showChart.value.filter(
       item => item.name === '未检定设备数量分析'
     )[0]
     current.data = []
-    for(const i in res.data) {
+    for (const i in res.data) {
       current.data.push({
         dept: i,
         count: res.data[i]
@@ -270,7 +496,48 @@
   // 受检设备来源分析
   getDeviceSource(searchQueryResult.value).then(res => {
     console.log(res.data, '受检设备来源分析')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备来源分析'
+    )[0]
+    const data = []
+    for (const i in res.data) {
+      const obj = {
+        name: '',
+        id: '',
+        value: ''
+      }
+      obj.name = i
+      for (const j in res.data[i]) {
+        obj.id = j
+        obj.value = res.data[i][j]
+      }
+      data.push(obj)
+    }
+    current.data = data
+    console.log(data, '受检设备来源分析')
   })
+  // 受检设备各种类数量分析
+  fetchQueryForTypeSoure()
+  // 受检设备已检数量趋势
+  fetchQueryForMeasured()
+  // 受检设备应检数量趋势
+  fetchQueryForShouldMeasured()
+  // 受检设备性能趋势
+  getDevicePerformance({
+    ...searchQueryResult.value,
+    offset: 1,
+    limit: 9999
+  }).then(res => {
+    console.log(res.data, '受检设备性能趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备性能趋势'
+    )[0]
+    current.data = res.data.rows.map((item: any, index: number) => ({
+      ...item,
+      index: index + 1
+    }))
+  })
+  //
   // loading.value = true
   // setTimeout(() => {
   //   // 任务单来源分析
@@ -326,6 +593,127 @@
     // }, 10)
   }
 })
+// 获取字典
+const fetchDict = () => {
+  // 组别
+  getDictByCode('bizGroupCode').then(response => {
+    const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
+    tempMenu.forEach(item => {
+      const tempFindData = response.data.find(
+        (e: { name: string; value: string }) => e.name === item
+      )
+      if (tempFindData) {
+        groupCodeList.value.push({
+          name: tempFindData.name,
+          id: `${tempFindData.id}`,
+          value: `${tempFindData.value}`
+        })
+      }
+    })
+  })
+  // 检定去向
+  getDictByCode('eqptCheckDirection').then(res => {
+    checkDestinationList.value = res.data
+  })
+  // 获取委托方列表
+  getCustomerInfoList({
+    limit: 9999,
+    offset: 1,
+    approvalStatus: '0',
+    formId: 'zyglwtfml'
+  }).then(res => {
+    customerList.value = res.data.rows.map((item: any) => ({
+      name: item.customerName,
+      id: item.id,
+      value: item.id
+    }))
+  })
+}
+fetchDict()
+// 受检设备种类数量分析-列表导出
+const exportType = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '受检设备种类数量分析.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
+}
+// 备份数据 -- 受检设备来源分析
+const deviceSourceData = ref({})
+// 备份数据 -- 受检设备各种类数量分析
+const deviceTypeData = ref({})
+// 点击饼图
+const clickPie = (params: any, ele: any) => {
+  console.log(params, ele, '点击饼图')
+  const current = showChart.value.filter((item: any) => item.name === ele.name)[0]
+  if (ele.name === '受检设备来源分析') {
+    deviceSourceData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceSourceDept({ ...searchQueryResult.value, customerId: params.data.id }).then(res => {
+      current.data = res.data.rows.map((item: any) => ({ ...item, companyName: params.data.name}))
+    })
+  }
+  else if (ele.name === '受检设备各种类数量分析') {
+    deviceTypeData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceTypeList({
+      ...searchQueryResult.value,
+      ...searchQueryForTypeSoure.value,
+      sampleName: params.data.name
+    }).then(res => {
+      // console.log(res.data, '123')
+      current.data = res.data.rows
+    })
+  }
+  current.type = 'rank-table'
+  current.columns = [
+    {
+      text: '单位名称',
+      value: 'companyName',
+      align: 'center',
+    },
+    {
+      text: '设备名称',
+      value: 'equipmentName',
+      align: 'center',
+    },
+    {
+      text: '规格型号',
+      value: 'model',
+      align: 'center',
+    },
+    {
+      text: '辅助字段',
+      value: 'helpInstruction',
+      align: 'center',
+    },
+    {
+      text: '负责人',
+      value: 'directorName',
+      align: 'center',
+    },
+  ]
+}
+// 切换表格
+const changeTable = (name: string) => {
+  if (name !== '受检设备来源分析' && name !== '受检设备各种类数量分析') {
+    return
+  }
+  // if (name === '受检设备来源分析') {
+  let current = showChart.value.findIndex((item: any) => item.name === name)
+  showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // }
+}
 </script>
 
 <template>
@@ -340,25 +728,11 @@
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <div
-          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
-        >
-          <el-date-picker
-            style="width: 101px"
-            ref="dateRef"
-            v-model="selectCurrentTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            class="time-daterange"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD"
-            :disabled-date="pickerOptions"
-            @calendar-change="calendarChange"
-            @focus="handlerFocus"
-            @blur="handlerBlur"
-          />
+        <div style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0">
+          <el-date-picker style="width: 101px" ref="dateRef" v-model="selectCurrentTime" type="daterange"
+            range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="pickerOptions"
+            @calendar-change="calendarChange" @focus="handlerFocus" @blur="handlerBlur" />
         </div>
       </div>
     </div>
@@ -382,69 +756,91 @@
       </div>
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
-      <draggable
-        v-model="showChart"
-        item-key="name"
-        class="chart"
-        animation="300"
-        drag-class="dragClass"
-        ghost-class="ghostClass"
-        chosen-class="chosenClass"
-        @end="onEnd"
-      >
+      <draggable v-model="showChart" item-key="name" class="chart" animation="300" drag-class="dragClass"
+        ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
-          <div
-          :style="{
-              width: `${
-                 '31.5%'
-              }`
-            }"
-            class="chart-item"
-          >
+          <div :style="{
+            width: `${'31.5%'}`
+          }" class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
               <div style="width: 100%; height: 100%">
-                <div
-                  class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
-                >
+                <div class="chart-name"
+                  :class="element.name === '受检设备各种类数量分析' || element.name === '受检设备来源分析' ? 'point' : ''" style="
+                    width: 100%;
+                    height: 10%;
+                    display: flex;
+                    margin-top: 25px;" @click="changeTable(element.name)">
                   {{ element.name }}
-                  <div
-                    v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
-                  >
-                    <el-date-picker
-                      v-model="datetimerange"
-                      type="daterange"
-                      value-format="YYYY-MM-DD"
-                      format="YYYY-MM-DD"
-                      range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                    />
+                  <div v-if="element.name === '受检设备各种类数量分析'" style="margin-left: 40px">
+                    <!-- 部门 -->
+                    <el-select v-model="searchQueryForTypeSoure.groupCode" style="width: 130px" class="short-input"
+                      placeholder="组别" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForTypeSoure.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 导出 -->
+                    <el-button type="primary" @click="exportType">导出</el-button>
+                  </div>
+                  <div v-if="element.name === '受检设备已检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
+                  </div>
+                  <div v-if="element.name === '受检设备应检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForShouldMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForShouldMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForShouldMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
-                  <pie-chart
-                    v-if="element.type === 'pie'"
-                    :title="element.title"
-                    :show-total="element.showTotal"
-                    :data="element.data"
-                    :colors="colors"
-                    :center="element.center"
-                    label-formatter="{style1|{c}}"
-                    :label-position="element.labelPosition"
-                    :radius="element.radius"
-                    :grid="{
+                <div style="width: 100%; height: 80%">
+                  <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal"
+                    :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition" :radius="element.radius" :grid="{
                       top: 50,
                       left: 15,
                       right: 15,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -452,23 +848,17 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <line-chart
-                    v-if="element.type === 'line'"
-                    :colors="colors"
-                    :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData"
-                    :data="element.data"
-                    :smooth="element.smooth"
-                    :grid="{
+                    }" @clickPie="(params: any) => {
+                      clickPie(params, element)
+                    }" />
+                  <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 2,
                       type: 'scroll',
@@ -476,15 +866,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '5'
-                    }"
-                  />
-                  <bar-chart-double
-                    v-if="element.type === 'bar-double'"
-                    :legend-data="element.legendData"
-                    :data1="element.data1"
-                    :data2="element.data2"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-double v-if="element.type === 'bar-double'" :legend-data="element.legendData"
+                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -492,14 +876,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-vertical
-                    v-if="element.type === 'bar-vertical'"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data"
+                    :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -507,15 +886,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-horizontal
-                    v-if="element.type === 'bar-horizontal'"
-                    bar-width="10"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0"
+                    :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -523,15 +896,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <scroll-table
-                    v-if="element.type === 'rank-table'"
-                    style="width: 100%"
-                    :height="300"
-                    :data="element.data"
-                    :columns="element.columns"
-                  />
+                    }" />
+                  <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="300"
+                    :data="element.data" :columns="element.columns" />
                 </div>
               </div>
             </div>
@@ -544,6 +911,12 @@
 </template>
 
 <style lang="scss" scoped>
+.point {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .dragClass {
   /* background-color: blueviolet !important; */
   opacity: 1 !important;
@@ -636,7 +1009,7 @@
     flex-wrap: wrap;
     justify-content: space-around;
     // margin-top: 15px;
-    padding-top: 20px;
+    padding-top: 10px;
 
     .chart-item {
       width: 33%;
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index b1e68dd..02380b0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -299,7 +299,7 @@
     searchQueryResult.value.labCode = props.lab
     // 组别
     getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
       tempMenu.forEach(item => {
         const tempFindData = response.data.find(
           (e: { name: string; value: string }) => e.name === item
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index b91fbc8..b7d6272 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -800,7 +800,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="文件附件" prop="minioFileName">
+              <el-form-item label="方法确认报告" prop="minioFileName">
                 <el-input v-model="methodConfirm.minioFileName" type="hidden" />
                 <!-- <el-link :href="minioFileUrl" :underline="false" target="_blank"
                   @click="previewFileSystem(minioFileUrl)"> -->

diff --git a/src/api/dataManagement/data/eqptDevice.ts b/src/api/dataManagement/data/eqptDevice.ts
index f025735..e5253b5 100644
--- a/src/api/dataManagement/data/eqptDevice.ts
+++ b/src/api/dataManagement/data/eqptDevice.ts
@@ -60,7 +60,7 @@
 // 受检设备应检数量趋势
 export function getShouldMeasured(data: object) {
   return request({
-    url: '/data/sample/performance/list',
+    url: '/data/sample/shouldMeasure/amount',
     method: 'post',
     data
   })
@@ -89,3 +89,13 @@
     data
   })
 }
+// 受检设备种类数量分析-列表导出
+export function exportDeviceType(data: object) {
+  return request({
+    url: '/data/sample/category/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 60196c7..6f963b1 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -2,9 +2,25 @@
 <script name="EqptDeviceTrend" lang="ts" setup>
 import dayjs from 'dayjs'
 import draggable from 'vuedraggable'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { colors } from '../environment/colors'
 import { getRangeAllTime } from '@/utils/date'
-import { getBaseInfo, getNoVerificationAmount, getDeviceSource } from '@/api/dataManagement/data/eqptDevice'
+import type { deptType, dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getCustomerInfoList } from '@/api/resource/customer'
+import {
+  getBaseInfo,
+  getNoVerificationAmount,
+  getDeviceSource,
+  getDeviceType,
+  getAlreadyMeasured,
+  getShouldMeasured,
+  getDevicePerformance,
+  exportDeviceType,
+  getDeviceSourceDept,
+  getDeviceTypeList
+} from '@/api/dataManagement/data/eqptDevice'
 import { eqptDevice } from './img'
 const props = defineProps({
   lab: {
@@ -15,6 +31,11 @@
 // 日期查询条件
 const dateRef = ref()
 const current = ref('')
+// 组别
+const groupCodeList = ref<dictType[]>([])
+const checkDestinationList = ref<dictType[]>([])
+// 委托方
+const customerList = ref<any[]>([])
 setTimeout(() => {
   current.value = '近7日'
 })
@@ -101,12 +122,176 @@
     }
   }
 )
+// 公共查询条件
 const searchQueryResult = ref({
   groupCode: '',
   labCode: '',
   timeStart: '',
   timeEnd: ''
 })
+// 受检设备各种类数量分析 查询条件
+const searchQueryForTypeSoure = ref({
+  // labCode: '',
+  groupCode: '',
+  customerId: ''
+})
+// 获取受检设备各种类数量分析数据
+const fetchQueryForTypeSoure = () => {
+  getDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const current = showChart.value.filter(
+      item => item.name === '受检设备各种类数量分析'
+    )[0]
+    current.data = []
+    const data = []
+    for (const i in res.data) {
+      data.push({
+        name: i,
+        value: res.data[i]
+      })
+    }
+    current.data = data
+    // console.log(data, 'data 1')
+  })
+}
+// 改变受检设备各种类数量分析 查询条件
+const changeSearchQueryForTypeSoure = () => {
+  fetchQueryForTypeSoure()
+}
+// 受检设备已检数量趋势 查询条件
+const searchQueryForMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForMeasured = ref([])
+watch(() => selectForMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+
+  }
+  else {
+    searchQueryForMeasured.value.timeStart = ''
+    searchQueryForMeasured.value.timeEnd = ''
+  }
+  fetchQueryForMeasured()
+})
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForMeasured = () => {
+  getAlreadyMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForMeasured.value,
+    timeStart: searchQueryForMeasured.value.timeStart ? searchQueryForMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备已检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备已检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'emptyCircle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备已检数量趋势 查询条件
+const changeSearchQueryForMeasured = () => {
+  fetchQueryForMeasured()
+}
+// 受检设备应检数量趋势 查询条件
+const searchQueryForShouldMeasured = ref({
+  timeStart: '',
+  timeEnd: '',
+  customerId: '',
+  checkDestination: ''
+})
+const selectForShouldMeasured = ref([])
+watch(() => selectForShouldMeasured.value, (newVal) => {
+  if (newVal && newVal?.length === 2) {
+    searchQueryForShouldMeasured.value.timeStart = `${newVal[0]} 00:00:00`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[0]} 23:59:59`
+    fetchQueryForShouldMeasured()
+  }
+  else {
+    searchQueryForShouldMeasured.value.timeStart = ''
+    searchQueryForShouldMeasured.value.timeEnd = ''
+  }
+  fetchQueryForShouldMeasured()
+})
+const contextmenu = (name: string) => {
+  console.log(name)
+  if (name === '受检设备已检数量趋势') {
+    selectForMeasured.value = []
+    // fetchQueryForMeasured()
+  } else if (name === '受检设备应检数量趋势') {
+    selectForShouldMeasured.value = []
+    // fetchQueryForShouldMeasured()
+  }
+}
+//  获取受检设备已检数量趋势 数据
+const fetchQueryForShouldMeasured = () => {
+  getShouldMeasured({
+    ...searchQueryResult.value,
+    ...searchQueryForShouldMeasured.value,
+    timeStart: searchQueryForShouldMeasured.value.timeStart ? searchQueryForShouldMeasured.value.timeStart : searchQueryResult.value.timeStart,
+    timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
+  }).then(res => {
+    console.log(res.data, '受检设备应检数量趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备应检数量趋势'
+    )[0]
+    const data = [
+      {
+        name: '海口实验室',
+        value: 'hAmount',
+        data: ''
+      },
+      {
+        name: '西昌实验室',
+        value: 'xAmount',
+        data: ''
+      },
+      {
+        name: '外送',
+        value: 'outAmount',
+        data: ''
+      },
+    ]
+    current.xAxisData = res.data.map((item: any) => item.dimension)
+    current.data = data.map((item: any) => ({
+      name: item.name,
+      symbol: 'circle',
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+    }))
+  })
+}
+// 改变受检设备应检数量趋势 查询条件
+const changeSearchQueryForShouldMeasured = () => {
+  fetchQueryForShouldMeasured()
+}
 watch(
   () => props.lab,
   newVal => {
@@ -118,7 +303,6 @@
 )
 // 基础信息展示数据
 const baseInfo = ref([
-
   {
     name: '任务单总量',
     value: 'orderAmount',
@@ -165,13 +349,13 @@
       {
         text: '部门',
         value: 'dept',
-        align: 'center',
+        align: 'center'
       },
       {
         text: '数量',
         value: 'count',
         align: 'center'
-      },
+      }
     ]
   },
   {
@@ -184,23 +368,25 @@
     data: []
   },
   {
-    name: '任务单来源分析',
+    name: '受检设备各种类数量分析',
     type: 'pie',
     source: 'system',
+    // labelPosition: 'outside',
+    // radius: '70%',
     center: ['50%', '60%'],
-    labelPosition: 'outside',
-    radius: '70%',
     data: []
   },
-
   {
-    name: '受检设备种类分析',
-    type: 'pie',
+    name: '受检设备已检数量趋势',
+    type: 'line',
     source: 'system',
-    data: []
+    xAxisData: [],
+    data: [],
+    smooth: false,
+    gradient: false
   },
   {
-    name: '受检设备数量趋势',
+    name: '受检设备应检数量趋势',
     type: 'line',
     source: 'system',
     xAxisData: [],
@@ -210,12 +396,52 @@
   },
   {
     name: '受检设备性能趋势',
-    type: 'line',
+    type: 'rank-table',
     source: 'system',
-    xAxisData: [],
     data: [],
-    smooth: true,
-    gradient: true
+    columns: [
+      // {
+      //   text: '序号',
+      //   value: 'index',
+      //   align: 'center',
+      //   width: '70'
+      // },
+      {
+        text: '设备名称',
+        value: 'sampleName',
+        align: 'center'
+      },
+      {
+        text: '规格型号',
+        value: 'model',
+        align: 'center'
+      },
+      {
+        text: '辅助字段',
+        value: 'helpInstruction',
+        align: 'center'
+      },
+      {
+        text: '生产厂家',
+        value: 'manufacturer',
+        align: 'center'
+      },
+      {
+        text: '报废次数',
+        value: 'discardAmount',
+        align: 'center'
+      },
+      {
+        text: '维修次数',
+        value: 'repairAmount',
+        align: 'center'
+      },
+      {
+        text: '总次数',
+        value: 'totalAmount',
+        align: 'center'
+      }
+    ]
   }
 ])
 watch(
@@ -246,7 +472,7 @@
     console.log(selectCurrentTime.value, 'selectCurrentTime.value')
   }
   searchQueryResult.value.timeStart = `2024-01-01 00:00:00`
-    searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
+  searchQueryResult.value.timeEnd = `2024-12-31 23:59:59`
   // 获取基础数据
   getBaseInfo(searchQueryResult.value).then(res => {
     baseInfo.value.forEach(item => {
@@ -255,12 +481,12 @@
   })
   // 未检定数量分析
   getNoVerificationAmount(searchQueryResult.value).then(res => {
-    console.log(res.data, '未检定数量分析')
+    // console.log(res.data, '未检定数量分析')
     const current = showChart.value.filter(
       item => item.name === '未检定设备数量分析'
     )[0]
     current.data = []
-    for(const i in res.data) {
+    for (const i in res.data) {
       current.data.push({
         dept: i,
         count: res.data[i]
@@ -270,7 +496,48 @@
   // 受检设备来源分析
   getDeviceSource(searchQueryResult.value).then(res => {
     console.log(res.data, '受检设备来源分析')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备来源分析'
+    )[0]
+    const data = []
+    for (const i in res.data) {
+      const obj = {
+        name: '',
+        id: '',
+        value: ''
+      }
+      obj.name = i
+      for (const j in res.data[i]) {
+        obj.id = j
+        obj.value = res.data[i][j]
+      }
+      data.push(obj)
+    }
+    current.data = data
+    console.log(data, '受检设备来源分析')
   })
+  // 受检设备各种类数量分析
+  fetchQueryForTypeSoure()
+  // 受检设备已检数量趋势
+  fetchQueryForMeasured()
+  // 受检设备应检数量趋势
+  fetchQueryForShouldMeasured()
+  // 受检设备性能趋势
+  getDevicePerformance({
+    ...searchQueryResult.value,
+    offset: 1,
+    limit: 9999
+  }).then(res => {
+    console.log(res.data, '受检设备性能趋势')
+    const current = showChart.value.filter(
+      item => item.name === '受检设备性能趋势'
+    )[0]
+    current.data = res.data.rows.map((item: any, index: number) => ({
+      ...item,
+      index: index + 1
+    }))
+  })
+  //
   // loading.value = true
   // setTimeout(() => {
   //   // 任务单来源分析
@@ -326,6 +593,127 @@
     // }, 10)
   }
 })
+// 获取字典
+const fetchDict = () => {
+  // 组别
+  getDictByCode('bizGroupCode').then(response => {
+    const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
+    tempMenu.forEach(item => {
+      const tempFindData = response.data.find(
+        (e: { name: string; value: string }) => e.name === item
+      )
+      if (tempFindData) {
+        groupCodeList.value.push({
+          name: tempFindData.name,
+          id: `${tempFindData.id}`,
+          value: `${tempFindData.value}`
+        })
+      }
+    })
+  })
+  // 检定去向
+  getDictByCode('eqptCheckDirection').then(res => {
+    checkDestinationList.value = res.data
+  })
+  // 获取委托方列表
+  getCustomerInfoList({
+    limit: 9999,
+    offset: 1,
+    approvalStatus: '0',
+    formId: 'zyglwtfml'
+  }).then(res => {
+    customerList.value = res.data.rows.map((item: any) => ({
+      name: item.customerName,
+      id: item.id,
+      value: item.id
+    }))
+  })
+}
+fetchDict()
+// 受检设备种类数量分析-列表导出
+const exportType = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  exportDeviceType({
+    ...searchQueryResult.value,
+    ...searchQueryForTypeSoure.value
+  }).then(res => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '受检设备种类数量分析.xlsx')
+    loading.close()
+  }).catch(() => {
+    loading.close()
+  })
+}
+// 备份数据 -- 受检设备来源分析
+const deviceSourceData = ref({})
+// 备份数据 -- 受检设备各种类数量分析
+const deviceTypeData = ref({})
+// 点击饼图
+const clickPie = (params: any, ele: any) => {
+  console.log(params, ele, '点击饼图')
+  const current = showChart.value.filter((item: any) => item.name === ele.name)[0]
+  if (ele.name === '受检设备来源分析') {
+    deviceSourceData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceSourceDept({ ...searchQueryResult.value, customerId: params.data.id }).then(res => {
+      current.data = res.data.rows.map((item: any) => ({ ...item, companyName: params.data.name}))
+    })
+  }
+  else if (ele.name === '受检设备各种类数量分析') {
+    deviceTypeData.value = JSON.parse(JSON.stringify(current))
+    current.data = []
+    getDeviceTypeList({
+      ...searchQueryResult.value,
+      ...searchQueryForTypeSoure.value,
+      sampleName: params.data.name
+    }).then(res => {
+      // console.log(res.data, '123')
+      current.data = res.data.rows
+    })
+  }
+  current.type = 'rank-table'
+  current.columns = [
+    {
+      text: '单位名称',
+      value: 'companyName',
+      align: 'center',
+    },
+    {
+      text: '设备名称',
+      value: 'equipmentName',
+      align: 'center',
+    },
+    {
+      text: '规格型号',
+      value: 'model',
+      align: 'center',
+    },
+    {
+      text: '辅助字段',
+      value: 'helpInstruction',
+      align: 'center',
+    },
+    {
+      text: '负责人',
+      value: 'directorName',
+      align: 'center',
+    },
+  ]
+}
+// 切换表格
+const changeTable = (name: string) => {
+  if (name !== '受检设备来源分析' && name !== '受检设备各种类数量分析') {
+    return
+  }
+  // if (name === '受检设备来源分析') {
+  let current = showChart.value.findIndex((item: any) => item.name === name)
+  showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // }
+}
 </script>
 
 <template>
@@ -340,25 +728,11 @@
           </el-radio-button>
         </el-radio-group>
         <!-- 自定义时间选择  --移花接木 -->
-        <div
-          style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0"
-        >
-          <el-date-picker
-            style="width: 101px"
-            ref="dateRef"
-            v-model="selectCurrentTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            class="time-daterange"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD"
-            :disabled-date="pickerOptions"
-            @calendar-change="calendarChange"
-            @focus="handlerFocus"
-            @blur="handlerBlur"
-          />
+        <div style="width: 101px; position: absolute; top: 0; right: 0; opacity: 0">
+          <el-date-picker style="width: 101px" ref="dateRef" v-model="selectCurrentTime" type="daterange"
+            range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="pickerOptions"
+            @calendar-change="calendarChange" @focus="handlerFocus" @blur="handlerBlur" />
         </div>
       </div>
     </div>
@@ -382,69 +756,91 @@
       </div>
       <!-- 图表区域 -->
       <!-- <div class="chart"> -->
-      <draggable
-        v-model="showChart"
-        item-key="name"
-        class="chart"
-        animation="300"
-        drag-class="dragClass"
-        ghost-class="ghostClass"
-        chosen-class="chosenClass"
-        @end="onEnd"
-      >
+      <draggable v-model="showChart" item-key="name" class="chart" animation="300" drag-class="dragClass"
+        ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
-          <div
-          :style="{
-              width: `${
-                 '31.5%'
-              }`
-            }"
-            class="chart-item"
-          >
+          <div :style="{
+            width: `${'31.5%'}`
+          }" class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
             <div v-loading="loading" class="chart-page">
               <div style="width: 100%; height: 100%">
-                <div
-                  class="chart-name"
-                  style="width: 100%; height: 10%; display: flex"
-                >
+                <div class="chart-name"
+                  :class="element.name === '受检设备各种类数量分析' || element.name === '受检设备来源分析' ? 'point' : ''" style="
+                    width: 100%;
+                    height: 10%;
+                    display: flex;
+                    margin-top: 25px;" @click="changeTable(element.name)">
                   {{ element.name }}
-                  <div
-                    v-if="element.name === '人员持证到期趋势'"
-                    style="width: 350px; margin-left: 40px"
-                  >
-                    <el-date-picker
-                      v-model="datetimerange"
-                      type="daterange"
-                      value-format="YYYY-MM-DD"
-                      format="YYYY-MM-DD"
-                      range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                    />
+                  <div v-if="element.name === '受检设备各种类数量分析'" style="margin-left: 40px">
+                    <!-- 部门 -->
+                    <el-select v-model="searchQueryForTypeSoure.groupCode" style="width: 130px" class="short-input"
+                      placeholder="组别" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForTypeSoure.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForTypeSoure">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 导出 -->
+                    <el-button type="primary" @click="exportType">导出</el-button>
+                  </div>
+                  <div v-if="element.name === '受检设备已检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
+                  </div>
+                  <div v-if="element.name === '受检设备应检数量趋势'" style="margin-left: 40px;position: relative;">
+                    <!-- 委托方 -->
+                    <el-select v-model="searchQueryForShouldMeasured.customerId" filterable style="width: 130px"
+                      class="short-input" placeholder="委托方" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.value" />
+                    </el-select>
+                    <!-- 自定义时间 -->
+                    <el-button>自定义时间</el-button>
+                    <div style="width: 102px; position: absolute; top: 0; right: 130px; opacity: 0"
+                      @contextmenu="contextmenu(element.name)">
+                      <el-date-picker style="width: 101px" v-model="selectForShouldMeasured" type="daterange"
+                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" class="time-daterange"
+                        format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                    </div>
+                    <!-- 检定去向 -->
+                    <el-select v-model="searchQueryForShouldMeasured.checkDestination" filterable style="width: 130px"
+                      class="short-input" placeholder="检定去向" clearable @change="changeSearchQueryForShouldMeasured">
+                      <el-option v-for="item in checkDestinationList" :key="item.id" :label="item.name"
+                        :value="item.value" />
+                    </el-select>
                   </div>
                 </div>
-                <div style="width: 100%; height: 90%">
-                  <pie-chart
-                    v-if="element.type === 'pie'"
-                    :title="element.title"
-                    :show-total="element.showTotal"
-                    :data="element.data"
-                    :colors="colors"
-                    :center="element.center"
-                    label-formatter="{style1|{c}}"
-                    :label-position="element.labelPosition"
-                    :radius="element.radius"
-                    :grid="{
+                <div style="width: 100%; height: 80%">
+                  <pie-chart v-if="element.type === 'pie'" :title="element.title" :show-total="element.showTotal"
+                    :data="element.data" :colors="colors" :center="element.center" label-formatter="{style1|{c}}"
+                    :label-position="element.labelPosition" :radius="element.radius" :grid="{
                       top: 50,
                       left: 15,
                       right: 15,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -452,23 +848,17 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <line-chart
-                    v-if="element.type === 'line'"
-                    :colors="colors"
-                    :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData"
-                    :data="element.data"
-                    :smooth="element.smooth"
-                    :grid="{
+                    }" @clickPie="(params: any) => {
+                      clickPie(params, element)
+                    }" />
+                  <line-chart v-if="element.type === 'line'" :colors="colors" :gradient="element.gradient"
+                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
                       bottom: 10,
                       containLabel: true
-                    }"
-                    :legend="{
+                    }" :legend="{
                       itemWidth: 8,
                       itemHeight: 2,
                       type: 'scroll',
@@ -476,15 +866,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '5'
-                    }"
-                  />
-                  <bar-chart-double
-                    v-if="element.type === 'bar-double'"
-                    :legend-data="element.legendData"
-                    :data1="element.data1"
-                    :data2="element.data2"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-double v-if="element.type === 'bar-double'" :legend-data="element.legendData"
+                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -492,14 +876,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-vertical
-                    v-if="element.type === 'bar-vertical'"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical'" :bar-coner="0" :data="element.data"
+                    :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -507,15 +886,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <bar-chart-horizontal
-                    v-if="element.type === 'bar-horizontal'"
-                    bar-width="10"
-                    :bar-coner="0"
-                    :data="element.data"
-                    :x-axis-data="element.xAxisData"
-                    :legend="{
+                    }" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal'" bar-width="10" :bar-coner="0"
+                    :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
                       type: 'scroll',
@@ -523,15 +896,9 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                  />
-                  <scroll-table
-                    v-if="element.type === 'rank-table'"
-                    style="width: 100%"
-                    :height="300"
-                    :data="element.data"
-                    :columns="element.columns"
-                  />
+                    }" />
+                  <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="300"
+                    :data="element.data" :columns="element.columns" />
                 </div>
               </div>
             </div>
@@ -544,6 +911,12 @@
 </template>
 
 <style lang="scss" scoped>
+.point {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
 .dragClass {
   /* background-color: blueviolet !important; */
   opacity: 1 !important;
@@ -636,7 +1009,7 @@
     flex-wrap: wrap;
     justify-content: space-around;
     // margin-top: 15px;
-    padding-top: 20px;
+    padding-top: 10px;
 
     .chart-item {
       width: 33%;
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index b1e68dd..02380b0 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -299,7 +299,7 @@
     searchQueryResult.value.labCode = props.lab
     // 组别
     getDictByCode('bizGroupCode').then(response => {
-      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组']
+      const tempMenu = ['电学电源组', '热工力学组', '无线电脉冲组', '综合管理组']
       tempMenu.forEach(item => {
         const tempFindData = response.data.find(
           (e: { name: string; value: string }) => e.name === item
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index b91fbc8..b7d6272 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -800,7 +800,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="文件附件" prop="minioFileName">
+              <el-form-item label="方法确认报告" prop="minioFileName">
                 <el-input v-model="methodConfirm.minioFileName" type="hidden" />
                 <!-- <el-link :href="minioFileUrl" :underline="false" target="_blank"
                   @click="previewFileSystem(minioFileUrl)"> -->
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9841b9f..0120128 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -64,6 +64,7 @@
   { text: '检测或校准项目', value: 'measureItem', align: 'center' },
   { text: '编制人', value: 'createUserName', align: 'center', width: '180' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '方法确认报告', value: 'minioFileName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
 const statusColumn = ref<TableColumn>({ text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' })