diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 4ee1096..817ac71 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -145,7 +145,6 @@
           color: '#000',
           fontSize: 12,
           formatter(value, index) {
-            console.log(value, index, '1222322')
             // const data = props.yAxisData.filter((item: any) => item.includes(value))[0]
             // const cindex = props.yAxisData.findIndex(data)
             // 用于修改y轴显示内容
@@ -237,9 +236,16 @@
 window.addEventListener('resize', () => {
   chart.resize()
 })
-
+onBeforeUnmount(() => {
+  console.log('销毁')
+  clearInterval(timer.value)
+  timer.value = null
+})
 onMounted(() => {
+  // nextTick(() => {
   initChart()
+  // chart.resize()
+  // })
 })
 </script>
 

diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 4ee1096..817ac71 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -145,7 +145,6 @@
           color: '#000',
           fontSize: 12,
           formatter(value, index) {
-            console.log(value, index, '1222322')
             // const data = props.yAxisData.filter((item: any) => item.includes(value))[0]
             // const cindex = props.yAxisData.findIndex(data)
             // 用于修改y轴显示内容
@@ -237,9 +236,16 @@
 window.addEventListener('resize', () => {
   chart.resize()
 })
-
+onBeforeUnmount(() => {
+  console.log('销毁')
+  clearInterval(timer.value)
+  timer.value = null
+})
 onMounted(() => {
+  // nextTick(() => {
   initChart()
+  // chart.resize()
+  // })
 })
 </script>
 
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 9243061..7c2a265 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -275,8 +275,10 @@
   autoScroll(false)
   // ------------------------------------------------------------------------------
 })
-onBeforeMount(() => {
+onBeforeUnmount(() => {
   autoScroll(true)
+  // clearInterval()
+  // clea
 })
 </script>
 
@@ -413,7 +415,7 @@
             </el-icon>
           </div>
           <!-- 在检设备 -->
-          <div v-show="showDevice === 0" :style="`height:${blockHeight - 65}px`" class="device-container">
+          <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
             <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="[{ name: '无线电', value: 10 }, { name: '压力', value: 20 }]" :radius="['70%', '50%']" />
             <!-- 部门排行榜 -->
@@ -445,6 +447,42 @@
               />
             </el-table>
           </div>
+          <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
+            <!-- 检定设备态势 -->
+            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="[{ name: '无线电1', value: 101 }, { name: '压力1', value: 120 }]" :radius="['70%', '50%']" />
+            <!-- 部门排行榜 -->
+            <bar-chart-horizontal-com
+              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="[{ width: 8, data: [19, 13, 15, 19, 12, 15, 13, 16, 18, 20, 21, 14, 13] },
+                                                                                                                        { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]" :y-axis-data="['data1-1-19', 'data2-2-13', 'data3-3-15', 'data4-4-19', 'data5-5-12', 'data6-6-15', 'data7-7-13', 'data8-8-16', 'data9-9-18', 'data10-10-20', 'data11-11-21', 'data12-12-14', 'data13-13-13']"
+            />
+            <!-- 在检设备列表 -->
+            <el-table
+              ref="scrollTable"
+              :data="haveCheckList"
+              style="width: 33%;  height: 100%;"
+              :height="blockHeight - 65"
+              stripe
+              header-row-class-name="bench-table-header"
+              row-class-name="bench-table-row"
+              class="bench-table"
+              @mouseenter="autoScroll(true)"
+              @mouseleave="autoScroll(false)"
+            >
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                align="center"
+                :label="item.text"
+                :width="item.width"
+                show-overflow-tooltip
+              />
+            </el-table>
+          </div>
+          <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
+            <!-- 检定设备态势 -->
+            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="[{ name: '无线电', value: 100 }, { name: '压力', value: 20 }]" :radius="['70%', '50%']" />
+          </div>
         </bench-col>
       </div>
       <div class="container" style="width: 33.33%;">
@@ -497,6 +535,10 @@
 </template>
 
 <style lang="scss" scoped>
+.none {
+  opacity: 0;
+}
+
 .bench-table {
   .el-table__header-wrapper {
     border-radius: 8px;
@@ -576,6 +618,8 @@
 .device-container {
   display: flex;
   justify-content: space-around;
+  position: absolute;
+  width: 100%;
 }
 
 .calendar {