diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 6f816d8..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup name="benchCol">
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 逻辑代码
 const props = defineProps({
   title: {
@@ -21,7 +23,63 @@
     type: [String, Number],
     default: '',
   },
+  // 是否需要分页控件
+  pagination: {
+    type: Boolean,
+    default: false,
+  },
+  // 可选单页显示条数
+  pageSizes: {
+    type: Array,
+    default() {
+      return [10, 20, 30]
+    },
+  },
+  // 查询条件，此处主要需要分页的条件
+  query: {
+    type: Object,
+    default() {
+      return {
+        offset: 1,
+        limit: 20,
+      }
+    },
+  },
+  // 数据总数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 可编辑
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
+const emit = defineEmits(['change', 'editData', 'deleteData'])
+
+// 改变页容量
+function handleSizeChange(val: number) {
+  emit('change', { size: val })
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  emit('change', { page: val })
+}
+
+// 点击编辑icon
+function clickEdit() {
+  emit('editData')
+}
+// 点击删除icon
+function clickDelete() {
+  emit('deleteData')
+}
 </script>
 
 <template>
@@ -34,10 +92,39 @@
         {{ title }}
       </div>
       <span v-if="pathUrl !== ''" class="more" @click="$router.push(pathUrl)">更多 ></span>
+      <!-- <el-icon v-if="isEdit" :name="icon" class="title-icon edit-icon" @click="clickEdit">
+        <svg-icon name="icon-edit" />
+      </el-icon> -->
+      <el-icon v-if="isEdit" :size="18" color="#3d7eff" style="cursor: pointer;" @click="clickEdit">
+        <edit />
+      </el-icon>
+      <el-icon v-if="isShowDelete" :size="18" color="#f56c6c" style="margin-left: 4px;cursor: pointer;" @click="clickDelete">
+        <delete />
+      </el-icon>
     </div>
     <div class="content" :style="{ height: typeof height == 'string' ? height : `${height - 50}px` }">
       <slot />
     </div>
+    <div v-if="props.pagination" style="width: 100%;margin-top: 10px;">
+      <!-- <el-pagination
+        :current-page="props.query.offset"
+        :page-sizes="props.pageSizes as number[]"
+        :page-size="props.query.limit"
+        :total="props.total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      /> -->
+      <el-pagination
+        v-model:current-page="props.query.offset"
+        small
+        :page-size="props.query.limit"
+        layout="total, prev, pager, next"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -69,6 +156,15 @@
       margin-right: 5px;
     }
 
+    .edit-icon {
+      cursor: pointer;
+    }
+
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 6f816d8..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup name="benchCol">
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 逻辑代码
 const props = defineProps({
   title: {
@@ -21,7 +23,63 @@
     type: [String, Number],
     default: '',
   },
+  // 是否需要分页控件
+  pagination: {
+    type: Boolean,
+    default: false,
+  },
+  // 可选单页显示条数
+  pageSizes: {
+    type: Array,
+    default() {
+      return [10, 20, 30]
+    },
+  },
+  // 查询条件，此处主要需要分页的条件
+  query: {
+    type: Object,
+    default() {
+      return {
+        offset: 1,
+        limit: 20,
+      }
+    },
+  },
+  // 数据总数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 可编辑
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
+const emit = defineEmits(['change', 'editData', 'deleteData'])
+
+// 改变页容量
+function handleSizeChange(val: number) {
+  emit('change', { size: val })
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  emit('change', { page: val })
+}
+
+// 点击编辑icon
+function clickEdit() {
+  emit('editData')
+}
+// 点击删除icon
+function clickDelete() {
+  emit('deleteData')
+}
 </script>
 
 <template>
@@ -34,10 +92,39 @@
         {{ title }}
       </div>
       <span v-if="pathUrl !== ''" class="more" @click="$router.push(pathUrl)">更多 ></span>
+      <!-- <el-icon v-if="isEdit" :name="icon" class="title-icon edit-icon" @click="clickEdit">
+        <svg-icon name="icon-edit" />
+      </el-icon> -->
+      <el-icon v-if="isEdit" :size="18" color="#3d7eff" style="cursor: pointer;" @click="clickEdit">
+        <edit />
+      </el-icon>
+      <el-icon v-if="isShowDelete" :size="18" color="#f56c6c" style="margin-left: 4px;cursor: pointer;" @click="clickDelete">
+        <delete />
+      </el-icon>
     </div>
     <div class="content" :style="{ height: typeof height == 'string' ? height : `${height - 50}px` }">
       <slot />
     </div>
+    <div v-if="props.pagination" style="width: 100%;margin-top: 10px;">
+      <!-- <el-pagination
+        :current-page="props.query.offset"
+        :page-sizes="props.pageSizes as number[]"
+        :page-size="props.query.limit"
+        :total="props.total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      /> -->
+      <el-pagination
+        v-model:current-page="props.query.offset"
+        small
+        :page-size="props.query.limit"
+        layout="total, prev, pager, next"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -69,6 +156,15 @@
       margin-right: 5px;
     }
 
+    .edit-icon {
+      cursor: pointer;
+    }
+
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/views/tested/dashboard/components/deviceDetail.vue b/src/views/tested/dashboard/components/deviceDetail.vue
new file mode 100644
index 0000000..bf41058
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceDetail.vue
@@ -0,0 +1,198 @@
+<!-- 设备详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const data1 = ref()
+const data2 = ref()
+const tableList = ref([
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 1,
+    content: '受检设备SJSB234849已退回 ',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+])
+onMounted(() => {
+  setTimeout(() => {
+    data1.value = [
+      {
+        name: '压力计',
+        value: 250,
+      },
+      {
+        name: '万用表',
+        value: 270,
+      },
+    ]
+    data2.value = [
+      {
+        name: '力学',
+        value: 250,
+      },
+      {
+        name: '热力',
+        value: 270,
+      },
+      {
+        name: '无线电',
+        value: 270,
+      },
+    ]
+  }, 1000)
+})
+</script>
+
+<template>
+  <div style="width: 49%;">
+    <div class="detail-container" :style="`height:${(height / 2) * 0.55}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          设备详情
+        </div>
+        <span />
+      </div>
+      <div class="search">
+        <el-input class="input" placeholder="所属岗位" />
+        <span>计量计划完成率： 20%</span>
+      </div>
+      <div class="content">
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data1"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            设备类型
+          </div>
+        </div>
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data2"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            计量专业分类
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${(height / 2) * 0.44}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          检定通知
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="tableList" :max-height="`height:${(height / 2) * 0.44 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  ::v-deep(.el-table__header-wrapper) {
+    display: none;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 6f816d8..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup name="benchCol">
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 逻辑代码
 const props = defineProps({
   title: {
@@ -21,7 +23,63 @@
     type: [String, Number],
     default: '',
   },
+  // 是否需要分页控件
+  pagination: {
+    type: Boolean,
+    default: false,
+  },
+  // 可选单页显示条数
+  pageSizes: {
+    type: Array,
+    default() {
+      return [10, 20, 30]
+    },
+  },
+  // 查询条件，此处主要需要分页的条件
+  query: {
+    type: Object,
+    default() {
+      return {
+        offset: 1,
+        limit: 20,
+      }
+    },
+  },
+  // 数据总数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 可编辑
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
+const emit = defineEmits(['change', 'editData', 'deleteData'])
+
+// 改变页容量
+function handleSizeChange(val: number) {
+  emit('change', { size: val })
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  emit('change', { page: val })
+}
+
+// 点击编辑icon
+function clickEdit() {
+  emit('editData')
+}
+// 点击删除icon
+function clickDelete() {
+  emit('deleteData')
+}
 </script>
 
 <template>
@@ -34,10 +92,39 @@
         {{ title }}
       </div>
       <span v-if="pathUrl !== ''" class="more" @click="$router.push(pathUrl)">更多 ></span>
+      <!-- <el-icon v-if="isEdit" :name="icon" class="title-icon edit-icon" @click="clickEdit">
+        <svg-icon name="icon-edit" />
+      </el-icon> -->
+      <el-icon v-if="isEdit" :size="18" color="#3d7eff" style="cursor: pointer;" @click="clickEdit">
+        <edit />
+      </el-icon>
+      <el-icon v-if="isShowDelete" :size="18" color="#f56c6c" style="margin-left: 4px;cursor: pointer;" @click="clickDelete">
+        <delete />
+      </el-icon>
     </div>
     <div class="content" :style="{ height: typeof height == 'string' ? height : `${height - 50}px` }">
       <slot />
     </div>
+    <div v-if="props.pagination" style="width: 100%;margin-top: 10px;">
+      <!-- <el-pagination
+        :current-page="props.query.offset"
+        :page-sizes="props.pageSizes as number[]"
+        :page-size="props.query.limit"
+        :total="props.total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      /> -->
+      <el-pagination
+        v-model:current-page="props.query.offset"
+        small
+        :page-size="props.query.limit"
+        layout="total, prev, pager, next"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -69,6 +156,15 @@
       margin-right: 5px;
     }
 
+    .edit-icon {
+      cursor: pointer;
+    }
+
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/views/tested/dashboard/components/deviceDetail.vue b/src/views/tested/dashboard/components/deviceDetail.vue
new file mode 100644
index 0000000..bf41058
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceDetail.vue
@@ -0,0 +1,198 @@
+<!-- 设备详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const data1 = ref()
+const data2 = ref()
+const tableList = ref([
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 1,
+    content: '受检设备SJSB234849已退回 ',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+])
+onMounted(() => {
+  setTimeout(() => {
+    data1.value = [
+      {
+        name: '压力计',
+        value: 250,
+      },
+      {
+        name: '万用表',
+        value: 270,
+      },
+    ]
+    data2.value = [
+      {
+        name: '力学',
+        value: 250,
+      },
+      {
+        name: '热力',
+        value: 270,
+      },
+      {
+        name: '无线电',
+        value: 270,
+      },
+    ]
+  }, 1000)
+})
+</script>
+
+<template>
+  <div style="width: 49%;">
+    <div class="detail-container" :style="`height:${(height / 2) * 0.55}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          设备详情
+        </div>
+        <span />
+      </div>
+      <div class="search">
+        <el-input class="input" placeholder="所属岗位" />
+        <span>计量计划完成率： 20%</span>
+      </div>
+      <div class="content">
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data1"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            设备类型
+          </div>
+        </div>
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data2"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            计量专业分类
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${(height / 2) * 0.44}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          检定通知
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="tableList" :max-height="`height:${(height / 2) * 0.44 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  ::v-deep(.el-table__header-wrapper) {
+    display: none;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
new file mode 100644
index 0000000..6f886f1
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -0,0 +1,315 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const tableList = ref([])
+const current = ref('1')
+const radioMenus = ref([
+  {
+    name: '在检设备',
+    value: '1',
+  },
+  {
+    name: '待检设备',
+    value: '2',
+  },
+  {
+    name: '在用设备',
+    value: '3',
+  },
+])
+const columns = ref([
+  {
+    text: '设备编号',
+    value: 'no',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '所属部门',
+    value: 'dept',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: 'user',
+    align: 'center',
+  },
+  {
+    text: '送检时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'danwei',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: '',
+    align: 'center',
+  },
+])
+const list = ref([
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+])
+const total = ref(15)
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // fetchData()
+}
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <div class="detail-container" :style="`height:${(height / 2)}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </div>
+        <!-- <div class="more">
+          查看更多
+        </div> -->
+      </div>
+      <div class="table">
+        <bench-col
+          icon=""
+          title=""
+          path-url=""
+          :pagination="true"
+          :query="listQuery"
+          :total="total"
+          @change="changePage"
+        >
+          <el-table
+            :data="list"
+            :height="(height / 2) - 100"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column label="#" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-for="item in columns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              show-overflow-tooltip
+              :width="item.width"
+            />
+          </el-table>
+        </bench-col>
+        <!-- <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+          :is-showmulti-select="false" :height="`height:${(height / 2) - 150}px`" @change="changePage"
+        > -->
+        <!-- <template #columns>
+            <el-table-column label="操作" width="140" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                  查看
+                </el-button>
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                  编辑
+                </el-button>
+                <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template> -->
+        <!-- </normal-table> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 6f816d8..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup name="benchCol">
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 逻辑代码
 const props = defineProps({
   title: {
@@ -21,7 +23,63 @@
     type: [String, Number],
     default: '',
   },
+  // 是否需要分页控件
+  pagination: {
+    type: Boolean,
+    default: false,
+  },
+  // 可选单页显示条数
+  pageSizes: {
+    type: Array,
+    default() {
+      return [10, 20, 30]
+    },
+  },
+  // 查询条件，此处主要需要分页的条件
+  query: {
+    type: Object,
+    default() {
+      return {
+        offset: 1,
+        limit: 20,
+      }
+    },
+  },
+  // 数据总数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 可编辑
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
+const emit = defineEmits(['change', 'editData', 'deleteData'])
+
+// 改变页容量
+function handleSizeChange(val: number) {
+  emit('change', { size: val })
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  emit('change', { page: val })
+}
+
+// 点击编辑icon
+function clickEdit() {
+  emit('editData')
+}
+// 点击删除icon
+function clickDelete() {
+  emit('deleteData')
+}
 </script>
 
 <template>
@@ -34,10 +92,39 @@
         {{ title }}
       </div>
       <span v-if="pathUrl !== ''" class="more" @click="$router.push(pathUrl)">更多 ></span>
+      <!-- <el-icon v-if="isEdit" :name="icon" class="title-icon edit-icon" @click="clickEdit">
+        <svg-icon name="icon-edit" />
+      </el-icon> -->
+      <el-icon v-if="isEdit" :size="18" color="#3d7eff" style="cursor: pointer;" @click="clickEdit">
+        <edit />
+      </el-icon>
+      <el-icon v-if="isShowDelete" :size="18" color="#f56c6c" style="margin-left: 4px;cursor: pointer;" @click="clickDelete">
+        <delete />
+      </el-icon>
     </div>
     <div class="content" :style="{ height: typeof height == 'string' ? height : `${height - 50}px` }">
       <slot />
     </div>
+    <div v-if="props.pagination" style="width: 100%;margin-top: 10px;">
+      <!-- <el-pagination
+        :current-page="props.query.offset"
+        :page-sizes="props.pageSizes as number[]"
+        :page-size="props.query.limit"
+        :total="props.total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      /> -->
+      <el-pagination
+        v-model:current-page="props.query.offset"
+        small
+        :page-size="props.query.limit"
+        layout="total, prev, pager, next"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -69,6 +156,15 @@
       margin-right: 5px;
     }
 
+    .edit-icon {
+      cursor: pointer;
+    }
+
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/views/tested/dashboard/components/deviceDetail.vue b/src/views/tested/dashboard/components/deviceDetail.vue
new file mode 100644
index 0000000..bf41058
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceDetail.vue
@@ -0,0 +1,198 @@
+<!-- 设备详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const data1 = ref()
+const data2 = ref()
+const tableList = ref([
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 1,
+    content: '受检设备SJSB234849已退回 ',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+])
+onMounted(() => {
+  setTimeout(() => {
+    data1.value = [
+      {
+        name: '压力计',
+        value: 250,
+      },
+      {
+        name: '万用表',
+        value: 270,
+      },
+    ]
+    data2.value = [
+      {
+        name: '力学',
+        value: 250,
+      },
+      {
+        name: '热力',
+        value: 270,
+      },
+      {
+        name: '无线电',
+        value: 270,
+      },
+    ]
+  }, 1000)
+})
+</script>
+
+<template>
+  <div style="width: 49%;">
+    <div class="detail-container" :style="`height:${(height / 2) * 0.55}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          设备详情
+        </div>
+        <span />
+      </div>
+      <div class="search">
+        <el-input class="input" placeholder="所属岗位" />
+        <span>计量计划完成率： 20%</span>
+      </div>
+      <div class="content">
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data1"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            设备类型
+          </div>
+        </div>
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data2"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            计量专业分类
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${(height / 2) * 0.44}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          检定通知
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="tableList" :max-height="`height:${(height / 2) * 0.44 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  ::v-deep(.el-table__header-wrapper) {
+    display: none;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
new file mode 100644
index 0000000..6f886f1
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -0,0 +1,315 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const tableList = ref([])
+const current = ref('1')
+const radioMenus = ref([
+  {
+    name: '在检设备',
+    value: '1',
+  },
+  {
+    name: '待检设备',
+    value: '2',
+  },
+  {
+    name: '在用设备',
+    value: '3',
+  },
+])
+const columns = ref([
+  {
+    text: '设备编号',
+    value: 'no',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '所属部门',
+    value: 'dept',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: 'user',
+    align: 'center',
+  },
+  {
+    text: '送检时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'danwei',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: '',
+    align: 'center',
+  },
+])
+const list = ref([
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+])
+const total = ref(15)
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // fetchData()
+}
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <div class="detail-container" :style="`height:${(height / 2)}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </div>
+        <!-- <div class="more">
+          查看更多
+        </div> -->
+      </div>
+      <div class="table">
+        <bench-col
+          icon=""
+          title=""
+          path-url=""
+          :pagination="true"
+          :query="listQuery"
+          :total="total"
+          @change="changePage"
+        >
+          <el-table
+            :data="list"
+            :height="(height / 2) - 100"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column label="#" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-for="item in columns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              show-overflow-tooltip
+              :width="item.width"
+            />
+          </el-table>
+        </bench-col>
+        <!-- <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+          :is-showmulti-select="false" :height="`height:${(height / 2) - 150}px`" @change="changePage"
+        > -->
+        <!-- <template #columns>
+            <el-table-column label="操作" width="140" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                  查看
+                </el-button>
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                  编辑
+                </el-button>
+                <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template> -->
+        <!-- </normal-table> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
new file mode 100644
index 0000000..a237371
--- /dev/null
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -0,0 +1,228 @@
+<!-- 编辑日程 -->
+<script setup lang="ts" name="EditSchedule">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+// import { addSchedule, delSchedule, editSchedule, getCalendarList } from '@/api/workbench/workbench'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['editScheduleSuccess'])
+const user = useUserStore()// 用户信息
+const dialogVisible = ref(false)// 弹窗显示
+const ruleFormRef = ref<FormInstance>() // from组件
+const rules = ref<FormRules>({
+  date: [{ required: true, message: '日期必填', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+const form = ref({
+  date: '', // 日期
+})
+const list = ref([{
+  scheduleMatters: '', // 日程
+  id: '',
+}]) // 日程列表
+const type = ref('add') // 新增add，编辑edit
+// 重置
+const reset = () => {
+  form.value.date = ''
+  list.value = [{
+    scheduleMatters: '', // 日程
+    id: '',
+  }]
+}
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+  reset()
+}
+
+// 点击确定
+const clickConfirm = async (formEl: FormInstance | undefined) => {
+  // 去掉空的日程
+  const resultArr = list.value.filter(item => item.scheduleMatters)
+  console.log(resultArr)
+  if (!resultArr.length) {
+    ElMessage.warning('要求至少有一个日程')
+    return false
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const param = list.value.map((item) => {
+        return {
+          scheduleMatters: item.scheduleMatters, // 日程
+          userId: user.id, // 用户ID
+          scheduleDate: form.value.date, // 日期
+          id: item.id,
+        }
+      })
+      if (type.value === 'add') {
+        // addSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+      if (type.value === 'edit') {
+        // editSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+    }
+  })
+}
+
+// 点击增加
+const clickAdd = () => {
+  if (list.value[list.value.length - 1].scheduleMatters === '') {
+    ElMessage.warning('请完善上一条日程')
+    return false
+  }
+  list.value.push({
+    scheduleMatters: '',
+    id: '',
+  })
+}
+// 点击减少
+const clickReduce = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+// 获取日程列表
+const fetchCalendarList = (date: string) => {
+  const param = {
+    userId: user.id,
+    calendarMonth: date,
+  }
+  // getCalendarList(param).then((res) => {
+  //   const response = res.data
+  //   if (response[form.value.date].length) { // 选择的日期有日程
+  //     // for (const key in response) {
+  //     type.value = 'edit'
+  //     // console.log(response[key])
+
+  //     list.value = response[form.value.date]
+  //     // }
+  //   }
+  //   else { // 选择的日期没有日程
+  //     type.value = 'add'
+  //     list.value = [{
+  //       scheduleMatters: '', // 日程
+  //       id: '',
+  //     }]
+  //   }
+  // })
+}
+
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+// 删除所有日程
+const delAll = () => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // delSchedule({ id: list.value[0].id }).then((res) => {
+      //   ElMessage({
+      //     type: 'success',
+      //     message: '删除成功',
+      //   })
+      //   cancle()
+      // })
+    })
+}
+watch(() => form.value.date, (newVal) => {
+  const date = dayjs(new Date(newVal)).format('YYYY-MM')
+  fetchCalendarList(date)
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" class="edit-schedule" title="编辑日程" width="65%" @close="cancle">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="date"
+          placeholder="请选择日期"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+        />
+      </el-form-item>
+    </el-form>
+    <ul>
+      <li v-for="(item, index) in list" :key="index" class="li-item">
+        <el-input
+          v-model="item.scheduleMatters"
+          type="textarea"
+          autosize
+          placeholder="请输入日程"
+          style="width: 80%;"
+        />
+        <div class="icon-area">
+          <el-icon v-if="index === list.length - 1" name="icon-add-circle" class="title-icon" @click="clickAdd">
+            <svg-icon name="icon-add-circle" />
+          </el-icon>
+          <el-icon v-if="index !== 0" name="icon-reduce-circle" class="title-icon reduce-icon" @click="clickReduce(index)">
+            <svg-icon name="icon-reduce-circle" />
+          </el-icon>
+        </div>
+      </li>
+    </ul>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirm(ruleFormRef)">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+      <!-- <el-button type="danger" @click="delAll">
+        删除所有日程
+      </el-button> -->
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.edit-schedule {
+  .title-icon {
+    width: 18px;
+    height: 18px;
+    font-size: 18px;
+    line-height: 16px;
+    color: #3d7eff;
+    margin-right: 5px;
+    cursor: pointer;
+    // float: right;
+  }
+
+  .li-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 70px;
+    margin-bottom: 10px;
+  }
+
+  .icon-area {
+    display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+
+  .reduce-icon {
+    color: #ea5a32;
+  }
+}
+</style>
+

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 6f816d8..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup name="benchCol">
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 逻辑代码
 const props = defineProps({
   title: {
@@ -21,7 +23,63 @@
     type: [String, Number],
     default: '',
   },
+  // 是否需要分页控件
+  pagination: {
+    type: Boolean,
+    default: false,
+  },
+  // 可选单页显示条数
+  pageSizes: {
+    type: Array,
+    default() {
+      return [10, 20, 30]
+    },
+  },
+  // 查询条件，此处主要需要分页的条件
+  query: {
+    type: Object,
+    default() {
+      return {
+        offset: 1,
+        limit: 20,
+      }
+    },
+  },
+  // 数据总数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 可编辑
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
+const emit = defineEmits(['change', 'editData', 'deleteData'])
+
+// 改变页容量
+function handleSizeChange(val: number) {
+  emit('change', { size: val })
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  emit('change', { page: val })
+}
+
+// 点击编辑icon
+function clickEdit() {
+  emit('editData')
+}
+// 点击删除icon
+function clickDelete() {
+  emit('deleteData')
+}
 </script>
 
 <template>
@@ -34,10 +92,39 @@
         {{ title }}
       </div>
       <span v-if="pathUrl !== ''" class="more" @click="$router.push(pathUrl)">更多 ></span>
+      <!-- <el-icon v-if="isEdit" :name="icon" class="title-icon edit-icon" @click="clickEdit">
+        <svg-icon name="icon-edit" />
+      </el-icon> -->
+      <el-icon v-if="isEdit" :size="18" color="#3d7eff" style="cursor: pointer;" @click="clickEdit">
+        <edit />
+      </el-icon>
+      <el-icon v-if="isShowDelete" :size="18" color="#f56c6c" style="margin-left: 4px;cursor: pointer;" @click="clickDelete">
+        <delete />
+      </el-icon>
     </div>
     <div class="content" :style="{ height: typeof height == 'string' ? height : `${height - 50}px` }">
       <slot />
     </div>
+    <div v-if="props.pagination" style="width: 100%;margin-top: 10px;">
+      <!-- <el-pagination
+        :current-page="props.query.offset"
+        :page-sizes="props.pageSizes as number[]"
+        :page-size="props.query.limit"
+        :total="props.total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      /> -->
+      <el-pagination
+        v-model:current-page="props.query.offset"
+        small
+        :page-size="props.query.limit"
+        layout="total, prev, pager, next"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -69,6 +156,15 @@
       margin-right: 5px;
     }
 
+    .edit-icon {
+      cursor: pointer;
+    }
+
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/views/tested/dashboard/components/deviceDetail.vue b/src/views/tested/dashboard/components/deviceDetail.vue
new file mode 100644
index 0000000..bf41058
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceDetail.vue
@@ -0,0 +1,198 @@
+<!-- 设备详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const data1 = ref()
+const data2 = ref()
+const tableList = ref([
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 1,
+    content: '受检设备SJSB234849已退回 ',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+])
+onMounted(() => {
+  setTimeout(() => {
+    data1.value = [
+      {
+        name: '压力计',
+        value: 250,
+      },
+      {
+        name: '万用表',
+        value: 270,
+      },
+    ]
+    data2.value = [
+      {
+        name: '力学',
+        value: 250,
+      },
+      {
+        name: '热力',
+        value: 270,
+      },
+      {
+        name: '无线电',
+        value: 270,
+      },
+    ]
+  }, 1000)
+})
+</script>
+
+<template>
+  <div style="width: 49%;">
+    <div class="detail-container" :style="`height:${(height / 2) * 0.55}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          设备详情
+        </div>
+        <span />
+      </div>
+      <div class="search">
+        <el-input class="input" placeholder="所属岗位" />
+        <span>计量计划完成率： 20%</span>
+      </div>
+      <div class="content">
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data1"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            设备类型
+          </div>
+        </div>
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data2"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            计量专业分类
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${(height / 2) * 0.44}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          检定通知
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="tableList" :max-height="`height:${(height / 2) * 0.44 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  ::v-deep(.el-table__header-wrapper) {
+    display: none;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
new file mode 100644
index 0000000..6f886f1
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -0,0 +1,315 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const tableList = ref([])
+const current = ref('1')
+const radioMenus = ref([
+  {
+    name: '在检设备',
+    value: '1',
+  },
+  {
+    name: '待检设备',
+    value: '2',
+  },
+  {
+    name: '在用设备',
+    value: '3',
+  },
+])
+const columns = ref([
+  {
+    text: '设备编号',
+    value: 'no',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '所属部门',
+    value: 'dept',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: 'user',
+    align: 'center',
+  },
+  {
+    text: '送检时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'danwei',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: '',
+    align: 'center',
+  },
+])
+const list = ref([
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+])
+const total = ref(15)
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // fetchData()
+}
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <div class="detail-container" :style="`height:${(height / 2)}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </div>
+        <!-- <div class="more">
+          查看更多
+        </div> -->
+      </div>
+      <div class="table">
+        <bench-col
+          icon=""
+          title=""
+          path-url=""
+          :pagination="true"
+          :query="listQuery"
+          :total="total"
+          @change="changePage"
+        >
+          <el-table
+            :data="list"
+            :height="(height / 2) - 100"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column label="#" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-for="item in columns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              show-overflow-tooltip
+              :width="item.width"
+            />
+          </el-table>
+        </bench-col>
+        <!-- <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+          :is-showmulti-select="false" :height="`height:${(height / 2) - 150}px`" @change="changePage"
+        > -->
+        <!-- <template #columns>
+            <el-table-column label="操作" width="140" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                  查看
+                </el-button>
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                  编辑
+                </el-button>
+                <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template> -->
+        <!-- </normal-table> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
new file mode 100644
index 0000000..a237371
--- /dev/null
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -0,0 +1,228 @@
+<!-- 编辑日程 -->
+<script setup lang="ts" name="EditSchedule">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+// import { addSchedule, delSchedule, editSchedule, getCalendarList } from '@/api/workbench/workbench'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['editScheduleSuccess'])
+const user = useUserStore()// 用户信息
+const dialogVisible = ref(false)// 弹窗显示
+const ruleFormRef = ref<FormInstance>() // from组件
+const rules = ref<FormRules>({
+  date: [{ required: true, message: '日期必填', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+const form = ref({
+  date: '', // 日期
+})
+const list = ref([{
+  scheduleMatters: '', // 日程
+  id: '',
+}]) // 日程列表
+const type = ref('add') // 新增add，编辑edit
+// 重置
+const reset = () => {
+  form.value.date = ''
+  list.value = [{
+    scheduleMatters: '', // 日程
+    id: '',
+  }]
+}
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+  reset()
+}
+
+// 点击确定
+const clickConfirm = async (formEl: FormInstance | undefined) => {
+  // 去掉空的日程
+  const resultArr = list.value.filter(item => item.scheduleMatters)
+  console.log(resultArr)
+  if (!resultArr.length) {
+    ElMessage.warning('要求至少有一个日程')
+    return false
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const param = list.value.map((item) => {
+        return {
+          scheduleMatters: item.scheduleMatters, // 日程
+          userId: user.id, // 用户ID
+          scheduleDate: form.value.date, // 日期
+          id: item.id,
+        }
+      })
+      if (type.value === 'add') {
+        // addSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+      if (type.value === 'edit') {
+        // editSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+    }
+  })
+}
+
+// 点击增加
+const clickAdd = () => {
+  if (list.value[list.value.length - 1].scheduleMatters === '') {
+    ElMessage.warning('请完善上一条日程')
+    return false
+  }
+  list.value.push({
+    scheduleMatters: '',
+    id: '',
+  })
+}
+// 点击减少
+const clickReduce = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+// 获取日程列表
+const fetchCalendarList = (date: string) => {
+  const param = {
+    userId: user.id,
+    calendarMonth: date,
+  }
+  // getCalendarList(param).then((res) => {
+  //   const response = res.data
+  //   if (response[form.value.date].length) { // 选择的日期有日程
+  //     // for (const key in response) {
+  //     type.value = 'edit'
+  //     // console.log(response[key])
+
+  //     list.value = response[form.value.date]
+  //     // }
+  //   }
+  //   else { // 选择的日期没有日程
+  //     type.value = 'add'
+  //     list.value = [{
+  //       scheduleMatters: '', // 日程
+  //       id: '',
+  //     }]
+  //   }
+  // })
+}
+
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+// 删除所有日程
+const delAll = () => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // delSchedule({ id: list.value[0].id }).then((res) => {
+      //   ElMessage({
+      //     type: 'success',
+      //     message: '删除成功',
+      //   })
+      //   cancle()
+      // })
+    })
+}
+watch(() => form.value.date, (newVal) => {
+  const date = dayjs(new Date(newVal)).format('YYYY-MM')
+  fetchCalendarList(date)
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" class="edit-schedule" title="编辑日程" width="65%" @close="cancle">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="date"
+          placeholder="请选择日期"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+        />
+      </el-form-item>
+    </el-form>
+    <ul>
+      <li v-for="(item, index) in list" :key="index" class="li-item">
+        <el-input
+          v-model="item.scheduleMatters"
+          type="textarea"
+          autosize
+          placeholder="请输入日程"
+          style="width: 80%;"
+        />
+        <div class="icon-area">
+          <el-icon v-if="index === list.length - 1" name="icon-add-circle" class="title-icon" @click="clickAdd">
+            <svg-icon name="icon-add-circle" />
+          </el-icon>
+          <el-icon v-if="index !== 0" name="icon-reduce-circle" class="title-icon reduce-icon" @click="clickReduce(index)">
+            <svg-icon name="icon-reduce-circle" />
+          </el-icon>
+        </div>
+      </li>
+    </ul>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirm(ruleFormRef)">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+      <!-- <el-button type="danger" @click="delAll">
+        删除所有日程
+      </el-button> -->
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.edit-schedule {
+  .title-icon {
+    width: 18px;
+    height: 18px;
+    font-size: 18px;
+    line-height: 16px;
+    color: #3d7eff;
+    margin-right: 5px;
+    cursor: pointer;
+    // float: right;
+  }
+
+  .li-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 70px;
+    margin-bottom: 10px;
+  }
+
+  .icon-area {
+    display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+
+  .reduce-icon {
+    color: #ea5a32;
+  }
+}
+</style>
+
diff --git a/src/views/tested/dashboard/components/rightBox.vue b/src/views/tested/dashboard/components/rightBox.vue
new file mode 100644
index 0000000..3cdf697
--- /dev/null
+++ b/src/views/tested/dashboard/components/rightBox.vue
@@ -0,0 +1,350 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+import editScheduleDialog from './editSchedule.vue'
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const notice = ref([
+  {
+    status: 1,
+    content: '溯源公示|计量站设备溯源公告',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '溯源公示|计量站设备溯源公告',
+    time: '2023-09-01',
+  },
+  {
+    status: 0,
+    content: '单位通知|单位通知单位通知',
+    time: '2023-09-03',
+  }, {
+    status: 0,
+    content: '单位通知|单位通知单位通知',
+    time: '2023-09-03',
+  },
+])
+const approve = ref([
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 0,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+])
+const remind = ref([
+  {
+    status: 0,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-09',
+  },
+  {
+    status: 1,
+    content: '计量计划|2023年第二季度计量计划已发布 ',
+    time: '2023-09-04',
+  },
+  {
+    status: 1,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-03',
+  },
+])
+// -----------------------------------日历--------------------------------------------
+const calendarValue = ref(new Date())
+const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
+const editScheduleRef = ref() // 编辑日程ref
+const redCircleData = ref() // 日程列表
+// 点击编辑日程
+const editSchedule = () => {
+  editScheduleRef.value.initDialog()
+}
+// 获取日程列表
+const fetchCalendarList = () => {
+  const param = {
+    userId: user.id,
+    calendarMonth: selectedDate.value,
+  }
+  // getCalendarList(param).then((res) => {
+  //   redCircleData.value = res.data
+  // })
+}
+// 点击日期
+const clickDate = (day: string) => {
+  selectDateRecord.value = day
+  selectedDate.value = day.slice(0, 7)
+  fetchCalendarList() // 获取日历列表
+}
+// 点击删除icon
+const deleteData = () => {
+  if (Object.keys(redCircleData.value).length && !redCircleData.value[selectDateRecord.value].length) {
+    ElMessage.warning(`${selectDateRecord.value}没有日程，无法删除`)
+    return false
+  }
+  ElMessageBox.confirm(
+    `确定删除${selectDateRecord.value}的日程吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const param = {
+        userId: user.id,
+        scheduleDate: selectDateRecord.value,
+      }
+      // delSchedule(param).then((res) => {
+      //   ElMessage({
+      //     type: 'success',
+      //     message: '删除成功',
+      //   })
+      //   fetchCalendarList() // 获取日历列表
+      // })
+    })
+}
+
+// 编辑日程成功
+const editScheduleSuccess = () => {
+  fetchCalendarList() // 获取日历列表
+}
+const range = ref([new Date(2019, 2, 4), new Date(2019, 2, 4)])
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <!-- 编辑日程组件 -->
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
+    <div class="detail-container" :style="`height:${height * 0.24}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          工作日历
+        </div>
+      </div>
+      <div class="content">
+        <el-calendar v-model="calendarValue" :range="range">
+          <template #dateCell="{ data }">
+            <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
+              <span>
+                {{ data.day.split("-").slice(2).join() }}
+              </span>
+            </div>
+            <div v-for="(value, key, index) in redCircleData" :key="index">
+              <el-popover
+                v-if="key === data.day && value.length"
+                placement="top-start"
+                trigger="hover"
+                width="auto"
+              >
+                <div class="popover-content-area-class">
+                  <span style="font-weight: 600;">{{ key }}</span>
+                  <li v-for="(e, i) in value" :key="i" class="calendar-li-item">
+                    {{ e.scheduleMatters }}
+                  </li>
+                </div>
+                <template #reference>
+                  <div style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <!-- <span>
+                        {{ data.day.split("-").slice(2).join() }}
+                      </span> -->
+                    <span style="margin-top: -30px;">
+                      <el-icon :size="20" color="#f56c6c">
+                        <alarm-clock />
+                      </el-icon>
+                      <!-- <span v-if="key === data.day" class="redCircle" /> -->
+                    </span>
+                  </div>
+                </template>
+              </el-popover>
+            </div>
+          </template>
+        </el-calendar>
+      </div>
+      <div class="expand">
+        展开↓
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          通知公告
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="notice" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          审批提醒
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="approve" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          工作提醒
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="remind" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-table__header-wrapper) {
+  display: none;
+}
+
+.expand {
+  position: absolute;
+  z-index: 9;
+  bottom: 0;
+  text-align: center;
+  width: 100%;
+  background: #fff;
+  // &:hover {
+  //   cursor:
+  // }
+  font-size: 14px;
+  color: #ccc;
+}
+
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  position: relative;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .table {
+    margin-top: 10px;
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 6f816d8..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup name="benchCol">
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 逻辑代码
 const props = defineProps({
   title: {
@@ -21,7 +23,63 @@
     type: [String, Number],
     default: '',
   },
+  // 是否需要分页控件
+  pagination: {
+    type: Boolean,
+    default: false,
+  },
+  // 可选单页显示条数
+  pageSizes: {
+    type: Array,
+    default() {
+      return [10, 20, 30]
+    },
+  },
+  // 查询条件，此处主要需要分页的条件
+  query: {
+    type: Object,
+    default() {
+      return {
+        offset: 1,
+        limit: 20,
+      }
+    },
+  },
+  // 数据总数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 可编辑
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
+const emit = defineEmits(['change', 'editData', 'deleteData'])
+
+// 改变页容量
+function handleSizeChange(val: number) {
+  emit('change', { size: val })
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  emit('change', { page: val })
+}
+
+// 点击编辑icon
+function clickEdit() {
+  emit('editData')
+}
+// 点击删除icon
+function clickDelete() {
+  emit('deleteData')
+}
 </script>
 
 <template>
@@ -34,10 +92,39 @@
         {{ title }}
       </div>
       <span v-if="pathUrl !== ''" class="more" @click="$router.push(pathUrl)">更多 ></span>
+      <!-- <el-icon v-if="isEdit" :name="icon" class="title-icon edit-icon" @click="clickEdit">
+        <svg-icon name="icon-edit" />
+      </el-icon> -->
+      <el-icon v-if="isEdit" :size="18" color="#3d7eff" style="cursor: pointer;" @click="clickEdit">
+        <edit />
+      </el-icon>
+      <el-icon v-if="isShowDelete" :size="18" color="#f56c6c" style="margin-left: 4px;cursor: pointer;" @click="clickDelete">
+        <delete />
+      </el-icon>
     </div>
     <div class="content" :style="{ height: typeof height == 'string' ? height : `${height - 50}px` }">
       <slot />
     </div>
+    <div v-if="props.pagination" style="width: 100%;margin-top: 10px;">
+      <!-- <el-pagination
+        :current-page="props.query.offset"
+        :page-sizes="props.pageSizes as number[]"
+        :page-size="props.query.limit"
+        :total="props.total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      /> -->
+      <el-pagination
+        v-model:current-page="props.query.offset"
+        small
+        :page-size="props.query.limit"
+        layout="total, prev, pager, next"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -69,6 +156,15 @@
       margin-right: 5px;
     }
 
+    .edit-icon {
+      cursor: pointer;
+    }
+
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/views/tested/dashboard/components/deviceDetail.vue b/src/views/tested/dashboard/components/deviceDetail.vue
new file mode 100644
index 0000000..bf41058
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceDetail.vue
@@ -0,0 +1,198 @@
+<!-- 设备详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const data1 = ref()
+const data2 = ref()
+const tableList = ref([
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 1,
+    content: '受检设备SJSB234849已退回 ',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+])
+onMounted(() => {
+  setTimeout(() => {
+    data1.value = [
+      {
+        name: '压力计',
+        value: 250,
+      },
+      {
+        name: '万用表',
+        value: 270,
+      },
+    ]
+    data2.value = [
+      {
+        name: '力学',
+        value: 250,
+      },
+      {
+        name: '热力',
+        value: 270,
+      },
+      {
+        name: '无线电',
+        value: 270,
+      },
+    ]
+  }, 1000)
+})
+</script>
+
+<template>
+  <div style="width: 49%;">
+    <div class="detail-container" :style="`height:${(height / 2) * 0.55}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          设备详情
+        </div>
+        <span />
+      </div>
+      <div class="search">
+        <el-input class="input" placeholder="所属岗位" />
+        <span>计量计划完成率： 20%</span>
+      </div>
+      <div class="content">
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data1"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            设备类型
+          </div>
+        </div>
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data2"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            计量专业分类
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${(height / 2) * 0.44}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          检定通知
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="tableList" :max-height="`height:${(height / 2) * 0.44 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  ::v-deep(.el-table__header-wrapper) {
+    display: none;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
new file mode 100644
index 0000000..6f886f1
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -0,0 +1,315 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const tableList = ref([])
+const current = ref('1')
+const radioMenus = ref([
+  {
+    name: '在检设备',
+    value: '1',
+  },
+  {
+    name: '待检设备',
+    value: '2',
+  },
+  {
+    name: '在用设备',
+    value: '3',
+  },
+])
+const columns = ref([
+  {
+    text: '设备编号',
+    value: 'no',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '所属部门',
+    value: 'dept',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: 'user',
+    align: 'center',
+  },
+  {
+    text: '送检时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'danwei',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: '',
+    align: 'center',
+  },
+])
+const list = ref([
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+])
+const total = ref(15)
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // fetchData()
+}
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <div class="detail-container" :style="`height:${(height / 2)}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </div>
+        <!-- <div class="more">
+          查看更多
+        </div> -->
+      </div>
+      <div class="table">
+        <bench-col
+          icon=""
+          title=""
+          path-url=""
+          :pagination="true"
+          :query="listQuery"
+          :total="total"
+          @change="changePage"
+        >
+          <el-table
+            :data="list"
+            :height="(height / 2) - 100"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column label="#" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-for="item in columns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              show-overflow-tooltip
+              :width="item.width"
+            />
+          </el-table>
+        </bench-col>
+        <!-- <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+          :is-showmulti-select="false" :height="`height:${(height / 2) - 150}px`" @change="changePage"
+        > -->
+        <!-- <template #columns>
+            <el-table-column label="操作" width="140" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                  查看
+                </el-button>
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                  编辑
+                </el-button>
+                <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template> -->
+        <!-- </normal-table> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
new file mode 100644
index 0000000..a237371
--- /dev/null
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -0,0 +1,228 @@
+<!-- 编辑日程 -->
+<script setup lang="ts" name="EditSchedule">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+// import { addSchedule, delSchedule, editSchedule, getCalendarList } from '@/api/workbench/workbench'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['editScheduleSuccess'])
+const user = useUserStore()// 用户信息
+const dialogVisible = ref(false)// 弹窗显示
+const ruleFormRef = ref<FormInstance>() // from组件
+const rules = ref<FormRules>({
+  date: [{ required: true, message: '日期必填', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+const form = ref({
+  date: '', // 日期
+})
+const list = ref([{
+  scheduleMatters: '', // 日程
+  id: '',
+}]) // 日程列表
+const type = ref('add') // 新增add，编辑edit
+// 重置
+const reset = () => {
+  form.value.date = ''
+  list.value = [{
+    scheduleMatters: '', // 日程
+    id: '',
+  }]
+}
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+  reset()
+}
+
+// 点击确定
+const clickConfirm = async (formEl: FormInstance | undefined) => {
+  // 去掉空的日程
+  const resultArr = list.value.filter(item => item.scheduleMatters)
+  console.log(resultArr)
+  if (!resultArr.length) {
+    ElMessage.warning('要求至少有一个日程')
+    return false
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const param = list.value.map((item) => {
+        return {
+          scheduleMatters: item.scheduleMatters, // 日程
+          userId: user.id, // 用户ID
+          scheduleDate: form.value.date, // 日期
+          id: item.id,
+        }
+      })
+      if (type.value === 'add') {
+        // addSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+      if (type.value === 'edit') {
+        // editSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+    }
+  })
+}
+
+// 点击增加
+const clickAdd = () => {
+  if (list.value[list.value.length - 1].scheduleMatters === '') {
+    ElMessage.warning('请完善上一条日程')
+    return false
+  }
+  list.value.push({
+    scheduleMatters: '',
+    id: '',
+  })
+}
+// 点击减少
+const clickReduce = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+// 获取日程列表
+const fetchCalendarList = (date: string) => {
+  const param = {
+    userId: user.id,
+    calendarMonth: date,
+  }
+  // getCalendarList(param).then((res) => {
+  //   const response = res.data
+  //   if (response[form.value.date].length) { // 选择的日期有日程
+  //     // for (const key in response) {
+  //     type.value = 'edit'
+  //     // console.log(response[key])
+
+  //     list.value = response[form.value.date]
+  //     // }
+  //   }
+  //   else { // 选择的日期没有日程
+  //     type.value = 'add'
+  //     list.value = [{
+  //       scheduleMatters: '', // 日程
+  //       id: '',
+  //     }]
+  //   }
+  // })
+}
+
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+// 删除所有日程
+const delAll = () => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // delSchedule({ id: list.value[0].id }).then((res) => {
+      //   ElMessage({
+      //     type: 'success',
+      //     message: '删除成功',
+      //   })
+      //   cancle()
+      // })
+    })
+}
+watch(() => form.value.date, (newVal) => {
+  const date = dayjs(new Date(newVal)).format('YYYY-MM')
+  fetchCalendarList(date)
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" class="edit-schedule" title="编辑日程" width="65%" @close="cancle">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="date"
+          placeholder="请选择日期"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+        />
+      </el-form-item>
+    </el-form>
+    <ul>
+      <li v-for="(item, index) in list" :key="index" class="li-item">
+        <el-input
+          v-model="item.scheduleMatters"
+          type="textarea"
+          autosize
+          placeholder="请输入日程"
+          style="width: 80%;"
+        />
+        <div class="icon-area">
+          <el-icon v-if="index === list.length - 1" name="icon-add-circle" class="title-icon" @click="clickAdd">
+            <svg-icon name="icon-add-circle" />
+          </el-icon>
+          <el-icon v-if="index !== 0" name="icon-reduce-circle" class="title-icon reduce-icon" @click="clickReduce(index)">
+            <svg-icon name="icon-reduce-circle" />
+          </el-icon>
+        </div>
+      </li>
+    </ul>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirm(ruleFormRef)">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+      <!-- <el-button type="danger" @click="delAll">
+        删除所有日程
+      </el-button> -->
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.edit-schedule {
+  .title-icon {
+    width: 18px;
+    height: 18px;
+    font-size: 18px;
+    line-height: 16px;
+    color: #3d7eff;
+    margin-right: 5px;
+    cursor: pointer;
+    // float: right;
+  }
+
+  .li-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 70px;
+    margin-bottom: 10px;
+  }
+
+  .icon-area {
+    display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+
+  .reduce-icon {
+    color: #ea5a32;
+  }
+}
+</style>
+
diff --git a/src/views/tested/dashboard/components/rightBox.vue b/src/views/tested/dashboard/components/rightBox.vue
new file mode 100644
index 0000000..3cdf697
--- /dev/null
+++ b/src/views/tested/dashboard/components/rightBox.vue
@@ -0,0 +1,350 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+import editScheduleDialog from './editSchedule.vue'
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const notice = ref([
+  {
+    status: 1,
+    content: '溯源公示|计量站设备溯源公告',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '溯源公示|计量站设备溯源公告',
+    time: '2023-09-01',
+  },
+  {
+    status: 0,
+    content: '单位通知|单位通知单位通知',
+    time: '2023-09-03',
+  }, {
+    status: 0,
+    content: '单位通知|单位通知单位通知',
+    time: '2023-09-03',
+  },
+])
+const approve = ref([
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 0,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+])
+const remind = ref([
+  {
+    status: 0,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-09',
+  },
+  {
+    status: 1,
+    content: '计量计划|2023年第二季度计量计划已发布 ',
+    time: '2023-09-04',
+  },
+  {
+    status: 1,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-03',
+  },
+])
+// -----------------------------------日历--------------------------------------------
+const calendarValue = ref(new Date())
+const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
+const editScheduleRef = ref() // 编辑日程ref
+const redCircleData = ref() // 日程列表
+// 点击编辑日程
+const editSchedule = () => {
+  editScheduleRef.value.initDialog()
+}
+// 获取日程列表
+const fetchCalendarList = () => {
+  const param = {
+    userId: user.id,
+    calendarMonth: selectedDate.value,
+  }
+  // getCalendarList(param).then((res) => {
+  //   redCircleData.value = res.data
+  // })
+}
+// 点击日期
+const clickDate = (day: string) => {
+  selectDateRecord.value = day
+  selectedDate.value = day.slice(0, 7)
+  fetchCalendarList() // 获取日历列表
+}
+// 点击删除icon
+const deleteData = () => {
+  if (Object.keys(redCircleData.value).length && !redCircleData.value[selectDateRecord.value].length) {
+    ElMessage.warning(`${selectDateRecord.value}没有日程，无法删除`)
+    return false
+  }
+  ElMessageBox.confirm(
+    `确定删除${selectDateRecord.value}的日程吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const param = {
+        userId: user.id,
+        scheduleDate: selectDateRecord.value,
+      }
+      // delSchedule(param).then((res) => {
+      //   ElMessage({
+      //     type: 'success',
+      //     message: '删除成功',
+      //   })
+      //   fetchCalendarList() // 获取日历列表
+      // })
+    })
+}
+
+// 编辑日程成功
+const editScheduleSuccess = () => {
+  fetchCalendarList() // 获取日历列表
+}
+const range = ref([new Date(2019, 2, 4), new Date(2019, 2, 4)])
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <!-- 编辑日程组件 -->
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
+    <div class="detail-container" :style="`height:${height * 0.24}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          工作日历
+        </div>
+      </div>
+      <div class="content">
+        <el-calendar v-model="calendarValue" :range="range">
+          <template #dateCell="{ data }">
+            <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
+              <span>
+                {{ data.day.split("-").slice(2).join() }}
+              </span>
+            </div>
+            <div v-for="(value, key, index) in redCircleData" :key="index">
+              <el-popover
+                v-if="key === data.day && value.length"
+                placement="top-start"
+                trigger="hover"
+                width="auto"
+              >
+                <div class="popover-content-area-class">
+                  <span style="font-weight: 600;">{{ key }}</span>
+                  <li v-for="(e, i) in value" :key="i" class="calendar-li-item">
+                    {{ e.scheduleMatters }}
+                  </li>
+                </div>
+                <template #reference>
+                  <div style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <!-- <span>
+                        {{ data.day.split("-").slice(2).join() }}
+                      </span> -->
+                    <span style="margin-top: -30px;">
+                      <el-icon :size="20" color="#f56c6c">
+                        <alarm-clock />
+                      </el-icon>
+                      <!-- <span v-if="key === data.day" class="redCircle" /> -->
+                    </span>
+                  </div>
+                </template>
+              </el-popover>
+            </div>
+          </template>
+        </el-calendar>
+      </div>
+      <div class="expand">
+        展开↓
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          通知公告
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="notice" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          审批提醒
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="approve" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          工作提醒
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="remind" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-table__header-wrapper) {
+  display: none;
+}
+
+.expand {
+  position: absolute;
+  z-index: 9;
+  bottom: 0;
+  text-align: center;
+  width: 100%;
+  background: #fff;
+  // &:hover {
+  //   cursor:
+  // }
+  font-size: 14px;
+  color: #ccc;
+}
+
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  position: relative;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .table {
+    margin-top: 10px;
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/verificationDetail.vue b/src/views/tested/dashboard/components/verificationDetail.vue
new file mode 100644
index 0000000..fcb8084
--- /dev/null
+++ b/src/views/tested/dashboard/components/verificationDetail.vue
@@ -0,0 +1,168 @@
+<!-- 检定详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const list = ref([
+  {
+    name: '年度应检数量',
+    value: '1221',
+    img: '',
+  },
+  {
+    name: '年度已检数量',
+    value: '1209',
+    img: '',
+  },
+  {
+    name: '本月到期设备',
+    value: '15',
+    img: '',
+  },
+  {
+    name: '已超期设备',
+    value: '215',
+    img: '',
+  },
+  {
+    name: '设备总数',
+    value: '1000',
+    img: '',
+  },
+  {
+    name: '在检设备',
+    value: '800',
+    img: '',
+  },
+  {
+    name: '待检设备',
+    value: '200',
+    img: '',
+  },
+  {
+    name: '在用设备',
+    value: '800',
+    img: '',
+  },
+])
+const data = ref([
+
+])
+const xAxisData = ref([])
+const legend = ref({
+  show: true,
+  // icon: 'circle',
+  orient: 'horizontal', // 图例方向
+  align: 'left', // 图例标记和文本的对齐，默认自动
+  top: 10,
+  right: 20,
+  // itemWidth: 12,
+  // itemHeight: 12,
+  padding: [0, 0, 0, 120],
+})
+onMounted(() => {
+  setTimeout(() => {
+    data.value = [{
+      name: '到期趋势',
+      data: [15, 33, 51, 74, 21, 32],
+    },
+    {
+      name: '检定趋势',
+      data: [6, 31, 21, 34, 41, 22],
+    },
+    {
+      name: '应检趋势',
+      data: [22, 13, 15, 44, 25, 17],
+    }]
+    xAxisData.value = ['1月', '2月', '3月', '4月', '5月', '6月']
+  }, 1000)
+})
+</script>
+
+<template>
+  <div class="detail-container" :style="`height:${height / 2}px;margin-top:5px;`">
+    <div class="top">
+      <div class="title">
+        检定详情
+      </div>
+      <span />
+    </div>
+    <div class="content">
+      <div v-for="item in list" :key="item.name" class="item">
+        <div class="title1">
+          {{ item.name }}
+        </div>
+        <div class="content1">
+          <img class="img1" src="https://img.tukuppt.com/ad_preview/00/21/69/BZ8xm78jaS.jpg!/fw/260" width="30" height="30">
+          <div class="value1">
+            {{ item.value }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bottom">
+      <line-chart unit="台" :data="data" x-axis-type="category" :x-axis-data="xAxisData" :style="`height:${height / 2 - 150}px`" :legend="legend" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-container {
+  background: #fff;
+  width: 49%;
+  border-radius: 8px;
+  padding: 10px;
+  box-sizing: border-box;
+
+  .top {
+    display: flex;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+
+    .item {
+      width: 25%;
+      margin-top: 10px;
+
+      .title1 {
+        font-size: 14px;
+      }
+
+      .content1 {
+        width: 80%;
+        display: flex;
+        font-size: 12px;
+        justify-content: space-around;
+
+        .img1 {
+          border-radius: 50%;
+        }
+
+        .value1 {
+          // line-height:30px;
+          // text-aligin:center;
+          margin-left: 10px;
+          height: 30px;
+          line-height: 30px;
+        }
+      }
+    }
+  }
+}
+</style>

diff --git a/.env.development b/.env.development
index 9551b19..debe1a8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,8 @@
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_APP_API_BASEURL = http://127.0.0.1:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 4a1f370..f08078d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -46,7 +46,7 @@
   },
   // 表格高度
   height: {
-    type: Number,
+    type: String,
     default() {
       return null
     },
@@ -192,7 +192,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      :height="height"
+      :max-height="props.height"
       border
       stripe
       :size="size"
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 6f816d8..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup name="benchCol">
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 // 逻辑代码
 const props = defineProps({
   title: {
@@ -21,7 +23,63 @@
     type: [String, Number],
     default: '',
   },
+  // 是否需要分页控件
+  pagination: {
+    type: Boolean,
+    default: false,
+  },
+  // 可选单页显示条数
+  pageSizes: {
+    type: Array,
+    default() {
+      return [10, 20, 30]
+    },
+  },
+  // 查询条件，此处主要需要分页的条件
+  query: {
+    type: Object,
+    default() {
+      return {
+        offset: 1,
+        limit: 20,
+      }
+    },
+  },
+  // 数据总数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 可编辑
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
+const emit = defineEmits(['change', 'editData', 'deleteData'])
+
+// 改变页容量
+function handleSizeChange(val: number) {
+  emit('change', { size: val })
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  emit('change', { page: val })
+}
+
+// 点击编辑icon
+function clickEdit() {
+  emit('editData')
+}
+// 点击删除icon
+function clickDelete() {
+  emit('deleteData')
+}
 </script>
 
 <template>
@@ -34,10 +92,39 @@
         {{ title }}
       </div>
       <span v-if="pathUrl !== ''" class="more" @click="$router.push(pathUrl)">更多 ></span>
+      <!-- <el-icon v-if="isEdit" :name="icon" class="title-icon edit-icon" @click="clickEdit">
+        <svg-icon name="icon-edit" />
+      </el-icon> -->
+      <el-icon v-if="isEdit" :size="18" color="#3d7eff" style="cursor: pointer;" @click="clickEdit">
+        <edit />
+      </el-icon>
+      <el-icon v-if="isShowDelete" :size="18" color="#f56c6c" style="margin-left: 4px;cursor: pointer;" @click="clickDelete">
+        <delete />
+      </el-icon>
     </div>
     <div class="content" :style="{ height: typeof height == 'string' ? height : `${height - 50}px` }">
       <slot />
     </div>
+    <div v-if="props.pagination" style="width: 100%;margin-top: 10px;">
+      <!-- <el-pagination
+        :current-page="props.query.offset"
+        :page-sizes="props.pageSizes as number[]"
+        :page-size="props.query.limit"
+        :total="props.total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      /> -->
+      <el-pagination
+        v-model:current-page="props.query.offset"
+        small
+        :page-size="props.query.limit"
+        layout="total, prev, pager, next"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -69,6 +156,15 @@
       margin-right: 5px;
     }
 
+    .edit-icon {
+      cursor: pointer;
+    }
+
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/views/tested/dashboard/components/deviceDetail.vue b/src/views/tested/dashboard/components/deviceDetail.vue
new file mode 100644
index 0000000..bf41058
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceDetail.vue
@@ -0,0 +1,198 @@
+<!-- 设备详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const data1 = ref()
+const data2 = ref()
+const tableList = ref([
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 1,
+    content: '受检设备SJSB234849已退回 ',
+    time: '2023-05-12 13:12',
+  },
+  {
+    status: 0,
+    content: '任务单RWD234849已检完',
+    time: '2023-05-12 13:12',
+  },
+])
+onMounted(() => {
+  setTimeout(() => {
+    data1.value = [
+      {
+        name: '压力计',
+        value: 250,
+      },
+      {
+        name: '万用表',
+        value: 270,
+      },
+    ]
+    data2.value = [
+      {
+        name: '力学',
+        value: 250,
+      },
+      {
+        name: '热力',
+        value: 270,
+      },
+      {
+        name: '无线电',
+        value: 270,
+      },
+    ]
+  }, 1000)
+})
+</script>
+
+<template>
+  <div style="width: 49%;">
+    <div class="detail-container" :style="`height:${(height / 2) * 0.55}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          设备详情
+        </div>
+        <span />
+      </div>
+      <div class="search">
+        <el-input class="input" placeholder="所属岗位" />
+        <span>计量计划完成率： 20%</span>
+      </div>
+      <div class="content">
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data1"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            设备类型
+          </div>
+        </div>
+        <div class="pie1" :style="`height:${(height / 2) * 0.55 - 65}px`">
+          <pie-chart
+            :data="data2"
+            :radius=" ['50%', '70%']"
+            :legend="{ show: false }"
+          />
+          <div class="title">
+            计量专业分类
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${(height / 2) * 0.44}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          检定通知
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="tableList" :max-height="`height:${(height / 2) * 0.44 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  ::v-deep(.el-table__header-wrapper) {
+    display: none;
+  }
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/deviceList.vue b/src/views/tested/dashboard/components/deviceList.vue
new file mode 100644
index 0000000..6f886f1
--- /dev/null
+++ b/src/views/tested/dashboard/components/deviceList.vue
@@ -0,0 +1,315 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const tableList = ref([])
+const current = ref('1')
+const radioMenus = ref([
+  {
+    name: '在检设备',
+    value: '1',
+  },
+  {
+    name: '待检设备',
+    value: '2',
+  },
+  {
+    name: '在用设备',
+    value: '3',
+  },
+])
+const columns = ref([
+  {
+    text: '设备编号',
+    value: 'no',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'name',
+    align: 'center',
+  },
+  {
+    text: '所属部门',
+    value: 'dept',
+    align: 'center',
+  },
+  {
+    text: '负责人',
+    value: 'user',
+    align: 'center',
+  },
+  {
+    text: '送检时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'danwei',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: '',
+    align: 'center',
+  },
+])
+const list = ref([
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+  {
+    no: 'sq001',
+    name: '测试设备',
+    dept: '测试部门',
+    user: '张三',
+    time: '2023-09-12',
+    danwei: '检定单位',
+  },
+])
+const total = ref(15)
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  // fetchData()
+}
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <div class="detail-container" :style="`height:${(height / 2)}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in radioMenus" :key="item.value" :label="item.value">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </div>
+        <!-- <div class="more">
+          查看更多
+        </div> -->
+      </div>
+      <div class="table">
+        <bench-col
+          icon=""
+          title=""
+          path-url=""
+          :pagination="true"
+          :query="listQuery"
+          :total="total"
+          @change="changePage"
+        >
+          <el-table
+            :data="list"
+            :height="(height / 2) - 100"
+            style="width: 100%; height: 100%;"
+            stripe
+            header-row-class-name="bench-table-header"
+            row-class-name="bench-table-row"
+            class="bench-table"
+          >
+            <el-table-column label="#" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-for="item in columns"
+              :key="item.value"
+              :prop="item.value"
+              align="center"
+              :label="item.text"
+              show-overflow-tooltip
+              :width="item.width"
+            />
+          </el-table>
+        </bench-col>
+        <!-- <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+          :is-showmulti-select="false" :height="`height:${(height / 2) - 150}px`" @change="changePage"
+        > -->
+        <!-- <template #columns>
+            <el-table-column label="操作" width="140" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                  查看
+                </el-button>
+                <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                  编辑
+                </el-button>
+                <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template> -->
+        <!-- </normal-table> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/editSchedule.vue b/src/views/tested/dashboard/components/editSchedule.vue
new file mode 100644
index 0000000..a237371
--- /dev/null
+++ b/src/views/tested/dashboard/components/editSchedule.vue
@@ -0,0 +1,228 @@
+<!-- 编辑日程 -->
+<script setup lang="ts" name="EditSchedule">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+// import { addSchedule, delSchedule, editSchedule, getCalendarList } from '@/api/workbench/workbench'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['editScheduleSuccess'])
+const user = useUserStore()// 用户信息
+const dialogVisible = ref(false)// 弹窗显示
+const ruleFormRef = ref<FormInstance>() // from组件
+const rules = ref<FormRules>({
+  date: [{ required: true, message: '日期必填', trigger: ['blur', 'change'] }],
+}) // 表单验证规则
+const form = ref({
+  date: '', // 日期
+})
+const list = ref([{
+  scheduleMatters: '', // 日程
+  id: '',
+}]) // 日程列表
+const type = ref('add') // 新增add，编辑edit
+// 重置
+const reset = () => {
+  form.value.date = ''
+  list.value = [{
+    scheduleMatters: '', // 日程
+    id: '',
+  }]
+}
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+  reset()
+}
+
+// 点击确定
+const clickConfirm = async (formEl: FormInstance | undefined) => {
+  // 去掉空的日程
+  const resultArr = list.value.filter(item => item.scheduleMatters)
+  console.log(resultArr)
+  if (!resultArr.length) {
+    ElMessage.warning('要求至少有一个日程')
+    return false
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const param = list.value.map((item) => {
+        return {
+          scheduleMatters: item.scheduleMatters, // 日程
+          userId: user.id, // 用户ID
+          scheduleDate: form.value.date, // 日期
+          id: item.id,
+        }
+      })
+      if (type.value === 'add') {
+        // addSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+      if (type.value === 'edit') {
+        // editSchedule(param).then((res) => {
+        //   ElMessage.success('设置成功')
+        //   dialogVisible.value = false
+        //   emits('editScheduleSuccess')
+        // })
+      }
+    }
+  })
+}
+
+// 点击增加
+const clickAdd = () => {
+  if (list.value[list.value.length - 1].scheduleMatters === '') {
+    ElMessage.warning('请完善上一条日程')
+    return false
+  }
+  list.value.push({
+    scheduleMatters: '',
+    id: '',
+  })
+}
+// 点击减少
+const clickReduce = (index: number) => {
+  list.value.splice(index, 1)
+}
+
+// 获取日程列表
+const fetchCalendarList = (date: string) => {
+  const param = {
+    userId: user.id,
+    calendarMonth: date,
+  }
+  // getCalendarList(param).then((res) => {
+  //   const response = res.data
+  //   if (response[form.value.date].length) { // 选择的日期有日程
+  //     // for (const key in response) {
+  //     type.value = 'edit'
+  //     // console.log(response[key])
+
+  //     list.value = response[form.value.date]
+  //     // }
+  //   }
+  //   else { // 选择的日期没有日程
+  //     type.value = 'add'
+  //     list.value = [{
+  //       scheduleMatters: '', // 日程
+  //       id: '',
+  //     }]
+  //   }
+  // })
+}
+
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+// 删除所有日程
+const delAll = () => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // delSchedule({ id: list.value[0].id }).then((res) => {
+      //   ElMessage({
+      //     type: 'success',
+      //     message: '删除成功',
+      //   })
+      //   cancle()
+      // })
+    })
+}
+watch(() => form.value.date, (newVal) => {
+  const date = dayjs(new Date(newVal)).format('YYYY-MM')
+  fetchCalendarList(date)
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" class="edit-schedule" title="编辑日程" width="65%" @close="cancle">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="date"
+          placeholder="请选择日期"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+        />
+      </el-form-item>
+    </el-form>
+    <ul>
+      <li v-for="(item, index) in list" :key="index" class="li-item">
+        <el-input
+          v-model="item.scheduleMatters"
+          type="textarea"
+          autosize
+          placeholder="请输入日程"
+          style="width: 80%;"
+        />
+        <div class="icon-area">
+          <el-icon v-if="index === list.length - 1" name="icon-add-circle" class="title-icon" @click="clickAdd">
+            <svg-icon name="icon-add-circle" />
+          </el-icon>
+          <el-icon v-if="index !== 0" name="icon-reduce-circle" class="title-icon reduce-icon" @click="clickReduce(index)">
+            <svg-icon name="icon-reduce-circle" />
+          </el-icon>
+        </div>
+      </li>
+    </ul>
+    <template #footer>
+      <el-button type="primary" @click="clickConfirm(ruleFormRef)">
+        确定
+      </el-button>
+      <el-button @click="cancle">
+        取消
+      </el-button>
+      <!-- <el-button type="danger" @click="delAll">
+        删除所有日程
+      </el-button> -->
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.edit-schedule {
+  .title-icon {
+    width: 18px;
+    height: 18px;
+    font-size: 18px;
+    line-height: 16px;
+    color: #3d7eff;
+    margin-right: 5px;
+    cursor: pointer;
+    // float: right;
+  }
+
+  .li-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-left: 70px;
+    margin-bottom: 10px;
+  }
+
+  .icon-area {
+    display: flex;
+    // justify-content: space-between;
+    // align-items: center;
+  }
+
+  .reduce-icon {
+    color: #ea5a32;
+  }
+}
+</style>
+
diff --git a/src/views/tested/dashboard/components/rightBox.vue b/src/views/tested/dashboard/components/rightBox.vue
new file mode 100644
index 0000000..3cdf697
--- /dev/null
+++ b/src/views/tested/dashboard/components/rightBox.vue
@@ -0,0 +1,350 @@
+<!-- 设备列表 -->
+<script lang="ts" setup name="Dashboard">
+import editScheduleDialog from './editSchedule.vue'
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const notice = ref([
+  {
+    status: 1,
+    content: '溯源公示|计量站设备溯源公告',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '溯源公示|计量站设备溯源公告',
+    time: '2023-09-01',
+  },
+  {
+    status: 0,
+    content: '单位通知|单位通知单位通知',
+    time: '2023-09-03',
+  }, {
+    status: 0,
+    content: '单位通知|单位通知单位通知',
+    time: '2023-09-03',
+  },
+])
+const approve = ref([
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+  {
+    status: 0,
+    content: '审批名称审批名称审批名称',
+    time: '2023-09-01',
+  },
+])
+const remind = ref([
+  {
+    status: 0,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-01',
+  },
+  {
+    status: 1,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-09',
+  },
+  {
+    status: 1,
+    content: '计量计划|2023年第二季度计量计划已发布 ',
+    time: '2023-09-04',
+  },
+  {
+    status: 1,
+    content: '设备到期|压力表JL8938292S已超有效期 ',
+    time: '2023-09-03',
+  },
+])
+// -----------------------------------日历--------------------------------------------
+const calendarValue = ref(new Date())
+const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
+const editScheduleRef = ref() // 编辑日程ref
+const redCircleData = ref() // 日程列表
+// 点击编辑日程
+const editSchedule = () => {
+  editScheduleRef.value.initDialog()
+}
+// 获取日程列表
+const fetchCalendarList = () => {
+  const param = {
+    userId: user.id,
+    calendarMonth: selectedDate.value,
+  }
+  // getCalendarList(param).then((res) => {
+  //   redCircleData.value = res.data
+  // })
+}
+// 点击日期
+const clickDate = (day: string) => {
+  selectDateRecord.value = day
+  selectedDate.value = day.slice(0, 7)
+  fetchCalendarList() // 获取日历列表
+}
+// 点击删除icon
+const deleteData = () => {
+  if (Object.keys(redCircleData.value).length && !redCircleData.value[selectDateRecord.value].length) {
+    ElMessage.warning(`${selectDateRecord.value}没有日程，无法删除`)
+    return false
+  }
+  ElMessageBox.confirm(
+    `确定删除${selectDateRecord.value}的日程吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      const param = {
+        userId: user.id,
+        scheduleDate: selectDateRecord.value,
+      }
+      // delSchedule(param).then((res) => {
+      //   ElMessage({
+      //     type: 'success',
+      //     message: '删除成功',
+      //   })
+      //   fetchCalendarList() // 获取日历列表
+      // })
+    })
+}
+
+// 编辑日程成功
+const editScheduleSuccess = () => {
+  fetchCalendarList() // 获取日历列表
+}
+const range = ref([new Date(2019, 2, 4), new Date(2019, 2, 4)])
+</script>
+
+<template>
+  <div style="width: 99%;">
+    <!-- 编辑日程组件 -->
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
+    <div class="detail-container" :style="`height:${height * 0.24}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          工作日历
+        </div>
+      </div>
+      <div class="content">
+        <el-calendar v-model="calendarValue" :range="range">
+          <template #dateCell="{ data }">
+            <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
+              <span>
+                {{ data.day.split("-").slice(2).join() }}
+              </span>
+            </div>
+            <div v-for="(value, key, index) in redCircleData" :key="index">
+              <el-popover
+                v-if="key === data.day && value.length"
+                placement="top-start"
+                trigger="hover"
+                width="auto"
+              >
+                <div class="popover-content-area-class">
+                  <span style="font-weight: 600;">{{ key }}</span>
+                  <li v-for="(e, i) in value" :key="i" class="calendar-li-item">
+                    {{ e.scheduleMatters }}
+                  </li>
+                </div>
+                <template #reference>
+                  <div style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <!-- <span>
+                        {{ data.day.split("-").slice(2).join() }}
+                      </span> -->
+                    <span style="margin-top: -30px;">
+                      <el-icon :size="20" color="#f56c6c">
+                        <alarm-clock />
+                      </el-icon>
+                      <!-- <span v-if="key === data.day" class="redCircle" /> -->
+                    </span>
+                  </div>
+                </template>
+              </el-popover>
+            </div>
+          </template>
+        </el-calendar>
+      </div>
+      <div class="expand">
+        展开↓
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          通知公告
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="notice" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          审批提醒
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="approve" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+    <div class="detail-container" :style="`height:${height * 0.25}px;margin-top:5px;`">
+      <div class="top">
+        <div class="title">
+          工作提醒
+        </div>
+        <div class="more">
+          查看更多
+        </div>
+      </div>
+      <div class="table">
+        <el-table :data="remind" :max-height="`height:${height * 0.25 - 22}px`">
+          <el-table-column label="" prop="status" width="50" aligin="center">
+            <template #default="props">
+              <div :class="`${props.row.status ? 'green' : 'red'}`" />
+            </template>
+          </el-table-column>
+          <el-table-column label="" prop="content" aligin="center" />
+          <el-table-column label="" prop="time" width="150" aligin="center" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-table__header-wrapper) {
+  display: none;
+}
+
+.expand {
+  position: absolute;
+  z-index: 9;
+  bottom: 0;
+  text-align: center;
+  width: 100%;
+  background: #fff;
+  // &:hover {
+  //   cursor:
+  // }
+  font-size: 14px;
+  color: #ccc;
+}
+
+.green {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: green;
+}
+
+.red {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  background: rgb(228 85 29);
+}
+
+.detail-container {
+  background: #fff;
+  width: 100%;
+  border-radius: 8px;
+  padding: 10px;
+  overflow: hidden;
+  position: relative;
+
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .more {
+      color: blue;
+    }
+  }
+
+  .table {
+    margin-top: 10px;
+  }
+
+  .search {
+    display: flex;
+    padding: 5px 10px;
+    justify-content: space-between;
+
+    .input {
+      padding-left: 15px;
+      width: 30%;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+
+    .pie1,
+    .pie2 {
+      width: 50%;
+      position: relative;
+
+      .title {
+        position: absolute;
+        bottom: 8px;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/components/verificationDetail.vue b/src/views/tested/dashboard/components/verificationDetail.vue
new file mode 100644
index 0000000..fcb8084
--- /dev/null
+++ b/src/views/tested/dashboard/components/verificationDetail.vue
@@ -0,0 +1,168 @@
+<!-- 检定详情 -->
+<script lang="ts" setup name="Dashboard">
+// import verificationDetail from './components/verificationDetail.vue'
+const width = ref(document.body.clientWidth - 180)
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyWidth = document.body.clientWidth - 180
+  width.value = bodyWidth
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+const list = ref([
+  {
+    name: '年度应检数量',
+    value: '1221',
+    img: '',
+  },
+  {
+    name: '年度已检数量',
+    value: '1209',
+    img: '',
+  },
+  {
+    name: '本月到期设备',
+    value: '15',
+    img: '',
+  },
+  {
+    name: '已超期设备',
+    value: '215',
+    img: '',
+  },
+  {
+    name: '设备总数',
+    value: '1000',
+    img: '',
+  },
+  {
+    name: '在检设备',
+    value: '800',
+    img: '',
+  },
+  {
+    name: '待检设备',
+    value: '200',
+    img: '',
+  },
+  {
+    name: '在用设备',
+    value: '800',
+    img: '',
+  },
+])
+const data = ref([
+
+])
+const xAxisData = ref([])
+const legend = ref({
+  show: true,
+  // icon: 'circle',
+  orient: 'horizontal', // 图例方向
+  align: 'left', // 图例标记和文本的对齐，默认自动
+  top: 10,
+  right: 20,
+  // itemWidth: 12,
+  // itemHeight: 12,
+  padding: [0, 0, 0, 120],
+})
+onMounted(() => {
+  setTimeout(() => {
+    data.value = [{
+      name: '到期趋势',
+      data: [15, 33, 51, 74, 21, 32],
+    },
+    {
+      name: '检定趋势',
+      data: [6, 31, 21, 34, 41, 22],
+    },
+    {
+      name: '应检趋势',
+      data: [22, 13, 15, 44, 25, 17],
+    }]
+    xAxisData.value = ['1月', '2月', '3月', '4月', '5月', '6月']
+  }, 1000)
+})
+</script>
+
+<template>
+  <div class="detail-container" :style="`height:${height / 2}px;margin-top:5px;`">
+    <div class="top">
+      <div class="title">
+        检定详情
+      </div>
+      <span />
+    </div>
+    <div class="content">
+      <div v-for="item in list" :key="item.name" class="item">
+        <div class="title1">
+          {{ item.name }}
+        </div>
+        <div class="content1">
+          <img class="img1" src="https://img.tukuppt.com/ad_preview/00/21/69/BZ8xm78jaS.jpg!/fw/260" width="30" height="30">
+          <div class="value1">
+            {{ item.value }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bottom">
+      <line-chart unit="台" :data="data" x-axis-type="category" :x-axis-data="xAxisData" :style="`height:${height / 2 - 150}px`" :legend="legend" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-container {
+  background: #fff;
+  width: 49%;
+  border-radius: 8px;
+  padding: 10px;
+  box-sizing: border-box;
+
+  .top {
+    display: flex;
+
+    .title {
+      padding-left: 10px;
+      font-size: 16px;
+      font-weight: 700;
+    }
+  }
+
+  .content {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+
+    .item {
+      width: 25%;
+      margin-top: 10px;
+
+      .title1 {
+        font-size: 14px;
+      }
+
+      .content1 {
+        width: 80%;
+        display: flex;
+        font-size: 12px;
+        justify-content: space-around;
+
+        .img1 {
+          border-radius: 50%;
+        }
+
+        .value1 {
+          // line-height:30px;
+          // text-aligin:center;
+          margin-left: 10px;
+          height: 30px;
+          line-height: 30px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 04869cb..10362ba 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -1,3 +1,39 @@
+<!-- 首页看板 -->
+<script lang="ts" setup name="Dashboard">
+import verificationDetail from './components/verificationDetail.vue'
+import deviceDetail from './components/deviceDetail.vue'
+import deviceList from './components/deviceList.vue'
+import rightBox from './components/rightBox.vue'
+const height = ref(document.body.clientHeight - 50 - 60 - 10)
+window.addEventListener('resize', () => {
+  const bodyHeight = document.body.clientHeight - 50 - 60
+  height.value = bodyHeight
+})
+</script>
+
 <template>
-  首页看板
+  <div class="container" :style="`height:${height}px`">
+    <div class="container" :style="`height:${height}px;width:66.66%`">
+      <!-- 检定详情 -->
+      <verification-detail />
+      <!-- 设备详情 -->
+      <device-detail />
+      <!-- 设备列表 -->
+      <device-list />
+    </div>
+    <div class="container" :style="`height:${height}px;width:33.33%`">
+      <right-box />
+    </div>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  // width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  padding: 0;
+  overflow: hidden;
+}
+</style>