diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts
index 9d180ea..94ee81a 100644
--- a/src/router/modules/workbench.ts
+++ b/src/router/modules/workbench.ts
@@ -12,27 +12,32 @@
       title: '总工作台',
       icon: 'icon-workbench',
     },
-  },
-  {
-    path: '/comprehensive',
-    component: Layout,
-    // redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-zh',
-    },
     children: [
       {
+        path: 'bench',
+        name: 'Bench',
+        meta: {
+          title: '总工作台',
+          sidebar: true,
+          activeMenu: '/workbench',
+        },
+      },
+      {
         path: 'approve',
         name: 'Approve',
-        // component: () => import('@/views/business/board/depComprehensive/list.vue'),
         meta: {
           title: '审批提醒',
-          // auth: '/device/bench',
           sidebar: true,
-          // breadcrumb: true,
-          activeMenu: '/comprehensive',
+          activeMenu: '/workbench',
+        },
+      },
+      {
+        path: 'workList',
+        name: 'workList',
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          activeMenu: '/workbench',
         },
       },
     ],

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts
index 9d180ea..94ee81a 100644
--- a/src/router/modules/workbench.ts
+++ b/src/router/modules/workbench.ts
@@ -12,27 +12,32 @@
       title: '总工作台',
       icon: 'icon-workbench',
     },
-  },
-  {
-    path: '/comprehensive',
-    component: Layout,
-    // redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-zh',
-    },
     children: [
       {
+        path: 'bench',
+        name: 'Bench',
+        meta: {
+          title: '总工作台',
+          sidebar: true,
+          activeMenu: '/workbench',
+        },
+      },
+      {
         path: 'approve',
         name: 'Approve',
-        // component: () => import('@/views/business/board/depComprehensive/list.vue'),
         meta: {
           title: '审批提醒',
-          // auth: '/device/bench',
           sidebar: true,
-          // breadcrumb: true,
-          activeMenu: '/comprehensive',
+          activeMenu: '/workbench',
+        },
+      },
+      {
+        path: 'workList',
+        name: 'workList',
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          activeMenu: '/workbench',
         },
       },
     ],
diff --git a/src/router/routes.ts b/src/router/routes.ts
index fe03729..ed49855 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -43,6 +43,7 @@
 const systemRoutes: Route.recordRaw[] = [
   {
     path: '/workbench',
+    redirect: '/workbench/bench',
     component: () => import('@/layouts/workBenchLayouts.vue'),
     meta: {
       title: '总工作台',
@@ -50,7 +51,7 @@
     },
     children: [
       {
-        path: '',
+        path: 'bench',
         name: 'workbench',
         component: () => import('@/views/workbench.vue'),
         meta: {
@@ -58,18 +59,6 @@
           breadcrumb: false,
         },
       },
-    ],
-  },
-  {
-    path: '/comprehensive',
-    component: () => import('@/layouts/workBenchLayouts.vue'),
-    redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-business-system',
-    },
-    children: [
       {
         path: 'approve',
         name: 'Approve',
@@ -78,6 +67,16 @@
           title: '审批提醒',
           sidebar: true,
           breadcrumb: true,
+        },
+      },
+      {
+        path: 'workList',
+        name: 'WorkList',
+        component: () => import('@/views/workbench/workList.vue'),
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          breadcrumb: true,
           // activeMenu: '/comprehensive',
         },
       },

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts
index 9d180ea..94ee81a 100644
--- a/src/router/modules/workbench.ts
+++ b/src/router/modules/workbench.ts
@@ -12,27 +12,32 @@
       title: '总工作台',
       icon: 'icon-workbench',
     },
-  },
-  {
-    path: '/comprehensive',
-    component: Layout,
-    // redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-zh',
-    },
     children: [
       {
+        path: 'bench',
+        name: 'Bench',
+        meta: {
+          title: '总工作台',
+          sidebar: true,
+          activeMenu: '/workbench',
+        },
+      },
+      {
         path: 'approve',
         name: 'Approve',
-        // component: () => import('@/views/business/board/depComprehensive/list.vue'),
         meta: {
           title: '审批提醒',
-          // auth: '/device/bench',
           sidebar: true,
-          // breadcrumb: true,
-          activeMenu: '/comprehensive',
+          activeMenu: '/workbench',
+        },
+      },
+      {
+        path: 'workList',
+        name: 'workList',
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          activeMenu: '/workbench',
         },
       },
     ],
diff --git a/src/router/routes.ts b/src/router/routes.ts
index fe03729..ed49855 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -43,6 +43,7 @@
 const systemRoutes: Route.recordRaw[] = [
   {
     path: '/workbench',
+    redirect: '/workbench/bench',
     component: () => import('@/layouts/workBenchLayouts.vue'),
     meta: {
       title: '总工作台',
@@ -50,7 +51,7 @@
     },
     children: [
       {
-        path: '',
+        path: 'bench',
         name: 'workbench',
         component: () => import('@/views/workbench.vue'),
         meta: {
@@ -58,18 +59,6 @@
           breadcrumb: false,
         },
       },
-    ],
-  },
-  {
-    path: '/comprehensive',
-    component: () => import('@/layouts/workBenchLayouts.vue'),
-    redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-business-system',
-    },
-    children: [
       {
         path: 'approve',
         name: 'Approve',
@@ -78,6 +67,16 @@
           title: '审批提醒',
           sidebar: true,
           breadcrumb: true,
+        },
+      },
+      {
+        path: 'workList',
+        name: 'WorkList',
+        component: () => import('@/views/workbench/workList.vue'),
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          breadcrumb: true,
           // activeMenu: '/comprehensive',
         },
       },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts
index 9d180ea..94ee81a 100644
--- a/src/router/modules/workbench.ts
+++ b/src/router/modules/workbench.ts
@@ -12,27 +12,32 @@
       title: '总工作台',
       icon: 'icon-workbench',
     },
-  },
-  {
-    path: '/comprehensive',
-    component: Layout,
-    // redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-zh',
-    },
     children: [
       {
+        path: 'bench',
+        name: 'Bench',
+        meta: {
+          title: '总工作台',
+          sidebar: true,
+          activeMenu: '/workbench',
+        },
+      },
+      {
         path: 'approve',
         name: 'Approve',
-        // component: () => import('@/views/business/board/depComprehensive/list.vue'),
         meta: {
           title: '审批提醒',
-          // auth: '/device/bench',
           sidebar: true,
-          // breadcrumb: true,
-          activeMenu: '/comprehensive',
+          activeMenu: '/workbench',
+        },
+      },
+      {
+        path: 'workList',
+        name: 'workList',
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          activeMenu: '/workbench',
         },
       },
     ],
diff --git a/src/router/routes.ts b/src/router/routes.ts
index fe03729..ed49855 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -43,6 +43,7 @@
 const systemRoutes: Route.recordRaw[] = [
   {
     path: '/workbench',
+    redirect: '/workbench/bench',
     component: () => import('@/layouts/workBenchLayouts.vue'),
     meta: {
       title: '总工作台',
@@ -50,7 +51,7 @@
     },
     children: [
       {
-        path: '',
+        path: 'bench',
         name: 'workbench',
         component: () => import('@/views/workbench.vue'),
         meta: {
@@ -58,18 +59,6 @@
           breadcrumb: false,
         },
       },
-    ],
-  },
-  {
-    path: '/comprehensive',
-    component: () => import('@/layouts/workBenchLayouts.vue'),
-    redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-business-system',
-    },
-    children: [
       {
         path: 'approve',
         name: 'Approve',
@@ -78,6 +67,16 @@
           title: '审批提醒',
           sidebar: true,
           breadcrumb: true,
+        },
+      },
+      {
+        path: 'workList',
+        name: 'WorkList',
+        component: () => import('@/views/workbench/workList.vue'),
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          breadcrumb: true,
           // activeMenu: '/comprehensive',
         },
       },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index ab194c6..9dea24f 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -251,9 +251,15 @@
   })
   // ------------------------------------------------------------------------------
 })
+const go = () => {
+  window.open(`https://share.shanhaibi.com/64914aad87721/?token=${localStorage.token}`)
+}
 </script>
 
 <template>
+  <button @click="go">
+    跳转
+  </button>
   <app-container>
     <el-row :gutter="10">
       <el-col :span="8">
@@ -262,7 +268,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
-          path-url="/comprehensive/approve"
+          path-url="/workbench/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -298,6 +304,7 @@
         <bench-col
           icon="icon-backlog"
           title="工作提醒"
+          path-url="/workbench/workList"
           :height="blockHeight"
           :pagination="true"
           :query="workMessageListQuery"

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts
index 9d180ea..94ee81a 100644
--- a/src/router/modules/workbench.ts
+++ b/src/router/modules/workbench.ts
@@ -12,27 +12,32 @@
       title: '总工作台',
       icon: 'icon-workbench',
     },
-  },
-  {
-    path: '/comprehensive',
-    component: Layout,
-    // redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-zh',
-    },
     children: [
       {
+        path: 'bench',
+        name: 'Bench',
+        meta: {
+          title: '总工作台',
+          sidebar: true,
+          activeMenu: '/workbench',
+        },
+      },
+      {
         path: 'approve',
         name: 'Approve',
-        // component: () => import('@/views/business/board/depComprehensive/list.vue'),
         meta: {
           title: '审批提醒',
-          // auth: '/device/bench',
           sidebar: true,
-          // breadcrumb: true,
-          activeMenu: '/comprehensive',
+          activeMenu: '/workbench',
+        },
+      },
+      {
+        path: 'workList',
+        name: 'workList',
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          activeMenu: '/workbench',
         },
       },
     ],
diff --git a/src/router/routes.ts b/src/router/routes.ts
index fe03729..ed49855 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -43,6 +43,7 @@
 const systemRoutes: Route.recordRaw[] = [
   {
     path: '/workbench',
+    redirect: '/workbench/bench',
     component: () => import('@/layouts/workBenchLayouts.vue'),
     meta: {
       title: '总工作台',
@@ -50,7 +51,7 @@
     },
     children: [
       {
-        path: '',
+        path: 'bench',
         name: 'workbench',
         component: () => import('@/views/workbench.vue'),
         meta: {
@@ -58,18 +59,6 @@
           breadcrumb: false,
         },
       },
-    ],
-  },
-  {
-    path: '/comprehensive',
-    component: () => import('@/layouts/workBenchLayouts.vue'),
-    redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-business-system',
-    },
-    children: [
       {
         path: 'approve',
         name: 'Approve',
@@ -78,6 +67,16 @@
           title: '审批提醒',
           sidebar: true,
           breadcrumb: true,
+        },
+      },
+      {
+        path: 'workList',
+        name: 'WorkList',
+        component: () => import('@/views/workbench/workList.vue'),
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          breadcrumb: true,
           // activeMenu: '/comprehensive',
         },
       },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index ab194c6..9dea24f 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -251,9 +251,15 @@
   })
   // ------------------------------------------------------------------------------
 })
+const go = () => {
+  window.open(`https://share.shanhaibi.com/64914aad87721/?token=${localStorage.token}`)
+}
 </script>
 
 <template>
+  <button @click="go">
+    跳转
+  </button>
   <app-container>
     <el-row :gutter="10">
       <el-col :span="8">
@@ -262,7 +268,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
-          path-url="/comprehensive/approve"
+          path-url="/workbench/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -298,6 +304,7 @@
         <bench-col
           icon="icon-backlog"
           title="工作提醒"
+          path-url="/workbench/workList"
           :height="blockHeight"
           :pagination="true"
           :query="workMessageListQuery"
diff --git a/src/views/workbench/noticeList.vue b/src/views/workbench/noticeList.vue
new file mode 100644
index 0000000..e20a565
--- /dev/null
+++ b/src/views/workbench/noticeList.vue
@@ -0,0 +1,279 @@
+<!-- 通知公告 -->
+<script lang="ts" setup>
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+// import tableHeader from './tableHeader.vue'
+import addNotice from './noteAdd.vue'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice-interface'
+import { printJSON } from '@/utils/printUtils'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
+  noticeTitle: '', // 标题
+  limit: 20,
+  offset: 1,
+}) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+    width: '180',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+    width: '150',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+    width: '200',
+  },
+] // 表格
+const list = ref([]) // 表格数据
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getNoticeList()
+}
+
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  noticeTime.value = ''
+  searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      exportExcel({
+        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+        name: '通知公告',
+        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+        sheetName: 'sheet1',
+      })
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+function printList() {
+  const selectIds = selectList.value.map((item: noticeType) => item.id)
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (selectIds.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '通知公告')
+  }
+  else if (selectIds.length > 0) {
+    const printList = list.value.filter((item: noticeType) => selectIds.includes(item.id))
+    printJSON(printList, properties, '通知公告')
+  }
+  else {
+    ElMessage('无可打印内容')
+  }
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2" />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="发布时间"
+        /> -->
+      </search-item>
+      <!-- <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template> -->
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" icon="icon-print" title="打印" @click="printList" />
+      </template>
+      <!-- 表格区域 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="140">
+            <template #default="{ row }">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+}
+</style>

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts
index 9d180ea..94ee81a 100644
--- a/src/router/modules/workbench.ts
+++ b/src/router/modules/workbench.ts
@@ -12,27 +12,32 @@
       title: '总工作台',
       icon: 'icon-workbench',
     },
-  },
-  {
-    path: '/comprehensive',
-    component: Layout,
-    // redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-zh',
-    },
     children: [
       {
+        path: 'bench',
+        name: 'Bench',
+        meta: {
+          title: '总工作台',
+          sidebar: true,
+          activeMenu: '/workbench',
+        },
+      },
+      {
         path: 'approve',
         name: 'Approve',
-        // component: () => import('@/views/business/board/depComprehensive/list.vue'),
         meta: {
           title: '审批提醒',
-          // auth: '/device/bench',
           sidebar: true,
-          // breadcrumb: true,
-          activeMenu: '/comprehensive',
+          activeMenu: '/workbench',
+        },
+      },
+      {
+        path: 'workList',
+        name: 'workList',
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          activeMenu: '/workbench',
         },
       },
     ],
diff --git a/src/router/routes.ts b/src/router/routes.ts
index fe03729..ed49855 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -43,6 +43,7 @@
 const systemRoutes: Route.recordRaw[] = [
   {
     path: '/workbench',
+    redirect: '/workbench/bench',
     component: () => import('@/layouts/workBenchLayouts.vue'),
     meta: {
       title: '总工作台',
@@ -50,7 +51,7 @@
     },
     children: [
       {
-        path: '',
+        path: 'bench',
         name: 'workbench',
         component: () => import('@/views/workbench.vue'),
         meta: {
@@ -58,18 +59,6 @@
           breadcrumb: false,
         },
       },
-    ],
-  },
-  {
-    path: '/comprehensive',
-    component: () => import('@/layouts/workBenchLayouts.vue'),
-    redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-business-system',
-    },
-    children: [
       {
         path: 'approve',
         name: 'Approve',
@@ -78,6 +67,16 @@
           title: '审批提醒',
           sidebar: true,
           breadcrumb: true,
+        },
+      },
+      {
+        path: 'workList',
+        name: 'WorkList',
+        component: () => import('@/views/workbench/workList.vue'),
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          breadcrumb: true,
           // activeMenu: '/comprehensive',
         },
       },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index ab194c6..9dea24f 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -251,9 +251,15 @@
   })
   // ------------------------------------------------------------------------------
 })
+const go = () => {
+  window.open(`https://share.shanhaibi.com/64914aad87721/?token=${localStorage.token}`)
+}
 </script>
 
 <template>
+  <button @click="go">
+    跳转
+  </button>
   <app-container>
     <el-row :gutter="10">
       <el-col :span="8">
@@ -262,7 +268,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
-          path-url="/comprehensive/approve"
+          path-url="/workbench/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -298,6 +304,7 @@
         <bench-col
           icon="icon-backlog"
           title="工作提醒"
+          path-url="/workbench/workList"
           :height="blockHeight"
           :pagination="true"
           :query="workMessageListQuery"
diff --git a/src/views/workbench/noticeList.vue b/src/views/workbench/noticeList.vue
new file mode 100644
index 0000000..e20a565
--- /dev/null
+++ b/src/views/workbench/noticeList.vue
@@ -0,0 +1,279 @@
+<!-- 通知公告 -->
+<script lang="ts" setup>
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+// import tableHeader from './tableHeader.vue'
+import addNotice from './noteAdd.vue'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice-interface'
+import { printJSON } from '@/utils/printUtils'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
+  noticeTitle: '', // 标题
+  limit: 20,
+  offset: 1,
+}) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+    width: '180',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+    width: '150',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+    width: '200',
+  },
+] // 表格
+const list = ref([]) // 表格数据
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getNoticeList()
+}
+
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  noticeTime.value = ''
+  searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      exportExcel({
+        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+        name: '通知公告',
+        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+        sheetName: 'sheet1',
+      })
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+function printList() {
+  const selectIds = selectList.value.map((item: noticeType) => item.id)
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (selectIds.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '通知公告')
+  }
+  else if (selectIds.length > 0) {
+    const printList = list.value.filter((item: noticeType) => selectIds.includes(item.id))
+    printJSON(printList, properties, '通知公告')
+  }
+  else {
+    ElMessage('无可打印内容')
+  }
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2" />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="发布时间"
+        /> -->
+      </search-item>
+      <!-- <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template> -->
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" icon="icon-print" title="打印" @click="printList" />
+      </template>
+      <!-- 表格区域 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="140">
+            <template #default="{ row }">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+}
+</style>
diff --git a/src/views/workbench/workList.vue b/src/views/workbench/workList.vue
new file mode 100644
index 0000000..66edfa3
--- /dev/null
+++ b/src/views/workbench/workList.vue
@@ -0,0 +1,214 @@
+<!-- 工作提醒列表页 -->
+<script name="WorkList" setup lang="ts">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import { number } from 'echarts'
+import type { IWorkMessageListQuery } from './workbench-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getWorkMessageList } from '@/api/workbench/workbench'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { formUrl } from '@/utils/scheduleDict'
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const messageSourceModuleList = ref<dictType[]>([]) // 是否加急
+const statusList = [
+  {
+    id: '1',
+    name: '已读',
+  },
+  {
+    id: '0',
+    name: '未读',
+  },
+]
+// 查询条件
+const listQuery: Ref<IWorkMessageListQuery> = ref({
+  endTime: '', // 消息提醒结束时间
+  messageSourceModule: '', // 来源模块（字典code）
+  messageType: '', // 消息提醒的业务类型（字典code）
+  remindDeptId: '', // 消息提醒的用户部门id
+  remindId: '', // 消息提醒的用户id
+  startTime: '', // 消息提醒开始时间
+  status: '', // 已读1未读0
+  offset: 1,
+  limit: 20,
+})
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+const list = ref([]) // 表格数据
+// 筛选时间段数据
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '主题', value: 'messageTitle', align: 'center' },
+  { text: '来源模块', value: 'messageSourceModuleName', align: 'center' },
+  // { text: '来源模块', value: 'messageContent', align: 'center' },
+  { text: '读取状态', value: 'statusName', align: 'center', width: '100' },
+])
+
+// 获取审批提醒列表页
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  const param = {
+    ...listQuery.value,
+    status: Number(listQuery.value.status),
+  }
+  getWorkMessageList(param).then((response) => {
+    list.value = response.data.rows.map((item: { statusName: string ; status: string }) => {
+      return {
+        ...item,
+        statusName: item.status == '1' ? '已读' : '未读',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(false)
+}
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+// 重置
+const reset = () => {
+  listQuery.value = {
+    endTime: '', // 消息提醒结束时间
+    messageSourceModule: '', // 来源模块（字典code）
+    messageType: '', // 消息提醒的业务类型（字典code）
+    remindDeptId: '', // 消息提醒的用户部门id
+    remindId: '', // 消息提醒的用户id
+    startTime: '', // 消息提醒开始时间
+    status: '', // 已读1未读0
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData(true)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 来源模块
+  getDictByCode('messageSourceModule').then((response) => {
+    messageSourceModuleList.value = response.data
+  })
+}
+
+// 跳转详情页
+const detail = (row: any) => {
+  $router.push({
+    path: formUrl[row.formId],
+    // path: '/contractManagement/list',
+    query: {
+      fromModule: 'workbench',
+    },
+  })
+  window.sessionStorage.setItem('workbenchId', row.id)
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取数据
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.messageSourceModule"
+          clearable
+          placeholder="来源模块"
+          size="default"
+        >
+          <el-option
+            v-for="item in messageSourceModuleList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.status"
+          placeholder="读取状态"
+        >
+          <el-option
+            v-for="item in statusList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="daterange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="90">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="detail(row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts
index 9d180ea..94ee81a 100644
--- a/src/router/modules/workbench.ts
+++ b/src/router/modules/workbench.ts
@@ -12,27 +12,32 @@
       title: '总工作台',
       icon: 'icon-workbench',
     },
-  },
-  {
-    path: '/comprehensive',
-    component: Layout,
-    // redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-zh',
-    },
     children: [
       {
+        path: 'bench',
+        name: 'Bench',
+        meta: {
+          title: '总工作台',
+          sidebar: true,
+          activeMenu: '/workbench',
+        },
+      },
+      {
         path: 'approve',
         name: 'Approve',
-        // component: () => import('@/views/business/board/depComprehensive/list.vue'),
         meta: {
           title: '审批提醒',
-          // auth: '/device/bench',
           sidebar: true,
-          // breadcrumb: true,
-          activeMenu: '/comprehensive',
+          activeMenu: '/workbench',
+        },
+      },
+      {
+        path: 'workList',
+        name: 'workList',
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          activeMenu: '/workbench',
         },
       },
     ],
diff --git a/src/router/routes.ts b/src/router/routes.ts
index fe03729..ed49855 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -43,6 +43,7 @@
 const systemRoutes: Route.recordRaw[] = [
   {
     path: '/workbench',
+    redirect: '/workbench/bench',
     component: () => import('@/layouts/workBenchLayouts.vue'),
     meta: {
       title: '总工作台',
@@ -50,7 +51,7 @@
     },
     children: [
       {
-        path: '',
+        path: 'bench',
         name: 'workbench',
         component: () => import('@/views/workbench.vue'),
         meta: {
@@ -58,18 +59,6 @@
           breadcrumb: false,
         },
       },
-    ],
-  },
-  {
-    path: '/comprehensive',
-    component: () => import('@/layouts/workBenchLayouts.vue'),
-    redirect: '/comprehensive/approve',
-    name: 'Comprehensive',
-    meta: {
-      title: '计量综合系统',
-      icon: 'icon-business-system',
-    },
-    children: [
       {
         path: 'approve',
         name: 'Approve',
@@ -78,6 +67,16 @@
           title: '审批提醒',
           sidebar: true,
           breadcrumb: true,
+        },
+      },
+      {
+        path: 'workList',
+        name: 'WorkList',
+        component: () => import('@/views/workbench/workList.vue'),
+        meta: {
+          title: '工作提醒',
+          sidebar: true,
+          breadcrumb: true,
           // activeMenu: '/comprehensive',
         },
       },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index ab194c6..9dea24f 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -251,9 +251,15 @@
   })
   // ------------------------------------------------------------------------------
 })
+const go = () => {
+  window.open(`https://share.shanhaibi.com/64914aad87721/?token=${localStorage.token}`)
+}
 </script>
 
 <template>
+  <button @click="go">
+    跳转
+  </button>
   <app-container>
     <el-row :gutter="10">
       <el-col :span="8">
@@ -262,7 +268,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
-          path-url="/comprehensive/approve"
+          path-url="/workbench/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -298,6 +304,7 @@
         <bench-col
           icon="icon-backlog"
           title="工作提醒"
+          path-url="/workbench/workList"
           :height="blockHeight"
           :pagination="true"
           :query="workMessageListQuery"
diff --git a/src/views/workbench/noticeList.vue b/src/views/workbench/noticeList.vue
new file mode 100644
index 0000000..e20a565
--- /dev/null
+++ b/src/views/workbench/noticeList.vue
@@ -0,0 +1,279 @@
+<!-- 通知公告 -->
+<script lang="ts" setup>
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+// import tableHeader from './tableHeader.vue'
+import addNotice from './noteAdd.vue'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice-interface'
+import { printJSON } from '@/utils/printUtils'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
+  noticeTitle: '', // 标题
+  limit: 20,
+  offset: 1,
+}) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+    width: '180',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+    width: '150',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+    width: '200',
+  },
+] // 表格
+const list = ref([]) // 表格数据
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getNoticeList()
+}
+
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  noticeTime.value = ''
+  searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getNoticeeApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      exportExcel({
+        json: res.data.rows.map((item: noticeType, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+        name: '通知公告',
+        titleArr: ['序号', '编号', '标题', '发布人', '内容描述', '发布时间'],
+        sheetName: 'sheet1',
+      })
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+function printList() {
+  const selectIds = selectList.value.map((item: noticeType) => item.id)
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (selectIds.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '通知公告')
+  }
+  else if (selectIds.length > 0) {
+    const printList = list.value.filter((item: noticeType) => selectIds.includes(item.id))
+    printJSON(printList, properties, '通知公告')
+  }
+  else {
+    ElMessage('无可打印内容')
+  }
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2" />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="发布时间"
+        /> -->
+      </search-item>
+      <!-- <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template> -->
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" icon="icon-print" title="打印" @click="printList" />
+      </template>
+      <!-- 表格区域 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="140">
+            <template #default="{ row }">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+}
+</style>
diff --git a/src/views/workbench/workList.vue b/src/views/workbench/workList.vue
new file mode 100644
index 0000000..66edfa3
--- /dev/null
+++ b/src/views/workbench/workList.vue
@@ -0,0 +1,214 @@
+<!-- 工作提醒列表页 -->
+<script name="WorkList" setup lang="ts">
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import { number } from 'echarts'
+import type { IWorkMessageListQuery } from './workbench-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getWorkMessageList } from '@/api/workbench/workbench'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import { formUrl } from '@/utils/scheduleDict'
+const $router = useRouter()
+const { proxy } = getCurrentInstance() as any
+const messageSourceModuleList = ref<dictType[]>([]) // 是否加急
+const statusList = [
+  {
+    id: '1',
+    name: '已读',
+  },
+  {
+    id: '0',
+    name: '未读',
+  },
+]
+// 查询条件
+const listQuery: Ref<IWorkMessageListQuery> = ref({
+  endTime: '', // 消息提醒结束时间
+  messageSourceModule: '', // 来源模块（字典code）
+  messageType: '', // 消息提醒的业务类型（字典code）
+  remindDeptId: '', // 消息提醒的用户部门id
+  remindId: '', // 消息提醒的用户id
+  startTime: '', // 消息提醒开始时间
+  status: '', // 已读1未读0
+  offset: 1,
+  limit: 20,
+})
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+const list = ref([]) // 表格数据
+// 筛选时间段数据
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '主题', value: 'messageTitle', align: 'center' },
+  { text: '来源模块', value: 'messageSourceModuleName', align: 'center' },
+  // { text: '来源模块', value: 'messageContent', align: 'center' },
+  { text: '读取状态', value: 'statusName', align: 'center', width: '100' },
+])
+
+// 获取审批提醒列表页
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  const param = {
+    ...listQuery.value,
+    status: Number(listQuery.value.status),
+  }
+  getWorkMessageList(param).then((response) => {
+    list.value = response.data.rows.map((item: { statusName: string ; status: string }) => {
+      return {
+        ...item,
+        statusName: item.status == '1' ? '已读' : '未读',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(false)
+}
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+// 重置
+const reset = () => {
+  listQuery.value = {
+    endTime: '', // 消息提醒结束时间
+    messageSourceModule: '', // 来源模块（字典code）
+    messageType: '', // 消息提醒的业务类型（字典code）
+    remindDeptId: '', // 消息提醒的用户部门id
+    remindId: '', // 消息提醒的用户id
+    startTime: '', // 消息提醒开始时间
+    status: '', // 已读1未读0
+    offset: 1,
+    limit: 20,
+  }
+  dateRange.value = ['', '']
+  fetchData(true)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 来源模块
+  getDictByCode('messageSourceModule').then((response) => {
+    messageSourceModuleList.value = response.data
+  })
+}
+
+// 跳转详情页
+const detail = (row: any) => {
+  $router.push({
+    path: formUrl[row.formId],
+    // path: '/contractManagement/list',
+    query: {
+      fromModule: 'workbench',
+    },
+  })
+  window.sessionStorage.setItem('workbenchId', row.id)
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取数据
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.messageSourceModule"
+          clearable
+          placeholder="来源模块"
+          size="default"
+        >
+          <el-option
+            v-for="item in messageSourceModuleList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.status"
+          placeholder="读取状态"
+        >
+          <el-option
+            v-for="item in statusList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="daterange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="90">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="detail(row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
diff --git "a/\350\256\241\351\207\21720230620.zip" "b/\350\256\241\351\207\21720230620.zip"
new file mode 100644
index 0000000..65fe8e2
--- /dev/null
+++ "b/\350\256\241\351\207\21720230620.zip"
Binary files differ