diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 377f585..1cb2985 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -89,7 +89,7 @@
 ])
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -329,10 +329,10 @@
 onMounted(() => {
   if (props.lab) {
     datetimerange.value = [`${new Date().getFullYear()}-01-01`, dayjs().format('YYYY-MM-DD')]
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : 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/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 377f585..1cb2985 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -89,7 +89,7 @@
 ])
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -329,10 +329,10 @@
 onMounted(() => {
   if (props.lab) {
     datetimerange.value = [`${new Date().getFullYear()}-01-01`, dayjs().format('YYYY-MM-DD')]
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : 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/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 3859363..eca8c4f 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -21,7 +21,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -78,6 +78,19 @@
     source: 'system',
     loading: false, // 加载中
     isEmpty: false, // 是否为空
+    gradient: false,
+    colors: [
+      ['#2d8cf0', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+    ],
   },
   {
     name: '近一年部门核查分析',
@@ -147,7 +160,7 @@
   // 近五年标准装置复查趋势
   const current1 = showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0]
   current1.loading = true
-  getNearYearTrend({...searchQueryResult.value,timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getNearYearTrend({ ...searchQueryResult.value, timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近五年标准装置复查趋势')
     current1.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -179,7 +192,7 @@
   //  标准装置状态分析
   const current2 = showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0]
   current2.loading = true
-  getStandardStatusAnalysis({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getStandardStatusAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '标准装置状态分析')
     current2.xAxisData = res.data.map((item: any) => item.approvalTypeName)
     const data = [
@@ -199,10 +212,10 @@
         data: ''
       },
     ]
-    current2.data = data.map((item: any) => ({
+    current2.data = data.map((item: any, index: number) => ({
       name: item.name,
-      // symbol: 'circle',
-      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value])),
+      color: JSON.parse(JSON.stringify(colors)).reverse()[index]
     }))
     current2.loading = false
   }).catch(() => {
@@ -211,7 +224,7 @@
   // 近一年部门核查分析
   const current3 = showChart.value.filter((item: any) => item.name === '近一年部门核查分析')[0]
   current3.loading = true
-  getOneYearAnalysis({...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getOneYearAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近一年部门核查分析')
     current3.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -243,7 +256,7 @@
   // 当年标准装置核查排行榜
   const current4 = showChart.value.filter((item: any) => item.name === '当年标准装置核查排行榜')[0]
   current4.loading = true
-  getCurrentYearRank({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getCurrentYearRank({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '当年标准装置核查排行榜')
     current4.data = res.data.rows
     current4.loading = false
@@ -293,7 +306,7 @@
 // }, 100)
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -336,7 +349,9 @@
         ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
           <div :style="{
-            width: `${showChart.length === 4 ? '48%': index === 0 || index === 1 ? '48%': '31.5%'}`}" class="chart-item">
+            width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}`
+          }"
+            class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
@@ -346,9 +361,10 @@
                   {{ element.name }}
                 </div>
                 <div style="width: 100%; height: 90%">
-                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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="{
+                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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,
@@ -363,8 +379,9 @@
                       left: '0',
                       top: '10'
                     }" />
-                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors" :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
+                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors"
+                    :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data"
+                    :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
@@ -379,17 +396,8 @@
                       left: '0',
                       top: '5'
                     }" />
-                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty" :legend-data="element.legendData"
-                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
-                      itemWidth: 8,
-                      itemHeight: 8,
-                      type: 'scroll',
-                      orient: 'horizontal',
-                      icon: 'roundRect',
-                      left: '0',
-                      top: '10'
-                    }" />
-                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0" :data="element.data"
+                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty"
+                    :legend-data="element.legendData" :data1="element.data1" :data2="element.data2"
                     :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -398,11 +406,8 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                    :colors="element.colors"
-                    :gradient="false"
-                    />
-                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10" :bar-coner="0"
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0"
                     :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -411,10 +416,21 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
+                    }" :colors="element.colors" :gradient="false" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10"
+                    :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :gradient="element.gradient"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
                     }" />
                   <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="310"
                     :data="element.data" :columns="element.columns" />
-                    <el-empty v-if="element.isEmpty" description="暂无数据" />
+                  <el-empty v-if="element.isEmpty" description="暂无数据" />
                 </div>
               </div>
             </div>

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 377f585..1cb2985 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -89,7 +89,7 @@
 ])
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -329,10 +329,10 @@
 onMounted(() => {
   if (props.lab) {
     datetimerange.value = [`${new Date().getFullYear()}-01-01`, dayjs().format('YYYY-MM-DD')]
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : 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/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 3859363..eca8c4f 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -21,7 +21,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -78,6 +78,19 @@
     source: 'system',
     loading: false, // 加载中
     isEmpty: false, // 是否为空
+    gradient: false,
+    colors: [
+      ['#2d8cf0', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+    ],
   },
   {
     name: '近一年部门核查分析',
@@ -147,7 +160,7 @@
   // 近五年标准装置复查趋势
   const current1 = showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0]
   current1.loading = true
-  getNearYearTrend({...searchQueryResult.value,timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getNearYearTrend({ ...searchQueryResult.value, timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近五年标准装置复查趋势')
     current1.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -179,7 +192,7 @@
   //  标准装置状态分析
   const current2 = showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0]
   current2.loading = true
-  getStandardStatusAnalysis({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getStandardStatusAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '标准装置状态分析')
     current2.xAxisData = res.data.map((item: any) => item.approvalTypeName)
     const data = [
@@ -199,10 +212,10 @@
         data: ''
       },
     ]
-    current2.data = data.map((item: any) => ({
+    current2.data = data.map((item: any, index: number) => ({
       name: item.name,
-      // symbol: 'circle',
-      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value])),
+      color: JSON.parse(JSON.stringify(colors)).reverse()[index]
     }))
     current2.loading = false
   }).catch(() => {
@@ -211,7 +224,7 @@
   // 近一年部门核查分析
   const current3 = showChart.value.filter((item: any) => item.name === '近一年部门核查分析')[0]
   current3.loading = true
-  getOneYearAnalysis({...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getOneYearAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近一年部门核查分析')
     current3.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -243,7 +256,7 @@
   // 当年标准装置核查排行榜
   const current4 = showChart.value.filter((item: any) => item.name === '当年标准装置核查排行榜')[0]
   current4.loading = true
-  getCurrentYearRank({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getCurrentYearRank({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '当年标准装置核查排行榜')
     current4.data = res.data.rows
     current4.loading = false
@@ -293,7 +306,7 @@
 // }, 100)
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -336,7 +349,9 @@
         ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
           <div :style="{
-            width: `${showChart.length === 4 ? '48%': index === 0 || index === 1 ? '48%': '31.5%'}`}" class="chart-item">
+            width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}`
+          }"
+            class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
@@ -346,9 +361,10 @@
                   {{ element.name }}
                 </div>
                 <div style="width: 100%; height: 90%">
-                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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="{
+                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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,
@@ -363,8 +379,9 @@
                       left: '0',
                       top: '10'
                     }" />
-                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors" :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
+                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors"
+                    :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data"
+                    :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
@@ -379,17 +396,8 @@
                       left: '0',
                       top: '5'
                     }" />
-                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty" :legend-data="element.legendData"
-                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
-                      itemWidth: 8,
-                      itemHeight: 8,
-                      type: 'scroll',
-                      orient: 'horizontal',
-                      icon: 'roundRect',
-                      left: '0',
-                      top: '10'
-                    }" />
-                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0" :data="element.data"
+                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty"
+                    :legend-data="element.legendData" :data1="element.data1" :data2="element.data2"
                     :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -398,11 +406,8 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                    :colors="element.colors"
-                    :gradient="false"
-                    />
-                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10" :bar-coner="0"
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0"
                     :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -411,10 +416,21 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
+                    }" :colors="element.colors" :gradient="false" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10"
+                    :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :gradient="element.gradient"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
                     }" />
                   <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="310"
                     :data="element.data" :columns="element.columns" />
-                    <el-empty v-if="element.isEmpty" description="暂无数据" />
+                  <el-empty v-if="element.isEmpty" description="暂无数据" />
                 </div>
               </div>
             </div>
diff --git a/src/views/dataManagement/components/data/verificationCertificate.vue b/src/views/dataManagement/components/data/verificationCertificate.vue
index 3aef633..4c30f83 100644
--- a/src/views/dataManagement/components/data/verificationCertificate.vue
+++ b/src/views/dataManagement/components/data/verificationCertificate.vue
@@ -83,7 +83,7 @@
       )
     }
     if (!newVal.includes('自定义')) {
-      searchQueryResult.value.labCode = props.lab
+      searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
       fetchData()
       selectCurrentTime.value = []
     }
@@ -98,7 +98,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
@@ -367,7 +367,7 @@
     const current4 = showChartBase.value.filter(item => item.name === '部门检校证书分析' || item.name === '部门原始记录分析')[0]
     current4.loading = true
     getDeptAnalysis(searchQueryResult.value).then(res => {
-      console.log(res.data, '部门检校证书分析')
+      // console.log(res.data, '部门检校证书分析')
       const data = [
         {
           name: '校准',
@@ -396,6 +396,7 @@
         data: res.data.map((citem: any) => String(citem[item.value])),
         color: JSON.parse(JSON.stringify(colors)).reverse()[index]
       }))
+      console.log(current4.data, 'current4.data')
       current4.loading = false
     }).catch(() => {
       current4.loading = false

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 377f585..1cb2985 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -89,7 +89,7 @@
 ])
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -329,10 +329,10 @@
 onMounted(() => {
   if (props.lab) {
     datetimerange.value = [`${new Date().getFullYear()}-01-01`, dayjs().format('YYYY-MM-DD')]
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : 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/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 3859363..eca8c4f 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -21,7 +21,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -78,6 +78,19 @@
     source: 'system',
     loading: false, // 加载中
     isEmpty: false, // 是否为空
+    gradient: false,
+    colors: [
+      ['#2d8cf0', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+    ],
   },
   {
     name: '近一年部门核查分析',
@@ -147,7 +160,7 @@
   // 近五年标准装置复查趋势
   const current1 = showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0]
   current1.loading = true
-  getNearYearTrend({...searchQueryResult.value,timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getNearYearTrend({ ...searchQueryResult.value, timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近五年标准装置复查趋势')
     current1.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -179,7 +192,7 @@
   //  标准装置状态分析
   const current2 = showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0]
   current2.loading = true
-  getStandardStatusAnalysis({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getStandardStatusAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '标准装置状态分析')
     current2.xAxisData = res.data.map((item: any) => item.approvalTypeName)
     const data = [
@@ -199,10 +212,10 @@
         data: ''
       },
     ]
-    current2.data = data.map((item: any) => ({
+    current2.data = data.map((item: any, index: number) => ({
       name: item.name,
-      // symbol: 'circle',
-      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value])),
+      color: JSON.parse(JSON.stringify(colors)).reverse()[index]
     }))
     current2.loading = false
   }).catch(() => {
@@ -211,7 +224,7 @@
   // 近一年部门核查分析
   const current3 = showChart.value.filter((item: any) => item.name === '近一年部门核查分析')[0]
   current3.loading = true
-  getOneYearAnalysis({...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getOneYearAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近一年部门核查分析')
     current3.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -243,7 +256,7 @@
   // 当年标准装置核查排行榜
   const current4 = showChart.value.filter((item: any) => item.name === '当年标准装置核查排行榜')[0]
   current4.loading = true
-  getCurrentYearRank({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getCurrentYearRank({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '当年标准装置核查排行榜')
     current4.data = res.data.rows
     current4.loading = false
@@ -293,7 +306,7 @@
 // }, 100)
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -336,7 +349,9 @@
         ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
           <div :style="{
-            width: `${showChart.length === 4 ? '48%': index === 0 || index === 1 ? '48%': '31.5%'}`}" class="chart-item">
+            width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}`
+          }"
+            class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
@@ -346,9 +361,10 @@
                   {{ element.name }}
                 </div>
                 <div style="width: 100%; height: 90%">
-                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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="{
+                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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,
@@ -363,8 +379,9 @@
                       left: '0',
                       top: '10'
                     }" />
-                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors" :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
+                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors"
+                    :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data"
+                    :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
@@ -379,17 +396,8 @@
                       left: '0',
                       top: '5'
                     }" />
-                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty" :legend-data="element.legendData"
-                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
-                      itemWidth: 8,
-                      itemHeight: 8,
-                      type: 'scroll',
-                      orient: 'horizontal',
-                      icon: 'roundRect',
-                      left: '0',
-                      top: '10'
-                    }" />
-                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0" :data="element.data"
+                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty"
+                    :legend-data="element.legendData" :data1="element.data1" :data2="element.data2"
                     :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -398,11 +406,8 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                    :colors="element.colors"
-                    :gradient="false"
-                    />
-                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10" :bar-coner="0"
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0"
                     :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -411,10 +416,21 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
+                    }" :colors="element.colors" :gradient="false" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10"
+                    :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :gradient="element.gradient"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
                     }" />
                   <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="310"
                     :data="element.data" :columns="element.columns" />
-                    <el-empty v-if="element.isEmpty" description="暂无数据" />
+                  <el-empty v-if="element.isEmpty" description="暂无数据" />
                 </div>
               </div>
             </div>
diff --git a/src/views/dataManagement/components/data/verificationCertificate.vue b/src/views/dataManagement/components/data/verificationCertificate.vue
index 3aef633..4c30f83 100644
--- a/src/views/dataManagement/components/data/verificationCertificate.vue
+++ b/src/views/dataManagement/components/data/verificationCertificate.vue
@@ -83,7 +83,7 @@
       )
     }
     if (!newVal.includes('自定义')) {
-      searchQueryResult.value.labCode = props.lab
+      searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
       fetchData()
       selectCurrentTime.value = []
     }
@@ -98,7 +98,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
@@ -367,7 +367,7 @@
     const current4 = showChartBase.value.filter(item => item.name === '部门检校证书分析' || item.name === '部门原始记录分析')[0]
     current4.loading = true
     getDeptAnalysis(searchQueryResult.value).then(res => {
-      console.log(res.data, '部门检校证书分析')
+      // console.log(res.data, '部门检校证书分析')
       const data = [
         {
           name: '校准',
@@ -396,6 +396,7 @@
         data: res.data.map((citem: any) => String(citem[item.value])),
         color: JSON.parse(JSON.stringify(colors)).reverse()[index]
       }))
+      console.log(current4.data, 'current4.data')
       current4.loading = false
     }).catch(() => {
       current4.loading = false
diff --git a/src/views/dataManagement/components/environment/UPS.vue b/src/views/dataManagement/components/environment/UPS.vue
index 662ab64..64f2b3f 100644
--- a/src/views/dataManagement/components/environment/UPS.vue
+++ b/src/views/dataManagement/components/environment/UPS.vue
@@ -86,6 +86,7 @@
 }, 1000)
 
 watch(() => $props, (newVal) => {
+  console.log(newVal, 'newVal')
   // 地点变化
   if (newVal.position && newVal.position.length) {
     place.value = newVal.position

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 377f585..1cb2985 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -89,7 +89,7 @@
 ])
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -329,10 +329,10 @@
 onMounted(() => {
   if (props.lab) {
     datetimerange.value = [`${new Date().getFullYear()}-01-01`, dayjs().format('YYYY-MM-DD')]
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : 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/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 3859363..eca8c4f 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -21,7 +21,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -78,6 +78,19 @@
     source: 'system',
     loading: false, // 加载中
     isEmpty: false, // 是否为空
+    gradient: false,
+    colors: [
+      ['#2d8cf0', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+    ],
   },
   {
     name: '近一年部门核查分析',
@@ -147,7 +160,7 @@
   // 近五年标准装置复查趋势
   const current1 = showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0]
   current1.loading = true
-  getNearYearTrend({...searchQueryResult.value,timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getNearYearTrend({ ...searchQueryResult.value, timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近五年标准装置复查趋势')
     current1.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -179,7 +192,7 @@
   //  标准装置状态分析
   const current2 = showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0]
   current2.loading = true
-  getStandardStatusAnalysis({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getStandardStatusAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '标准装置状态分析')
     current2.xAxisData = res.data.map((item: any) => item.approvalTypeName)
     const data = [
@@ -199,10 +212,10 @@
         data: ''
       },
     ]
-    current2.data = data.map((item: any) => ({
+    current2.data = data.map((item: any, index: number) => ({
       name: item.name,
-      // symbol: 'circle',
-      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value])),
+      color: JSON.parse(JSON.stringify(colors)).reverse()[index]
     }))
     current2.loading = false
   }).catch(() => {
@@ -211,7 +224,7 @@
   // 近一年部门核查分析
   const current3 = showChart.value.filter((item: any) => item.name === '近一年部门核查分析')[0]
   current3.loading = true
-  getOneYearAnalysis({...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getOneYearAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近一年部门核查分析')
     current3.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -243,7 +256,7 @@
   // 当年标准装置核查排行榜
   const current4 = showChart.value.filter((item: any) => item.name === '当年标准装置核查排行榜')[0]
   current4.loading = true
-  getCurrentYearRank({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getCurrentYearRank({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '当年标准装置核查排行榜')
     current4.data = res.data.rows
     current4.loading = false
@@ -293,7 +306,7 @@
 // }, 100)
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -336,7 +349,9 @@
         ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
           <div :style="{
-            width: `${showChart.length === 4 ? '48%': index === 0 || index === 1 ? '48%': '31.5%'}`}" class="chart-item">
+            width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}`
+          }"
+            class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
@@ -346,9 +361,10 @@
                   {{ element.name }}
                 </div>
                 <div style="width: 100%; height: 90%">
-                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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="{
+                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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,
@@ -363,8 +379,9 @@
                       left: '0',
                       top: '10'
                     }" />
-                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors" :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
+                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors"
+                    :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data"
+                    :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
@@ -379,17 +396,8 @@
                       left: '0',
                       top: '5'
                     }" />
-                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty" :legend-data="element.legendData"
-                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
-                      itemWidth: 8,
-                      itemHeight: 8,
-                      type: 'scroll',
-                      orient: 'horizontal',
-                      icon: 'roundRect',
-                      left: '0',
-                      top: '10'
-                    }" />
-                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0" :data="element.data"
+                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty"
+                    :legend-data="element.legendData" :data1="element.data1" :data2="element.data2"
                     :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -398,11 +406,8 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                    :colors="element.colors"
-                    :gradient="false"
-                    />
-                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10" :bar-coner="0"
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0"
                     :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -411,10 +416,21 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
+                    }" :colors="element.colors" :gradient="false" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10"
+                    :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :gradient="element.gradient"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
                     }" />
                   <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="310"
                     :data="element.data" :columns="element.columns" />
-                    <el-empty v-if="element.isEmpty" description="暂无数据" />
+                  <el-empty v-if="element.isEmpty" description="暂无数据" />
                 </div>
               </div>
             </div>
diff --git a/src/views/dataManagement/components/data/verificationCertificate.vue b/src/views/dataManagement/components/data/verificationCertificate.vue
index 3aef633..4c30f83 100644
--- a/src/views/dataManagement/components/data/verificationCertificate.vue
+++ b/src/views/dataManagement/components/data/verificationCertificate.vue
@@ -83,7 +83,7 @@
       )
     }
     if (!newVal.includes('自定义')) {
-      searchQueryResult.value.labCode = props.lab
+      searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
       fetchData()
       selectCurrentTime.value = []
     }
@@ -98,7 +98,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
@@ -367,7 +367,7 @@
     const current4 = showChartBase.value.filter(item => item.name === '部门检校证书分析' || item.name === '部门原始记录分析')[0]
     current4.loading = true
     getDeptAnalysis(searchQueryResult.value).then(res => {
-      console.log(res.data, '部门检校证书分析')
+      // console.log(res.data, '部门检校证书分析')
       const data = [
         {
           name: '校准',
@@ -396,6 +396,7 @@
         data: res.data.map((citem: any) => String(citem[item.value])),
         color: JSON.parse(JSON.stringify(colors)).reverse()[index]
       }))
+      console.log(current4.data, 'current4.data')
       current4.loading = false
     }).catch(() => {
       current4.loading = false
diff --git a/src/views/dataManagement/components/environment/UPS.vue b/src/views/dataManagement/components/environment/UPS.vue
index 662ab64..64f2b3f 100644
--- a/src/views/dataManagement/components/environment/UPS.vue
+++ b/src/views/dataManagement/components/environment/UPS.vue
@@ -86,6 +86,7 @@
 }, 1000)
 
 watch(() => $props, (newVal) => {
+  console.log(newVal, 'newVal')
   // 地点变化
   if (newVal.position && newVal.position.length) {
     place.value = newVal.position
diff --git a/src/views/dataManagement/dataBoard.vue b/src/views/dataManagement/dataBoard.vue
index 0025682..b6c1d0b 100644
--- a/src/views/dataManagement/dataBoard.vue
+++ b/src/views/dataManagement/dataBoard.vue
@@ -18,6 +18,7 @@
 
 getDictByCode('bizGroupCodeEquipment').then((response) => {
   labCodeList.value = response.data
+  response.data.push({ name: '全站', id: '全站', value: '全站'})
   // 获取当前用户所在实验室，用来展示对应实验室数据
   getUerDeptLab().then((res) => {
     labCode.value = labCodeList.value.filter(item => item.name === res.data)[0].value || labCodeList.value[0].value

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 377f585..1cb2985 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -89,7 +89,7 @@
 ])
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -329,10 +329,10 @@
 onMounted(() => {
   if (props.lab) {
     datetimerange.value = [`${new Date().getFullYear()}-01-01`, dayjs().format('YYYY-MM-DD')]
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : 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/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 3859363..eca8c4f 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -21,7 +21,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -78,6 +78,19 @@
     source: 'system',
     loading: false, // 加载中
     isEmpty: false, // 是否为空
+    gradient: false,
+    colors: [
+      ['#2d8cf0', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+    ],
   },
   {
     name: '近一年部门核查分析',
@@ -147,7 +160,7 @@
   // 近五年标准装置复查趋势
   const current1 = showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0]
   current1.loading = true
-  getNearYearTrend({...searchQueryResult.value,timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getNearYearTrend({ ...searchQueryResult.value, timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近五年标准装置复查趋势')
     current1.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -179,7 +192,7 @@
   //  标准装置状态分析
   const current2 = showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0]
   current2.loading = true
-  getStandardStatusAnalysis({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getStandardStatusAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '标准装置状态分析')
     current2.xAxisData = res.data.map((item: any) => item.approvalTypeName)
     const data = [
@@ -199,10 +212,10 @@
         data: ''
       },
     ]
-    current2.data = data.map((item: any) => ({
+    current2.data = data.map((item: any, index: number) => ({
       name: item.name,
-      // symbol: 'circle',
-      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value])),
+      color: JSON.parse(JSON.stringify(colors)).reverse()[index]
     }))
     current2.loading = false
   }).catch(() => {
@@ -211,7 +224,7 @@
   // 近一年部门核查分析
   const current3 = showChart.value.filter((item: any) => item.name === '近一年部门核查分析')[0]
   current3.loading = true
-  getOneYearAnalysis({...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getOneYearAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近一年部门核查分析')
     current3.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -243,7 +256,7 @@
   // 当年标准装置核查排行榜
   const current4 = showChart.value.filter((item: any) => item.name === '当年标准装置核查排行榜')[0]
   current4.loading = true
-  getCurrentYearRank({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getCurrentYearRank({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '当年标准装置核查排行榜')
     current4.data = res.data.rows
     current4.loading = false
@@ -293,7 +306,7 @@
 // }, 100)
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -336,7 +349,9 @@
         ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
           <div :style="{
-            width: `${showChart.length === 4 ? '48%': index === 0 || index === 1 ? '48%': '31.5%'}`}" class="chart-item">
+            width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}`
+          }"
+            class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
@@ -346,9 +361,10 @@
                   {{ element.name }}
                 </div>
                 <div style="width: 100%; height: 90%">
-                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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="{
+                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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,
@@ -363,8 +379,9 @@
                       left: '0',
                       top: '10'
                     }" />
-                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors" :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
+                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors"
+                    :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data"
+                    :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
@@ -379,17 +396,8 @@
                       left: '0',
                       top: '5'
                     }" />
-                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty" :legend-data="element.legendData"
-                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
-                      itemWidth: 8,
-                      itemHeight: 8,
-                      type: 'scroll',
-                      orient: 'horizontal',
-                      icon: 'roundRect',
-                      left: '0',
-                      top: '10'
-                    }" />
-                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0" :data="element.data"
+                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty"
+                    :legend-data="element.legendData" :data1="element.data1" :data2="element.data2"
                     :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -398,11 +406,8 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                    :colors="element.colors"
-                    :gradient="false"
-                    />
-                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10" :bar-coner="0"
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0"
                     :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -411,10 +416,21 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
+                    }" :colors="element.colors" :gradient="false" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10"
+                    :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :gradient="element.gradient"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
                     }" />
                   <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="310"
                     :data="element.data" :columns="element.columns" />
-                    <el-empty v-if="element.isEmpty" description="暂无数据" />
+                  <el-empty v-if="element.isEmpty" description="暂无数据" />
                 </div>
               </div>
             </div>
diff --git a/src/views/dataManagement/components/data/verificationCertificate.vue b/src/views/dataManagement/components/data/verificationCertificate.vue
index 3aef633..4c30f83 100644
--- a/src/views/dataManagement/components/data/verificationCertificate.vue
+++ b/src/views/dataManagement/components/data/verificationCertificate.vue
@@ -83,7 +83,7 @@
       )
     }
     if (!newVal.includes('自定义')) {
-      searchQueryResult.value.labCode = props.lab
+      searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
       fetchData()
       selectCurrentTime.value = []
     }
@@ -98,7 +98,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
@@ -367,7 +367,7 @@
     const current4 = showChartBase.value.filter(item => item.name === '部门检校证书分析' || item.name === '部门原始记录分析')[0]
     current4.loading = true
     getDeptAnalysis(searchQueryResult.value).then(res => {
-      console.log(res.data, '部门检校证书分析')
+      // console.log(res.data, '部门检校证书分析')
       const data = [
         {
           name: '校准',
@@ -396,6 +396,7 @@
         data: res.data.map((citem: any) => String(citem[item.value])),
         color: JSON.parse(JSON.stringify(colors)).reverse()[index]
       }))
+      console.log(current4.data, 'current4.data')
       current4.loading = false
     }).catch(() => {
       current4.loading = false
diff --git a/src/views/dataManagement/components/environment/UPS.vue b/src/views/dataManagement/components/environment/UPS.vue
index 662ab64..64f2b3f 100644
--- a/src/views/dataManagement/components/environment/UPS.vue
+++ b/src/views/dataManagement/components/environment/UPS.vue
@@ -86,6 +86,7 @@
 }, 1000)
 
 watch(() => $props, (newVal) => {
+  console.log(newVal, 'newVal')
   // 地点变化
   if (newVal.position && newVal.position.length) {
     place.value = newVal.position
diff --git a/src/views/dataManagement/dataBoard.vue b/src/views/dataManagement/dataBoard.vue
index 0025682..b6c1d0b 100644
--- a/src/views/dataManagement/dataBoard.vue
+++ b/src/views/dataManagement/dataBoard.vue
@@ -18,6 +18,7 @@
 
 getDictByCode('bizGroupCodeEquipment').then((response) => {
   labCodeList.value = response.data
+  response.data.push({ name: '全站', id: '全站', value: '全站'})
   // 获取当前用户所在实验室，用来展示对应实验室数据
   getUerDeptLab().then((res) => {
     labCode.value = labCodeList.value.filter(item => item.name === res.data)[0].value || labCodeList.value[0].value
diff --git a/src/views/dataManagement/environmentBoard.vue b/src/views/dataManagement/environmentBoard.vue
index 6c3e2f0..7e56a22 100644
--- a/src/views/dataManagement/environmentBoard.vue
+++ b/src/views/dataManagement/environmentBoard.vue
@@ -12,6 +12,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getLocationList, getUerDeptLab } from '@/api/business/taskMeasure/measureData'
 import { getPlaceList } from '@/api/dataManagement/environmentBoard'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 // 日期查询条件
 const current = ref('')
 setTimeout(() => {
@@ -47,15 +49,27 @@
     startTime.value = ''
   }
 }
+const clickCustom = () => {
+  current.value = '自定义时间'
+}
 // 实验室
 const labCode = ref('')
 const labCodeList = ref<string[]>([])
 
 getDictByCode('labDept').then((response) => {
-  labCodeList.value = response.data.map((item: any) => item.name)
+  // if (userInfo.roleNames.includes('超级管理员')) {
+    labCodeList.value = response.data.map((item: any) => item.name)
+  // }
+  // else {
+
+  // }
+
   // 获取当前用户所在实验室，用来展示对应实验室数据
   getUerDeptLab().then((res) => {
     labCode.value = labCodeList.value.filter(item => item === res.data)[0] || labCodeList.value[0]
+    if(!userInfo.roleNames.includes('超级管理员')) {
+      labCodeList.value = labCodeList.value.filter(item => item === res.data)
+    }
   })
 })
 // 当前时间
@@ -133,19 +147,11 @@
         </el-radio-button>
       </el-radio-group>
       <!-- 自定义时间选择  --移花接木 -->
-      <el-date-picker
-        ref="dateRef"
-        v-model="selectCurrentTime"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        class="time-daterange"
-        style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-        format="YYYY-MM-DD"
-        value-format="YYYY-MM-DD"
-        :disabled-date="pickerOptions" @calendar-change="calendarChange "
-      />
+      <div class="time-daterange" @click="clickCustom">
+        <el-date-picker ref="dateRef" v-model="selectCurrentTime" type="daterange" range-separator="至"
+          start-placeholder="开始时间" end-placeholder="结束时间" style="width: 100%;" format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD" :disabled-date="pickerOptions" @calendar-change="calendarChange" />
+      </div>
     </div>
     <div class="label">
       <el-select v-model="labCode" style="width: 192px;">
@@ -161,11 +167,14 @@
     <!-- 左侧 -->
     <div class="left-show">
       <!-- 温度变化趋势 -->
-      <temperature-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['1'] || []" :place-loading="placeLoading" />
+      <temperature-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['1'] || []" :place-loading="placeLoading" />
       <!-- 湿度变化趋势 -->
-      <humidity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['2'] || []" :place-loading="placeLoading" />
+      <humidity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['2'] || []" :place-loading="placeLoading" />
       <!-- 烟雾值报警趋势 -->
-      <smoke-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['3'] || []" :place-loading="placeLoading" />
+      <smoke-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['3'] || []" :place-loading="placeLoading" />
     </div>
     <!-- 中间 -->
     <div class="middle-show">
@@ -177,11 +186,14 @@
     <!-- 右侧 -->
     <div class="right-show">
       <!-- 电量变化趋势 -->
-      <electricity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['4'] || []" :place-loading="placeLoading" />
+      <electricity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['4'] || []" :place-loading="placeLoading" />
       <!-- 氧气浓度变化趋势 -->
-      <oxygen-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['5'] || []" :place-loading="placeLoading" />
+      <oxygen-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['5'] || []" :place-loading="placeLoading" />
       <!-- UPS电源间变化趋势 -->
-      <ups-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['6'] || []" :place-loading="placeLoading" />
+      <ups-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['6'] || []" :place-loading="placeLoading" />
     </div>
   </div>
 </template>
@@ -224,4 +236,17 @@
 
   // CEDAF6
 }
+
+.btns {
+  position: relative;
+
+  .time-daterange {
+    position: absolute;
+    right: 0;
+    width: 100px;
+    top: 0;
+    opacity: 0;
+    z-index: 9;
+  }
+}
 </style>

diff --git a/src/views/dataManagement/components/data/device.vue b/src/views/dataManagement/components/data/device.vue
index 23efd69..8565f52 100644
--- a/src/views/dataManagement/components/data/device.vue
+++ b/src/views/dataManagement/components/data/device.vue
@@ -24,7 +24,7 @@
 
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -439,7 +439,7 @@
 onMounted(() => {
   year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue
index 83a7083..31c6d26 100644
--- a/src/views/dataManagement/components/data/eqptDevice.vue
+++ b/src/views/dataManagement/components/data/eqptDevice.vue
@@ -11,6 +11,9 @@
 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'
+import { getEquipmentList } from '@/api/business/manager/order'
+import { uniqueMultiArray } from '@/utils/Array'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   lab: {
     type: String,
@@ -23,6 +26,14 @@
 // 组别
 const groupCodeList = ref<dictType[]>([])
 const checkDestinationList = ref<dictType[]>([])
+// 受检设备
+const sampleNameList = ref<any[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpInstructionList = ref<any[]>([])
+// 所有受检设备
+const allDeviceList = ref<any[]>([])
 // 委托方
 const customerList = ref<any[]>([])
 setTimeout(() => {
@@ -155,11 +166,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForMeasured = ref([])
+const selectForMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
 
   }
   else {
@@ -179,23 +193,27 @@
     timeEnd: searchQueryForMeasured.value.timeEnd ? searchQueryForMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备已检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -218,11 +236,14 @@
   customerId: '',
   checkDestination: ''
 })
-const selectForShouldMeasured = ref([])
+const selectForShouldMeasured = ref<any[]>([])
+setTimeout(() => {
+  selectForShouldMeasured.value = [dayjs().format('YYYY-MM-DD'), dayjs().add(6, 'month').format('YYYY-MM-DD')]
+}, 2000);
 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`
+    searchQueryForShouldMeasured.value.timeEnd = `${newVal[1]} 23:59:59`
     fetchQueryForShouldMeasured()
   }
   else {
@@ -252,23 +273,28 @@
     timeEnd: searchQueryForShouldMeasured.value.timeEnd ? searchQueryForShouldMeasured.value.timeEnd : searchQueryResult.value.timeEnd,
   }).then(res => {
     // console.log(res.data, '受检设备应检数量趋势')
-    const data = [
+    const initData = [
       {
         name: '海口实验室',
         value: 'hAmount',
-        data: ''
+        data: '',
+        showLab: ['H', '']
       },
       {
         name: '西昌实验室',
         value: 'xAmount',
-        data: ''
+        data: '',
+        showLab: ['X', '']
       },
       {
         name: '外送',
         value: 'outAmount',
-        data: ''
+        data: '',
+        showLab: ['X', 'H', '']
       },
     ]
+    const data = initData.filter((item: any) => item.showLab.includes(props.lab === '全站' ? '' : props.lab))
+    console.log(data, props.lab)
     current.xAxisData = res.data.map((item: any) => item.dimension)
     current.data = data.map((item: any) => ({
       name: item.name,
@@ -286,7 +312,7 @@
 }
 watch(() => props.lab, newVal => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -445,6 +471,45 @@
     window.dispatchEvent(resize)
   })
 })
+// 受检设备性能趋势查询条件
+const searchQueryForDevicePerformance = ref({
+  sampleName: '',
+  helpInstruction: '',
+  model: '',
+  manufacturer: ''
+})
+// 改变设备名称查询条件
+const changeSampleName = (value: string) => {
+  modelList.value = []
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.model = ''
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  modelList.value = uniqueMultiArray(allDeviceList.value.filter((item: any) => item.equipmentName === value).map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+  helpInstructionList.value = modelList.value
+}
+// 改变规格型号查询条件
+const changeHelpInstruction = (value: string) => {
+  helpInstructionList.value = []
+  searchQueryForDevicePerformance.value.helpInstruction = ''
+  helpInstructionList.value = modelList.value.filter(item => item.model === value)
+}
+watch(() => searchQueryForDevicePerformance.value, () => {
+  fetchQueryForDevicePerformance()
+}, {
+  deep: true
+})
+// 获取受检设备性能趋势数据
+const fetchQueryForDevicePerformance = () => {
+  const current3 = showChart.value.filter(item => item.name === '受检设备性能趋势')[0]
+  current3.loading = true
+  getDevicePerformance({ ...searchQueryForDevicePerformance.value, ...searchQueryResult.value, offset: 1, limit: 9999 }).then(res => {
+    // console.log(res.data, '受检设备性能趋势')
+    current3.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 }))
+    current3.loading = false
+  }).catch(() => {
+    current3.loading = false
+  })
+}
 // 获取数据
 const loadingBase = ref(false)
 function fetchData() {
@@ -575,7 +640,7 @@
 onMounted(() => {
   // year.value = String(currentYear)
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // setTimeout(() => {
     //   fetchData()
     // }, 10)
@@ -611,6 +676,13 @@
       value: item.id
     }))
   })
+  getEquipmentList({ offset: 1, limit: 9999 }).then((res) => {
+    console.log(res.data, '手贱设备')
+    allDeviceList.value = res.data.rows
+    sampleNameList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'sampleName',)
+    modelList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'model',)
+    helpInstructionList.value = uniqueMultiArray(res.data.rows.map((item: any) => ({ sampleName: item.equipmentName, model: item.model, helpInstruction: item.helpInstruction, })), 'helpInstruction',)
+  })
 }
 fetchDict()
 // 受检设备种类数量分析-列表导出
@@ -694,7 +766,12 @@
   }
   // if (name === '受检设备来源分析') {
   let current = showChart.value.findIndex((item: any) => item.name === name)
+  if (showChart.value[current].type !== 'rank-table') {
+    return
+  }
   showChart.value[current] = name === '受检设备来源分析' ? deviceSourceData.value : deviceTypeData.value
+  // console.log(current, 'current')
+  showChart.value[current].loading = false
   // }
 }
 </script>
@@ -807,6 +884,27 @@
                         :value="item.value" />
                     </el-select>
                   </div>
+                  <div v-if="element.name === '受检设备性能趋势'" style="margin-left: 40px">
+                    <!-- 设备名称 -->
+                    <el-select v-model="searchQueryForDevicePerformance.sampleName" filterable style="width: 100px;"
+                      class="short-input" placeholder="受检设备名称" clearable @change="changeSampleName">
+                      <el-option v-for="item in sampleNameList" :key="item.sampleName" :label="item.sampleName"
+                        :value="item.sampleName" />
+                    </el-select>
+                    <!-- 规格型号 -->
+                    <el-select v-model="searchQueryForDevicePerformance.model" filterable style="width: 100px;" class="short-input"
+                      placeholder="规格型号" clearable @change="changeHelpInstruction">
+                      <el-option v-for="item in modelList" :key="item.model" :label="item.model" :value="item.model" />
+                    </el-select>
+                    <!-- 辅助字段 -->
+                    <el-select v-model="searchQueryForDevicePerformance.helpInstruction" filterable style="width: 100px;"
+                      class="short-input" placeholder="辅助字段" clearable>
+                      <el-option v-for="item in helpInstructionList" :key="item.helpInstruction"
+                        :label="item.helpInstruction" :value="item.helpInstruction" />
+                    </el-select>
+                    <!-- 出场编号 -->
+                    <el-input v-model="searchQueryForDevicePerformance.manufacturer" style="width: 100px;" placeholder="出厂编号" />
+                  </div>
                 </div>
                 <div style="width: 100%; height: 80%">
                   <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :title="element.title"
diff --git a/src/views/dataManagement/components/data/meteringVerification.vue b/src/views/dataManagement/components/data/meteringVerification.vue
index 7952cd2..a75821a 100644
--- a/src/views/dataManagement/components/data/meteringVerification.vue
+++ b/src/views/dataManagement/components/data/meteringVerification.vue
@@ -22,7 +22,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -114,7 +114,7 @@
     customerId: '',
     groupCode: '',
     helpInstruction: '',
-    labCode: props.lab,
+    labCode: props.lab === '全站' ? '' : props.lab,
     model: '',
     sampleName: '',
     timeEnd: '',
@@ -168,7 +168,7 @@
 ])
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     // 实验室
     getDictByCode('bizGroupCodeEquipment').then((response) => {
       labCodeList.value = response.data
@@ -284,7 +284,7 @@
 function fetchData() {
   // 获取基础数据
   loadingBase.value = true
-  getBaseInfo({ labCode: props.lab }).then((res) => {
+  getBaseInfo({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     console.log(res.data, '获取基础数据')
     baseInfo.value.forEach((item) => {
       item.data = res.data[item.value]
@@ -296,7 +296,7 @@
   // 在检设备分析
   const current1 = showChart.value.filter(item => item.name === '在检设备分析')[0]
   current1.loading = true
-  getDeviceAnalysis({ labCode: props.lab }).then((res) => {
+  getDeviceAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '分包方',
@@ -342,7 +342,7 @@
   // 当年已检设备排行
   const current2 = showChart.value.filter(item => item.name === '当年已检设备排行TOP10')[0]
   current2.loading = true
-  getAlreadyDeviceRank({ labCode: props.lab }).then((res) => {
+  getAlreadyDeviceRank({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     current2.data = []
     for (const i in res.data) {
       current2.data.push({
@@ -357,7 +357,7 @@
   // 检定及时分析
   const current3 = showChart.value.filter(item => item.name === '检定及时分析')[0]
   current3.loading = true
-  getTimelyAnalysis({ labCode: props.lab }).then((res) => {
+  getTimelyAnalysis({ labCode: props.lab === '全站' ? '' : props.lab }).then((res) => {
     const data = [
       {
         name: '提前检定',
diff --git a/src/views/dataManagement/components/data/resourceManage.vue b/src/views/dataManagement/components/data/resourceManage.vue
index 377f585..1cb2985 100644
--- a/src/views/dataManagement/components/data/resourceManage.vue
+++ b/src/views/dataManagement/components/data/resourceManage.vue
@@ -89,7 +89,7 @@
 ])
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -329,10 +329,10 @@
 onMounted(() => {
   if (props.lab) {
     datetimerange.value = [`${new Date().getFullYear()}-01-01`, dayjs().format('YYYY-MM-DD')]
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : 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/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue
index 3859363..eca8c4f 100644
--- a/src/views/dataManagement/components/data/standardDevice.vue
+++ b/src/views/dataManagement/components/data/standardDevice.vue
@@ -21,7 +21,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -78,6 +78,19 @@
     source: 'system',
     loading: false, // 加载中
     isEmpty: false, // 是否为空
+    gradient: false,
+    colors: [
+      ['#2d8cf0', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+      ['#2352d6', '#fff'],
+      ['#fed700', '#fff'],
+      ['#feb501', '#fff'],
+    ],
   },
   {
     name: '近一年部门核查分析',
@@ -147,7 +160,7 @@
   // 近五年标准装置复查趋势
   const current1 = showChart.value.filter((item: any) => item.name === '近五年标准装置复查趋势')[0]
   current1.loading = true
-  getNearYearTrend({...searchQueryResult.value,timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getNearYearTrend({ ...searchQueryResult.value, timeStart: dayjs().subtract(5, 'year').format('YYYY-MM-DD'), timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近五年标准装置复查趋势')
     current1.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -179,7 +192,7 @@
   //  标准装置状态分析
   const current2 = showChart.value.filter((item: any) => item.name === '标准装置状态分析')[0]
   current2.loading = true
-  getStandardStatusAnalysis({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getStandardStatusAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '标准装置状态分析')
     current2.xAxisData = res.data.map((item: any) => item.approvalTypeName)
     const data = [
@@ -199,10 +212,10 @@
         data: ''
       },
     ]
-    current2.data = data.map((item: any) => ({
+    current2.data = data.map((item: any, index: number) => ({
       name: item.name,
-      // symbol: 'circle',
-      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value]))
+      data: res.data.map((citem: any) => String(citem[data.filter((ccitem: any) => ccitem.name === item.name)[0].value])),
+      color: JSON.parse(JSON.stringify(colors)).reverse()[index]
     }))
     current2.loading = false
   }).catch(() => {
@@ -211,7 +224,7 @@
   // 近一年部门核查分析
   const current3 = showChart.value.filter((item: any) => item.name === '近一年部门核查分析')[0]
   current3.loading = true
-  getOneYearAnalysis({...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getOneYearAnalysis({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '近一年部门核查分析')
     current3.xAxisData = res.data.map((item: any) => item.dimension)
     const data = [
@@ -243,7 +256,7 @@
   // 当年标准装置核查排行榜
   const current4 = showChart.value.filter((item: any) => item.name === '当年标准装置核查排行榜')[0]
   current4.loading = true
-  getCurrentYearRank({...searchQueryResult.value,timeStart: `${new Date().getFullYear()}-01-01`,timeEnd: dayjs().format('YYYY-MM-DD')}).then(res => {
+  getCurrentYearRank({ ...searchQueryResult.value, timeStart: `${new Date().getFullYear()}-01-01`, timeEnd: dayjs().format('YYYY-MM-DD') }).then(res => {
     // console.log(res.data, '当年标准装置核查排行榜')
     current4.data = res.data.rows
     current4.loading = false
@@ -293,7 +306,7 @@
 // }, 100)
 onMounted(() => {
   if (props.lab) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     fetchData()
   }
 })
@@ -336,7 +349,9 @@
         ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">
         <template #item="{ element, index }">
           <div :style="{
-            width: `${showChart.length === 4 ? '48%': index === 0 || index === 1 ? '48%': '31.5%'}`}" class="chart-item">
+            width: `${showChart.length === 4 ? '48%' : index === 0 || index === 1 ? '48%' : '31.5%'}`
+          }"
+            class="chart-item">
             <div class="chart-name">
               <!-- {{ element.name }} -->
             </div>
@@ -346,9 +361,10 @@
                   {{ element.name }}
                 </div>
                 <div style="width: 100%; height: 90%">
-                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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="{
+                  <pie-chart v-if="element.type === 'pie' && !element.isEmpty" :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,
@@ -363,8 +379,9 @@
                       left: '0',
                       top: '10'
                     }" />
-                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors" :gradient="element.gradient"
-                    :x-axis-data="element.xAxisData" :data="element.data" :smooth="element.smooth" :grid="{
+                  <line-chart v-if="element.type === 'line' && !element.isEmpty" :colors="colors"
+                    :gradient="element.gradient" :x-axis-data="element.xAxisData" :data="element.data"
+                    :smooth="element.smooth" :grid="{
                       top: 47,
                       left: 5,
                       right: 5,
@@ -379,17 +396,8 @@
                       left: '0',
                       top: '5'
                     }" />
-                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty" :legend-data="element.legendData"
-                    :data1="element.data1" :data2="element.data2" :x-axis-data="element.xAxisData" :legend="{
-                      itemWidth: 8,
-                      itemHeight: 8,
-                      type: 'scroll',
-                      orient: 'horizontal',
-                      icon: 'roundRect',
-                      left: '0',
-                      top: '10'
-                    }" />
-                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0" :data="element.data"
+                  <bar-chart-double v-if="element.type === 'bar-double' && !element.isEmpty"
+                    :legend-data="element.legendData" :data1="element.data1" :data2="element.data2"
                     :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -398,11 +406,8 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
-                    }"
-                    :colors="element.colors"
-                    :gradient="false"
-                    />
-                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10" :bar-coner="0"
+                    }" />
+                  <bar-chart-vertical v-if="element.type === 'bar-vertical' && !element.isEmpty" :bar-coner="0"
                     :data="element.data" :x-axis-data="element.xAxisData" :legend="{
                       itemWidth: 8,
                       itemHeight: 8,
@@ -411,10 +416,21 @@
                       icon: 'roundRect',
                       left: '0',
                       top: '10'
+                    }" :colors="element.colors" :gradient="false" />
+                  <bar-chart-horizontal v-if="element.type === 'bar-horizontal' && !element.isEmpty" bar-width="10"
+                    :bar-coner="0" :data="element.data" :x-axis-data="element.xAxisData" :gradient="element.gradient"
+                    :legend="{
+                      itemWidth: 8,
+                      itemHeight: 8,
+                      type: 'scroll',
+                      orient: 'horizontal',
+                      icon: 'roundRect',
+                      left: '0',
+                      top: '10'
                     }" />
                   <scroll-table v-if="element.type === 'rank-table'" style="width: 100%" :height="310"
                     :data="element.data" :columns="element.columns" />
-                    <el-empty v-if="element.isEmpty" description="暂无数据" />
+                  <el-empty v-if="element.isEmpty" description="暂无数据" />
                 </div>
               </div>
             </div>
diff --git a/src/views/dataManagement/components/data/verificationCertificate.vue b/src/views/dataManagement/components/data/verificationCertificate.vue
index 3aef633..4c30f83 100644
--- a/src/views/dataManagement/components/data/verificationCertificate.vue
+++ b/src/views/dataManagement/components/data/verificationCertificate.vue
@@ -83,7 +83,7 @@
       )
     }
     if (!newVal.includes('自定义')) {
-      searchQueryResult.value.labCode = props.lab
+      searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
       fetchData()
       selectCurrentTime.value = []
     }
@@ -98,7 +98,7 @@
 })
 watch(() => props.lab, (newVal) => {
   if (newVal) {
-    searchQueryResult.value.labCode = props.lab
+    searchQueryResult.value.labCode = props.lab === '全站' ? '' : props.lab
     setTimeout(() => {
       fetchData()
     })
@@ -367,7 +367,7 @@
     const current4 = showChartBase.value.filter(item => item.name === '部门检校证书分析' || item.name === '部门原始记录分析')[0]
     current4.loading = true
     getDeptAnalysis(searchQueryResult.value).then(res => {
-      console.log(res.data, '部门检校证书分析')
+      // console.log(res.data, '部门检校证书分析')
       const data = [
         {
           name: '校准',
@@ -396,6 +396,7 @@
         data: res.data.map((citem: any) => String(citem[item.value])),
         color: JSON.parse(JSON.stringify(colors)).reverse()[index]
       }))
+      console.log(current4.data, 'current4.data')
       current4.loading = false
     }).catch(() => {
       current4.loading = false
diff --git a/src/views/dataManagement/components/environment/UPS.vue b/src/views/dataManagement/components/environment/UPS.vue
index 662ab64..64f2b3f 100644
--- a/src/views/dataManagement/components/environment/UPS.vue
+++ b/src/views/dataManagement/components/environment/UPS.vue
@@ -86,6 +86,7 @@
 }, 1000)
 
 watch(() => $props, (newVal) => {
+  console.log(newVal, 'newVal')
   // 地点变化
   if (newVal.position && newVal.position.length) {
     place.value = newVal.position
diff --git a/src/views/dataManagement/dataBoard.vue b/src/views/dataManagement/dataBoard.vue
index 0025682..b6c1d0b 100644
--- a/src/views/dataManagement/dataBoard.vue
+++ b/src/views/dataManagement/dataBoard.vue
@@ -18,6 +18,7 @@
 
 getDictByCode('bizGroupCodeEquipment').then((response) => {
   labCodeList.value = response.data
+  response.data.push({ name: '全站', id: '全站', value: '全站'})
   // 获取当前用户所在实验室，用来展示对应实验室数据
   getUerDeptLab().then((res) => {
     labCode.value = labCodeList.value.filter(item => item.name === res.data)[0].value || labCodeList.value[0].value
diff --git a/src/views/dataManagement/environmentBoard.vue b/src/views/dataManagement/environmentBoard.vue
index 6c3e2f0..7e56a22 100644
--- a/src/views/dataManagement/environmentBoard.vue
+++ b/src/views/dataManagement/environmentBoard.vue
@@ -12,6 +12,8 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getLocationList, getUerDeptLab } from '@/api/business/taskMeasure/measureData'
 import { getPlaceList } from '@/api/dataManagement/environmentBoard'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 // 日期查询条件
 const current = ref('')
 setTimeout(() => {
@@ -47,15 +49,27 @@
     startTime.value = ''
   }
 }
+const clickCustom = () => {
+  current.value = '自定义时间'
+}
 // 实验室
 const labCode = ref('')
 const labCodeList = ref<string[]>([])
 
 getDictByCode('labDept').then((response) => {
-  labCodeList.value = response.data.map((item: any) => item.name)
+  // if (userInfo.roleNames.includes('超级管理员')) {
+    labCodeList.value = response.data.map((item: any) => item.name)
+  // }
+  // else {
+
+  // }
+
   // 获取当前用户所在实验室，用来展示对应实验室数据
   getUerDeptLab().then((res) => {
     labCode.value = labCodeList.value.filter(item => item === res.data)[0] || labCodeList.value[0]
+    if(!userInfo.roleNames.includes('超级管理员')) {
+      labCodeList.value = labCodeList.value.filter(item => item === res.data)
+    }
   })
 })
 // 当前时间
@@ -133,19 +147,11 @@
         </el-radio-button>
       </el-radio-group>
       <!-- 自定义时间选择  --移花接木 -->
-      <el-date-picker
-        ref="dateRef"
-        v-model="selectCurrentTime"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        class="time-daterange"
-        style="position: absolute;top: 0;left: 40px;z-index: -1;opacity: 0;"
-        format="YYYY-MM-DD"
-        value-format="YYYY-MM-DD"
-        :disabled-date="pickerOptions" @calendar-change="calendarChange "
-      />
+      <div class="time-daterange" @click="clickCustom">
+        <el-date-picker ref="dateRef" v-model="selectCurrentTime" type="daterange" range-separator="至"
+          start-placeholder="开始时间" end-placeholder="结束时间" style="width: 100%;" format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD" :disabled-date="pickerOptions" @calendar-change="calendarChange" />
+      </div>
     </div>
     <div class="label">
       <el-select v-model="labCode" style="width: 192px;">
@@ -161,11 +167,14 @@
     <!-- 左侧 -->
     <div class="left-show">
       <!-- 温度变化趋势 -->
-      <temperature-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['1'] || []" :place-loading="placeLoading" />
+      <temperature-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['1'] || []" :place-loading="placeLoading" />
       <!-- 湿度变化趋势 -->
-      <humidity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['2'] || []" :place-loading="placeLoading" />
+      <humidity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['2'] || []" :place-loading="placeLoading" />
       <!-- 烟雾值报警趋势 -->
-      <smoke-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['3'] || []" :place-loading="placeLoading" />
+      <smoke-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['3'] || []" :place-loading="placeLoading" />
     </div>
     <!-- 中间 -->
     <div class="middle-show">
@@ -177,11 +186,14 @@
     <!-- 右侧 -->
     <div class="right-show">
       <!-- 电量变化趋势 -->
-      <electricity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['4'] || []" :place-loading="placeLoading" />
+      <electricity-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['4'] || []" :place-loading="placeLoading" />
       <!-- 氧气浓度变化趋势 -->
-      <oxygen-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['5'] || []" :place-loading="placeLoading" />
+      <oxygen-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['5'] || []" :place-loading="placeLoading" />
       <!-- UPS电源间变化趋势 -->
-      <ups-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime" :position="positionAllList['6'] || []" :place-loading="placeLoading" />
+      <ups-trend :lab="labCode" :date-type="current" :time-rang="selectCurrentTime"
+        :position="positionAllList['6'] || []" :place-loading="placeLoading" />
     </div>
   </div>
 </template>
@@ -224,4 +236,17 @@
 
   // CEDAF6
 }
+
+.btns {
+  position: relative;
+
+  .time-daterange {
+    position: absolute;
+    right: 0;
+    width: 100px;
+    top: 0;
+    opacity: 0;
+    z-index: 9;
+  }
+}
 </style>
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 6691db1..8707826 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -389,7 +389,7 @@
   current.value = ''
   setTimeout(() => {
     current.value = radioMenus.value[0]?.value
-  })
+  }, 1000)
   // 直流电压重复性
   voltageListRepeatability.value = data.filter((item: any) => item.params === '1' || item.params === '直流电压').map((item: any) => ({
     ...item,
@@ -402,12 +402,12 @@
     checkParam: '直流电压',
     params: '直流电压',
     checkType: '重复性',
-    testValueOne: '1',
-    testValueTwo: '1',
-    testValueThree: '1',
-    testValueFour: '1',
-    testValueFive: '1',
-    testValueSix: '1',
+    testValueOne: '',
+    testValueTwo: '',
+    testValueThree: '',
+    testValueFour: '',
+    testValueFive: '',
+    testValueSix: '',
     testValueOneDate: '',
     testValueTwoDate: '',
     testValueThreeDate: '',
@@ -441,12 +441,12 @@
     checkParam: '电源效应和负载效应',
     params: '电源效应和负载效应',
     checkType: '重复性',
-    testValueOne: '1',
-    testValueTwo: '1',
-    testValueThree: '1',
-    testValueFour: '1',
-    testValueFive: '1',
-    testValueSix: '1',
+    testValueOne: '',
+    testValueTwo: '',
+    testValueThree: '',
+    testValueFour: '',
+    testValueFive: '',
+    testValueSix: '',
     testValueOneDate: '',
     testValueTwoDate: '',
     testValueThreeDate: '',
@@ -480,12 +480,12 @@
     checkParam: '直流电流(直接测量)',
     params: '直流电流(直接测量)',
     checkType: '重复性',
-    testValueOne: '1',
-    testValueTwo: '1',
-    testValueThree: '1',
-    testValueFour: '1',
-    testValueFive: '1',
-    testValueSix: '1',
+    testValueOne: '',
+    testValueTwo: '',
+    testValueThree: '',
+    testValueFour: '',
+    testValueFive: '',
+    testValueSix: '',
     testValueOneDate: '',
     testValueTwoDate: '',
     testValueThreeDate: '',
@@ -523,12 +523,12 @@
       checkParam: '直流电流(间接测量)',
       params: '直流电流(间接测量)',
       checkType: '重复性',
-      testValueOne: '1',
-      testValueTwo: '1',
-      testValueThree: '1',
-      testValueFour: '1',
-      testValueFive: '1',
-      testValueSix: '1',
+      testValueOne: '',
+      testValueTwo: '',
+      testValueThree: '',
+      testValueFour: '',
+      testValueFive: '',
+      testValueSix: '',
       testValueOneDate: '',
       testValueTwoDate: '',
       testValueThreeDate: '',
@@ -618,12 +618,12 @@
     checkParam: '纹波电压',
     params: '纹波电压',
     checkType: '重复性',
-    testValueOne: '1',
-    testValueTwo: '1',
-    testValueThree: '1',
-    testValueFour: '1',
-    testValueFive: '1',
-    testValueSix: '1',
+    testValueOne: '',
+    testValueTwo: '',
+    testValueThree: '',
+    testValueFour: '',
+    testValueFive: '',
+    testValueSix: '',
     testValueOneDate: '',
     testValueTwoDate: '',
     testValueThreeDate: '',
@@ -937,7 +937,7 @@
   current.value = ''
   setTimeout(() => {
     current.value = radioMenus.value[0]?.value
-  })
+  }, 1000)
   // 直流电压重复性
   const voltageListRepeatabilityList = responseList.filter((item: { params: string; checkType: string }) => (item.params === '1' || item.params === '直流电压') && item.checkType === '重复性').map((item: any) => {
     return {