diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 004b856..c47b32d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -222,8 +222,6 @@
 }
 // 驳回后编辑
 function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
-  console.log('999', row.processId)
-
   $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
 }
 
@@ -279,7 +277,7 @@
       break
   }
 }
-
+const $route = useRoute()
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 004b856..c47b32d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -222,8 +222,6 @@
 }
 // 驳回后编辑
 function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
-  console.log('999', row.processId)
-
   $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
 }
 
@@ -279,7 +277,7 @@
       break
   }
 }
-
+const $route = useRoute()
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index efb8c2a..d262217 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -27,6 +27,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 20
 })
+const $route = useRoute()
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
@@ -353,6 +354,9 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
+  if ($route.query.fromModule === 'workbench') {
+    listQuery.value.approvalStatus = '2' // 待审批
+  }
   fetchData(true)
 })
 </script>

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 004b856..c47b32d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -222,8 +222,6 @@
 }
 // 驳回后编辑
 function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
-  console.log('999', row.processId)
-
   $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
 }
 
@@ -279,7 +277,7 @@
       break
   }
 }
-
+const $route = useRoute()
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index efb8c2a..d262217 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -27,6 +27,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 20
 })
+const $route = useRoute()
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
@@ -353,6 +354,9 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
+  if ($route.query.fromModule === 'workbench') {
+    listQuery.value.approvalStatus = '2' // 待审批
+  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index a63b6fb..ab194c6 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -9,9 +9,10 @@
 import type { Ref } from 'vue'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getNoticeeApi } from '@/api/system/notice'
 import editScheduleDialog from '@/views/workbench/editSchedule.vue'
-import { getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
+import { delSchedule, getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IApprovalMessageListQuery, IWorkMessageListQuery } from '@/views/workbench/workbench-interface'
 import useUserStore from '@/store/modules/user'
@@ -74,8 +75,8 @@
   fetchApprovalMessageData(true)
 }
 // --------------------------------------工作提醒-------------------------------------------
-const workMessageList = ref([]) // 审批提醒列表
-const workMessageTotal = ref(0) // 审批提醒列表数据总量
+const workMessageList = ref([]) // 工作提醒列表
+const workMessageTotal = ref(0) // 工作提醒列表数据总量
 const workMessageListQuery: Ref<IWorkMessageListQuery> = ref({
   endTime: '', // 消息提醒结束时间
   messageSourceModule: '', // 来源模块（字典code）
@@ -122,8 +123,9 @@
 // -----------------------------------日历--------------------------------------------
 const calendarValue = ref(new Date())
 const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
 const editScheduleRef = ref() // 编辑日程ref
-const redCircleData = ref()
+const redCircleData = ref() // 日程列表
 // 点击编辑日程
 const editSchedule = () => {
   editScheduleRef.value.initDialog()
@@ -135,25 +137,50 @@
     calendarMonth: selectedDate.value,
   }
   getCalendarList(param).then((res) => {
-    console.log(res.data)
     redCircleData.value = res.data
-    console.log('ppredCircleData.value')
-
-    console.log(redCircleData.value)
   })
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day)
-  selectedDate.value = day
-  // selectedDate.value = day.slice(0, 7)
-
-  // fetchCalendarList() // 获取日历列表
-}
-watch(selectedDate, (value) => {
-  selectedDate.value = value.slice(0, 7)
+  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 noticeList = ref([]) // 审批提醒列表
 const noticeTotal = ref(0) // 审批提醒列表数据总量
@@ -189,10 +216,40 @@
 onMounted(() => {
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
+  selectDateRecord.value = dayjs().format('YYYY-MM-DD')
   fetchApprovalMessageData() // 审批提醒
   fetchWorkMessageData() // 工作提醒
   fetchNoticeList() // 获取通知公告列表
   fetchCalendarList() // 获取日历列表
+
+  // -------------------监听日历三个按钮操作（上个月、今天、下个月）------------------
+  // 点击上个月
+  const prevBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(1)',
+  )
+  prevBtn!.addEventListener('click', (e) => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击下一个月
+  const nextBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(3)',
+  )
+  nextBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击今天
+  const todayBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(2)',
+  )
+  todayBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+  // ------------------------------------------------------------------------------
 })
 </script>
 
@@ -205,6 +262,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
+          path-url="/comprehensive/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -276,6 +334,7 @@
           style="margin-top: 10px;"
           icon="icon-notice"
           title="通知公告"
+          path-url="/notice/list"
           :height="blockHeight"
         >
           <el-table
@@ -313,10 +372,11 @@
           :is-edit="true"
           :is-show-delete="true"
           @edit-data="editSchedule"
+          @delete-data="deleteData"
         >
           <el-calendar v-model="calendarValue">
             <template #dateCell="{ data }">
-              <div style="width: 100%;" @click="clickDate(data.day)">
+              <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
                 <span>
                   {{ data.day.split("-").slice(2).join() }}
                 </span>
@@ -335,12 +395,15 @@
                     </li>
                   </div>
                   <template #reference>
-                    <div style="width: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <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: -12px;">
-                        <span v-if="key === data.day" class="redCircle" />
+                      <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>
@@ -352,7 +415,7 @@
       </el-col>
     </el-row>
     <!-- 编辑日程组件 -->
-    <edit-schedule-dialog ref="editScheduleRef" />
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
   </app-container>
 </template>
 
@@ -367,7 +430,7 @@
   height: 4px;
   background-color: #f56c6c;
   border-radius: 10px;
-  margin-top: 8px;
+  margin-top: -60px;
 }
 
 .calendar-li-item {
@@ -382,4 +445,8 @@
   max-height: 300px;
   overflow-y: auto;
 }
+
+.el-calendar-table .el-calendar-day {
+  padding: 0;
+}
 </style>

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 004b856..c47b32d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -222,8 +222,6 @@
 }
 // 驳回后编辑
 function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
-  console.log('999', row.processId)
-
   $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
 }
 
@@ -279,7 +277,7 @@
       break
   }
 }
-
+const $route = useRoute()
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index efb8c2a..d262217 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -27,6 +27,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 20
 })
+const $route = useRoute()
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
@@ -353,6 +354,9 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
+  if ($route.query.fromModule === 'workbench') {
+    listQuery.value.approvalStatus = '2' // 待审批
+  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index a63b6fb..ab194c6 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -9,9 +9,10 @@
 import type { Ref } from 'vue'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getNoticeeApi } from '@/api/system/notice'
 import editScheduleDialog from '@/views/workbench/editSchedule.vue'
-import { getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
+import { delSchedule, getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IApprovalMessageListQuery, IWorkMessageListQuery } from '@/views/workbench/workbench-interface'
 import useUserStore from '@/store/modules/user'
@@ -74,8 +75,8 @@
   fetchApprovalMessageData(true)
 }
 // --------------------------------------工作提醒-------------------------------------------
-const workMessageList = ref([]) // 审批提醒列表
-const workMessageTotal = ref(0) // 审批提醒列表数据总量
+const workMessageList = ref([]) // 工作提醒列表
+const workMessageTotal = ref(0) // 工作提醒列表数据总量
 const workMessageListQuery: Ref<IWorkMessageListQuery> = ref({
   endTime: '', // 消息提醒结束时间
   messageSourceModule: '', // 来源模块（字典code）
@@ -122,8 +123,9 @@
 // -----------------------------------日历--------------------------------------------
 const calendarValue = ref(new Date())
 const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
 const editScheduleRef = ref() // 编辑日程ref
-const redCircleData = ref()
+const redCircleData = ref() // 日程列表
 // 点击编辑日程
 const editSchedule = () => {
   editScheduleRef.value.initDialog()
@@ -135,25 +137,50 @@
     calendarMonth: selectedDate.value,
   }
   getCalendarList(param).then((res) => {
-    console.log(res.data)
     redCircleData.value = res.data
-    console.log('ppredCircleData.value')
-
-    console.log(redCircleData.value)
   })
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day)
-  selectedDate.value = day
-  // selectedDate.value = day.slice(0, 7)
-
-  // fetchCalendarList() // 获取日历列表
-}
-watch(selectedDate, (value) => {
-  selectedDate.value = value.slice(0, 7)
+  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 noticeList = ref([]) // 审批提醒列表
 const noticeTotal = ref(0) // 审批提醒列表数据总量
@@ -189,10 +216,40 @@
 onMounted(() => {
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
+  selectDateRecord.value = dayjs().format('YYYY-MM-DD')
   fetchApprovalMessageData() // 审批提醒
   fetchWorkMessageData() // 工作提醒
   fetchNoticeList() // 获取通知公告列表
   fetchCalendarList() // 获取日历列表
+
+  // -------------------监听日历三个按钮操作（上个月、今天、下个月）------------------
+  // 点击上个月
+  const prevBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(1)',
+  )
+  prevBtn!.addEventListener('click', (e) => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击下一个月
+  const nextBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(3)',
+  )
+  nextBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击今天
+  const todayBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(2)',
+  )
+  todayBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+  // ------------------------------------------------------------------------------
 })
 </script>
 
@@ -205,6 +262,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
+          path-url="/comprehensive/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -276,6 +334,7 @@
           style="margin-top: 10px;"
           icon="icon-notice"
           title="通知公告"
+          path-url="/notice/list"
           :height="blockHeight"
         >
           <el-table
@@ -313,10 +372,11 @@
           :is-edit="true"
           :is-show-delete="true"
           @edit-data="editSchedule"
+          @delete-data="deleteData"
         >
           <el-calendar v-model="calendarValue">
             <template #dateCell="{ data }">
-              <div style="width: 100%;" @click="clickDate(data.day)">
+              <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
                 <span>
                   {{ data.day.split("-").slice(2).join() }}
                 </span>
@@ -335,12 +395,15 @@
                     </li>
                   </div>
                   <template #reference>
-                    <div style="width: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <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: -12px;">
-                        <span v-if="key === data.day" class="redCircle" />
+                      <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>
@@ -352,7 +415,7 @@
       </el-col>
     </el-row>
     <!-- 编辑日程组件 -->
-    <edit-schedule-dialog ref="editScheduleRef" />
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
   </app-container>
 </template>
 
@@ -367,7 +430,7 @@
   height: 4px;
   background-color: #f56c6c;
   border-radius: 10px;
-  margin-top: 8px;
+  margin-top: -60px;
 }
 
 .calendar-li-item {
@@ -382,4 +445,8 @@
   max-height: 300px;
   overflow-y: auto;
 }
+
+.el-calendar-table .el-calendar-day {
+  padding: 0;
+}
 </style>
diff --git a/src/views/workbench/approve/approve-interface.ts b/src/views/workbench/approve/approve-interface.ts
new file mode 100644
index 0000000..84167ef
--- /dev/null
+++ b/src/views/workbench/approve/approve-interface.ts
@@ -0,0 +1,3 @@
+export interface IListQuery {
+
+}

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 004b856..c47b32d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -222,8 +222,6 @@
 }
 // 驳回后编辑
 function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
-  console.log('999', row.processId)
-
   $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
 }
 
@@ -279,7 +277,7 @@
       break
   }
 }
-
+const $route = useRoute()
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index efb8c2a..d262217 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -27,6 +27,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 20
 })
+const $route = useRoute()
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
@@ -353,6 +354,9 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
+  if ($route.query.fromModule === 'workbench') {
+    listQuery.value.approvalStatus = '2' // 待审批
+  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index a63b6fb..ab194c6 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -9,9 +9,10 @@
 import type { Ref } from 'vue'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getNoticeeApi } from '@/api/system/notice'
 import editScheduleDialog from '@/views/workbench/editSchedule.vue'
-import { getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
+import { delSchedule, getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IApprovalMessageListQuery, IWorkMessageListQuery } from '@/views/workbench/workbench-interface'
 import useUserStore from '@/store/modules/user'
@@ -74,8 +75,8 @@
   fetchApprovalMessageData(true)
 }
 // --------------------------------------工作提醒-------------------------------------------
-const workMessageList = ref([]) // 审批提醒列表
-const workMessageTotal = ref(0) // 审批提醒列表数据总量
+const workMessageList = ref([]) // 工作提醒列表
+const workMessageTotal = ref(0) // 工作提醒列表数据总量
 const workMessageListQuery: Ref<IWorkMessageListQuery> = ref({
   endTime: '', // 消息提醒结束时间
   messageSourceModule: '', // 来源模块（字典code）
@@ -122,8 +123,9 @@
 // -----------------------------------日历--------------------------------------------
 const calendarValue = ref(new Date())
 const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
 const editScheduleRef = ref() // 编辑日程ref
-const redCircleData = ref()
+const redCircleData = ref() // 日程列表
 // 点击编辑日程
 const editSchedule = () => {
   editScheduleRef.value.initDialog()
@@ -135,25 +137,50 @@
     calendarMonth: selectedDate.value,
   }
   getCalendarList(param).then((res) => {
-    console.log(res.data)
     redCircleData.value = res.data
-    console.log('ppredCircleData.value')
-
-    console.log(redCircleData.value)
   })
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day)
-  selectedDate.value = day
-  // selectedDate.value = day.slice(0, 7)
-
-  // fetchCalendarList() // 获取日历列表
-}
-watch(selectedDate, (value) => {
-  selectedDate.value = value.slice(0, 7)
+  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 noticeList = ref([]) // 审批提醒列表
 const noticeTotal = ref(0) // 审批提醒列表数据总量
@@ -189,10 +216,40 @@
 onMounted(() => {
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
+  selectDateRecord.value = dayjs().format('YYYY-MM-DD')
   fetchApprovalMessageData() // 审批提醒
   fetchWorkMessageData() // 工作提醒
   fetchNoticeList() // 获取通知公告列表
   fetchCalendarList() // 获取日历列表
+
+  // -------------------监听日历三个按钮操作（上个月、今天、下个月）------------------
+  // 点击上个月
+  const prevBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(1)',
+  )
+  prevBtn!.addEventListener('click', (e) => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击下一个月
+  const nextBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(3)',
+  )
+  nextBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击今天
+  const todayBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(2)',
+  )
+  todayBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+  // ------------------------------------------------------------------------------
 })
 </script>
 
@@ -205,6 +262,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
+          path-url="/comprehensive/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -276,6 +334,7 @@
           style="margin-top: 10px;"
           icon="icon-notice"
           title="通知公告"
+          path-url="/notice/list"
           :height="blockHeight"
         >
           <el-table
@@ -313,10 +372,11 @@
           :is-edit="true"
           :is-show-delete="true"
           @edit-data="editSchedule"
+          @delete-data="deleteData"
         >
           <el-calendar v-model="calendarValue">
             <template #dateCell="{ data }">
-              <div style="width: 100%;" @click="clickDate(data.day)">
+              <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
                 <span>
                   {{ data.day.split("-").slice(2).join() }}
                 </span>
@@ -335,12 +395,15 @@
                     </li>
                   </div>
                   <template #reference>
-                    <div style="width: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <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: -12px;">
-                        <span v-if="key === data.day" class="redCircle" />
+                      <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>
@@ -352,7 +415,7 @@
       </el-col>
     </el-row>
     <!-- 编辑日程组件 -->
-    <edit-schedule-dialog ref="editScheduleRef" />
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
   </app-container>
 </template>
 
@@ -367,7 +430,7 @@
   height: 4px;
   background-color: #f56c6c;
   border-radius: 10px;
-  margin-top: 8px;
+  margin-top: -60px;
 }
 
 .calendar-li-item {
@@ -382,4 +445,8 @@
   max-height: 300px;
   overflow-y: auto;
 }
+
+.el-calendar-table .el-calendar-day {
+  padding: 0;
+}
 </style>
diff --git a/src/views/workbench/approve/approve-interface.ts b/src/views/workbench/approve/approve-interface.ts
new file mode 100644
index 0000000..84167ef
--- /dev/null
+++ b/src/views/workbench/approve/approve-interface.ts
@@ -0,0 +1,3 @@
+export interface IListQuery {
+
+}
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index ad022d8..d2dca61 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -1,7 +1,207 @@
+<!-- 审批提醒列表页 -->
 <script name="WorkBenchApprove" 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 { IApprovalMessageListQuery } from '../workbench-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getApprovalMessageList } 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<IApprovalMessageListQuery> = ref({
+  endTime: '', // 通知结束时间
+  messageSourceModule: '', // 来源模块（字典code）
+  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),
+  }
+  getApprovalMessageList(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）
+    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',
+    },
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取数据
+})
 </script>
 
 <template>
-  <div>审批提醒</div>
+  <!-- 布局 -->
+  <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/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 004b856..c47b32d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -222,8 +222,6 @@
 }
 // 驳回后编辑
 function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
-  console.log('999', row.processId)
-
   $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
 }
 
@@ -279,7 +277,7 @@
       break
   }
 }
-
+const $route = useRoute()
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index efb8c2a..d262217 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -27,6 +27,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 20
 })
+const $route = useRoute()
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
@@ -353,6 +354,9 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
+  if ($route.query.fromModule === 'workbench') {
+    listQuery.value.approvalStatus = '2' // 待审批
+  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index a63b6fb..ab194c6 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -9,9 +9,10 @@
 import type { Ref } from 'vue'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getNoticeeApi } from '@/api/system/notice'
 import editScheduleDialog from '@/views/workbench/editSchedule.vue'
-import { getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
+import { delSchedule, getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IApprovalMessageListQuery, IWorkMessageListQuery } from '@/views/workbench/workbench-interface'
 import useUserStore from '@/store/modules/user'
@@ -74,8 +75,8 @@
   fetchApprovalMessageData(true)
 }
 // --------------------------------------工作提醒-------------------------------------------
-const workMessageList = ref([]) // 审批提醒列表
-const workMessageTotal = ref(0) // 审批提醒列表数据总量
+const workMessageList = ref([]) // 工作提醒列表
+const workMessageTotal = ref(0) // 工作提醒列表数据总量
 const workMessageListQuery: Ref<IWorkMessageListQuery> = ref({
   endTime: '', // 消息提醒结束时间
   messageSourceModule: '', // 来源模块（字典code）
@@ -122,8 +123,9 @@
 // -----------------------------------日历--------------------------------------------
 const calendarValue = ref(new Date())
 const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
 const editScheduleRef = ref() // 编辑日程ref
-const redCircleData = ref()
+const redCircleData = ref() // 日程列表
 // 点击编辑日程
 const editSchedule = () => {
   editScheduleRef.value.initDialog()
@@ -135,25 +137,50 @@
     calendarMonth: selectedDate.value,
   }
   getCalendarList(param).then((res) => {
-    console.log(res.data)
     redCircleData.value = res.data
-    console.log('ppredCircleData.value')
-
-    console.log(redCircleData.value)
   })
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day)
-  selectedDate.value = day
-  // selectedDate.value = day.slice(0, 7)
-
-  // fetchCalendarList() // 获取日历列表
-}
-watch(selectedDate, (value) => {
-  selectedDate.value = value.slice(0, 7)
+  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 noticeList = ref([]) // 审批提醒列表
 const noticeTotal = ref(0) // 审批提醒列表数据总量
@@ -189,10 +216,40 @@
 onMounted(() => {
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
+  selectDateRecord.value = dayjs().format('YYYY-MM-DD')
   fetchApprovalMessageData() // 审批提醒
   fetchWorkMessageData() // 工作提醒
   fetchNoticeList() // 获取通知公告列表
   fetchCalendarList() // 获取日历列表
+
+  // -------------------监听日历三个按钮操作（上个月、今天、下个月）------------------
+  // 点击上个月
+  const prevBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(1)',
+  )
+  prevBtn!.addEventListener('click', (e) => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击下一个月
+  const nextBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(3)',
+  )
+  nextBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击今天
+  const todayBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(2)',
+  )
+  todayBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+  // ------------------------------------------------------------------------------
 })
 </script>
 
@@ -205,6 +262,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
+          path-url="/comprehensive/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -276,6 +334,7 @@
           style="margin-top: 10px;"
           icon="icon-notice"
           title="通知公告"
+          path-url="/notice/list"
           :height="blockHeight"
         >
           <el-table
@@ -313,10 +372,11 @@
           :is-edit="true"
           :is-show-delete="true"
           @edit-data="editSchedule"
+          @delete-data="deleteData"
         >
           <el-calendar v-model="calendarValue">
             <template #dateCell="{ data }">
-              <div style="width: 100%;" @click="clickDate(data.day)">
+              <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
                 <span>
                   {{ data.day.split("-").slice(2).join() }}
                 </span>
@@ -335,12 +395,15 @@
                     </li>
                   </div>
                   <template #reference>
-                    <div style="width: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <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: -12px;">
-                        <span v-if="key === data.day" class="redCircle" />
+                      <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>
@@ -352,7 +415,7 @@
       </el-col>
     </el-row>
     <!-- 编辑日程组件 -->
-    <edit-schedule-dialog ref="editScheduleRef" />
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
   </app-container>
 </template>
 
@@ -367,7 +430,7 @@
   height: 4px;
   background-color: #f56c6c;
   border-radius: 10px;
-  margin-top: 8px;
+  margin-top: -60px;
 }
 
 .calendar-li-item {
@@ -382,4 +445,8 @@
   max-height: 300px;
   overflow-y: auto;
 }
+
+.el-calendar-table .el-calendar-day {
+  padding: 0;
+}
 </style>
diff --git a/src/views/workbench/approve/approve-interface.ts b/src/views/workbench/approve/approve-interface.ts
new file mode 100644
index 0000000..84167ef
--- /dev/null
+++ b/src/views/workbench/approve/approve-interface.ts
@@ -0,0 +1,3 @@
+export interface IListQuery {
+
+}
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index ad022d8..d2dca61 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -1,7 +1,207 @@
+<!-- 审批提醒列表页 -->
 <script name="WorkBenchApprove" 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 { IApprovalMessageListQuery } from '../workbench-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getApprovalMessageList } 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<IApprovalMessageListQuery> = ref({
+  endTime: '', // 通知结束时间
+  messageSourceModule: '', // 来源模块（字典code）
+  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),
+  }
+  getApprovalMessageList(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）
+    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',
+    },
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取数据
+})
 </script>
 
 <template>
-  <div>审批提醒</div>
+  <!-- 布局 -->
+  <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/src/views/workbench/editSchedule.vue b/src/views/workbench/editSchedule.vue
index b50f98f..0ee9f8a 100644
--- a/src/views/workbench/editSchedule.vue
+++ b/src/views/workbench/editSchedule.vue
@@ -6,6 +6,7 @@
 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组件
@@ -57,12 +58,14 @@
         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')
         })
       }
     }
@@ -93,20 +96,20 @@
   }
   getCalendarList(param).then((res) => {
     const response = res.data
-    for (const key in response) {
-      console.log(key, '---', form.value.date)
+    if (response[form.value.date].length) { // 选择的日期有日程
+      // for (const key in response) {
+      type.value = 'edit'
+      // console.log(response[key])
 
-      if (key === form.value.date) {
-        type.value = 'edit'
-        list.value = response[key]
-      }
-      else {
-        type.value = 'add'
-        list.value = [{
-          scheduleMatters: '', // 日程
-          id: '',
-        }]
-      }
+      list.value = response[form.value.date]
+      // }
+    }
+    else { // 选择的日期没有日程
+      type.value = 'add'
+      list.value = [{
+        scheduleMatters: '', // 日程
+        id: '',
+      }]
     }
   })
 }
@@ -136,7 +139,6 @@
       })
     })
 }
-
 watch(() => form.value.date, (newVal) => {
   const date = dayjs(new Date(newVal)).format('YYYY-MM')
   fetchCalendarList(date)
@@ -183,9 +185,9 @@
       <el-button @click="cancle">
         取消
       </el-button>
-      <el-button type="danger" @click="delAll">
+      <!-- <el-button type="danger" @click="delAll">
         删除所有日程
-      </el-button>
+      </el-button> -->
     </template>
   </el-dialog>
 </template>

diff --git a/src/assets/icons/icon-goWorkbench.svg b/src/assets/icons/icon-goWorkbench.svg
new file mode 100644
index 0000000..3c6605f
--- /dev/null
+++ b/src/assets/icons/icon-goWorkbench.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687144291361" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9857" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M348.587642 598.144132a163.271961 163.271961 0 1 0 163.271961-163.271961 163.271961 163.271961 0 0 0-163.271961 163.271961zM593.921511 35.778708l391.852707 326.543922A111.521848 111.521848 0 0 1 1015.873049 438.847489v472.991772a112.089751 112.089751 0 0 1-112.089751 112.160739H120.006896A112.160739 112.160739 0 0 1 7.846158 911.839261V438.776501A111.876787 111.876787 0 0 1 37.874001 362.32263l391.852707-326.543922a112.160739 112.160739 0 0 1 158.515778-5.750013c1.987659 1.845683 3.90433 3.762354 5.679025 5.750013z"  p-id="9858"></path></svg>
diff --git a/src/components/benchCol/index.vue b/src/components/benchCol/index.vue
index 41b9f64..aaf49ec 100644
--- a/src/components/benchCol/index.vue
+++ b/src/components/benchCol/index.vue
@@ -55,6 +55,11 @@
     type: Boolean,
     default: false,
   },
+  // 是否显示删除
+  isShowDelete: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['change', 'editData', 'deleteData'])
 
@@ -87,8 +92,14 @@
         {{ 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">
+      <!-- <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` }">
@@ -149,6 +160,11 @@
       cursor: pointer;
     }
 
+    .delete-icon {
+      color: red;
+      cursor: pointer;
+    }
+
     .title {
       color: #000;
       font-size: 16px;
diff --git a/src/layouts/components/Header/index.vue b/src/layouts/components/Header/index.vue
index 6125aa5..5e1204f 100644
--- a/src/layouts/components/Header/index.vue
+++ b/src/layouts/components/Header/index.vue
@@ -5,7 +5,6 @@
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import headerImage from '@/assets/images/header-image.png'
-
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
@@ -26,7 +25,7 @@
     <header v-if="settingsStore.mode === 'pc' && (settingsStore.menu.menuMode === 'head' || settingsStore.menu.menuMode === 'top')">
       <div class="header-container">
         <div class="main">
-          <logo :show-logo="settingsStore.app.enableLogo" />
+          <logo :show-logo="settingsStore.app.enableLogo" title="计量业务系统" />
           <!-- 混合模式-主导航 -->
           <div v-if="settingsStore.menu.menuMode === 'head'" ref="navRef" class="nav" @wheel.prevent="handlerMouserScroll">
             <template v-for="(item, index) in menuStore.allMenus" :key="index">
@@ -45,7 +44,7 @@
             <top-menu />
           </div>
         </div>
-        <tools />
+        <tools :ishidden-back-to-workbench="true" />
       </div>
       <el-image :src="headerImage" fit="cover" style="position: absolute;width: 100%;height: 100%;z-index: -1;" />
     </header>
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 861979e..778d711 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -7,8 +7,14 @@
 import useUserStore from '@/store/modules/user'
 import useWebsocketStore from '@/store/modules/websocket'
 import { formUrl } from '@/utils/scheduleDict'
+const props = defineProps({
+  // 是否显示回到总工作台图标
+  ishiddenBackToWorkbench: {
+    type: Boolean,
+    default: false,
+  },
+})
 const router = useRouter()
-
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()
 
@@ -118,16 +124,28 @@
   // 消息列表清除对应消息
   websocket.clearAppointMessage(message)
 }
+
+// 返回总工作台
+const goWorkbench = () => {
+  router.push({ path: '/workbench' })
+}
 </script>
 
 <template>
   <div class="tools">
     <div class="buttons">
+      <!-- 返回总工作台 -->
+      <span v-if="settingsStore.mode === 'pc' && props.ishiddenBackToWorkbench" class="item" @click="goWorkbench">
+        <el-icon>
+          <svg-icon name="icon-goWorkbench" />
+        </el-icon>
+      </span>
       <span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
         <el-icon>
           <svg-icon name="ep:search" />
         </el-icon>
       </span>
+      <!-- 全屏 -->
       <span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
         <el-icon>
           <svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 4cac7f6..862a2ee 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -60,3 +60,4 @@
   [SCHEDULE.BUSINESS_FIELDTEST_APPROVE]: '/fieldTest/approve', // 现场检测审批,
   [SCHEDULE.BUSINESS_FINANCE_CONTRACT_APPROVE]: '/contractManagement/list', // 合同审批,
 }
+
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 85811c1..09ccf9e 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -381,6 +381,7 @@
     })
   }
 }
+const $route = useRoute()
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
   if (window.sessionStorage.getItem('borrowButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('borrowButtonBoxActive') !== '' && window.sessionStorage.getItem('borrowButtonBoxActive') !== null) {
@@ -390,6 +391,10 @@
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
     activeTitle.value === '全部'
   }
+  if ($route.query.fromModule === 'workbench') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+    activeTitle.value === '待审批'
+  }
   nextTick(() => {
     fetchData(true) // 获取表格数据
     fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..cbc7ac0 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -99,7 +99,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..956baa7 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -92,7 +92,12 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+  }
+  else {
+    currentTab.value = window.sessionStorage.getItem('maintenceListMenu') || '全部'
+  }
   currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index ef90dd5..c66b8d9 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -25,7 +25,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
@@ -352,6 +352,10 @@
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
+    if ($route.query.fromModule === 'workbench') {
+      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
+      activeTitle.value === '待审批'
+    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 80c43cb..2596161 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -20,6 +20,8 @@
   name: string
   comp: any
 }
+const $route = useRoute()
+
 const menu = ref<menuType[]>([
   { name: '全部', comp: All },
   { name: '草稿箱', comp: DraftBox },
@@ -47,8 +49,13 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+  }
 })
 </script>
 
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
index 2d07167..fd1f848 100644
--- a/src/views/device/stateManage/components/templatePage.vue
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -60,6 +60,8 @@
   immediate: true,
   deep: true,
 })
+const $route = useRoute()
+
 onUnmounted(() => {
   sessionStorage.setItem(`${props.authority}Menu`, current.value)
 })
@@ -67,7 +69,12 @@
   await getDictByCode('approvalStatus').then((res) => {
     statusList.value = (res.data as menuType[])
   })
-  current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    current.value = '待审批'
+  }
+  else {
+    current.value = sessionStorage.getItem(`${props.authority}Menu`) || '全部'
+  }
   if (statusList.value.length > 0) {
     type.value = statusList.value.filter(item => item.name === current.value)[0].value || ''
   }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 5f8eb4e..58bf048 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -294,7 +294,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
+const $route = useRoute()
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(TabActiveButton)) {
@@ -303,6 +303,13 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
+  console.log('pppp=================================ppp')
+
+  console.log($router.options.history.state.back)
+
+  if ($router.options.history.state.back === '/comprehensive/approve') {
+    active.value = menu.value.find(item => item.name === '待审批')!.id as string // 全部
+  }
 })
 </script>
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 3163799..5c6031d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -29,6 +29,7 @@
   // },
 })
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const $router = useRouter()
 const approvalStatus = ref('0')
 // 审批状态字典
@@ -329,6 +330,9 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
+  if ($route.query.fromModule === 'workbench') {
+    approvalStatus.value = '2' // 待审批
+  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 22d1d8a..112e512 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -93,7 +93,13 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  if ($route.query.fromModule === 'workbench') {
+    currentTab.value = '待审批'
+    // sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+  }
+  else {
+    currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  }
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 004b856..c47b32d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -222,8 +222,6 @@
 }
 // 驳回后编辑
 function editAgain(row: Omit<ISupplier, 'traceSupplierPersonList'>) {
-  console.log('999', row.processId)
-
   $router.push(`/source/edit/${row.id}/${row.processId}?from=reject`)
 }
 
@@ -279,7 +277,7 @@
       break
   }
 }
-
+const $route = useRoute()
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index efb8c2a..d262217 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -27,6 +27,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 20
 })
+const $route = useRoute()
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
@@ -353,6 +354,9 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
+  if ($route.query.fromModule === 'workbench') {
+    listQuery.value.approvalStatus = '2' // 待审批
+  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index a63b6fb..ab194c6 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -9,9 +9,10 @@
 import type { Ref } from 'vue'
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { getNoticeeApi } from '@/api/system/notice'
 import editScheduleDialog from '@/views/workbench/editSchedule.vue'
-import { getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
+import { delSchedule, getApprovalMessageList, getCalendarList, getWorkMessageList } from '@/api/workbench/workbench'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IApprovalMessageListQuery, IWorkMessageListQuery } from '@/views/workbench/workbench-interface'
 import useUserStore from '@/store/modules/user'
@@ -74,8 +75,8 @@
   fetchApprovalMessageData(true)
 }
 // --------------------------------------工作提醒-------------------------------------------
-const workMessageList = ref([]) // 审批提醒列表
-const workMessageTotal = ref(0) // 审批提醒列表数据总量
+const workMessageList = ref([]) // 工作提醒列表
+const workMessageTotal = ref(0) // 工作提醒列表数据总量
 const workMessageListQuery: Ref<IWorkMessageListQuery> = ref({
   endTime: '', // 消息提醒结束时间
   messageSourceModule: '', // 来源模块（字典code）
@@ -122,8 +123,9 @@
 // -----------------------------------日历--------------------------------------------
 const calendarValue = ref(new Date())
 const selectedDate = ref('') // 选中的日期
+const selectDateRecord = ref('') // 选中的日期记录--完整日期
 const editScheduleRef = ref() // 编辑日程ref
-const redCircleData = ref()
+const redCircleData = ref() // 日程列表
 // 点击编辑日程
 const editSchedule = () => {
   editScheduleRef.value.initDialog()
@@ -135,25 +137,50 @@
     calendarMonth: selectedDate.value,
   }
   getCalendarList(param).then((res) => {
-    console.log(res.data)
     redCircleData.value = res.data
-    console.log('ppredCircleData.value')
-
-    console.log(redCircleData.value)
   })
 }
 // 点击日期
 const clickDate = (day: string) => {
-  console.log(day)
-  selectedDate.value = day
-  // selectedDate.value = day.slice(0, 7)
-
-  // fetchCalendarList() // 获取日历列表
-}
-watch(selectedDate, (value) => {
-  selectedDate.value = value.slice(0, 7)
+  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 noticeList = ref([]) // 审批提醒列表
 const noticeTotal = ref(0) // 审批提醒列表数据总量
@@ -189,10 +216,40 @@
 onMounted(() => {
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
+  selectDateRecord.value = dayjs().format('YYYY-MM-DD')
   fetchApprovalMessageData() // 审批提醒
   fetchWorkMessageData() // 工作提醒
   fetchNoticeList() // 获取通知公告列表
   fetchCalendarList() // 获取日历列表
+
+  // -------------------监听日历三个按钮操作（上个月、今天、下个月）------------------
+  // 点击上个月
+  const prevBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(1)',
+  )
+  prevBtn!.addEventListener('click', (e) => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击下一个月
+  const nextBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(3)',
+  )
+  nextBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+
+  // 点击今天
+  const todayBtn = document.querySelector(
+    '.el-calendar__button-group .el-button-group>button:nth-child(2)',
+  )
+  todayBtn!.addEventListener('click', () => {
+    const day = dayjs(calendarValue.value).format('YYYY-MM')
+    clickDate(day)
+  })
+  // ------------------------------------------------------------------------------
 })
 </script>
 
@@ -205,6 +262,7 @@
           title="审批提醒"
           :height="bigBlockHeight"
           :pagination="true"
+          path-url="/comprehensive/approve"
           :query="approvalMessageListQuery"
           :total="approvalMessageTotal"
           @change="changeApprovalMessagePage"
@@ -276,6 +334,7 @@
           style="margin-top: 10px;"
           icon="icon-notice"
           title="通知公告"
+          path-url="/notice/list"
           :height="blockHeight"
         >
           <el-table
@@ -313,10 +372,11 @@
           :is-edit="true"
           :is-show-delete="true"
           @edit-data="editSchedule"
+          @delete-data="deleteData"
         >
           <el-calendar v-model="calendarValue">
             <template #dateCell="{ data }">
-              <div style="width: 100%;" @click="clickDate(data.day)">
+              <div style="width: 100%;height: 100%;text-align: center;" @click="clickDate(data.day)">
                 <span>
                   {{ data.day.split("-").slice(2).join() }}
                 </span>
@@ -335,12 +395,15 @@
                     </li>
                   </div>
                   <template #reference>
-                    <div style="width: 100%;display: flex;flex-direction: column;align-items: center;" @click="clickDate(data.day)">
+                    <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: -12px;">
-                        <span v-if="key === data.day" class="redCircle" />
+                      <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>
@@ -352,7 +415,7 @@
       </el-col>
     </el-row>
     <!-- 编辑日程组件 -->
-    <edit-schedule-dialog ref="editScheduleRef" />
+    <edit-schedule-dialog ref="editScheduleRef" @edit-schedule-success="editScheduleSuccess" />
   </app-container>
 </template>
 
@@ -367,7 +430,7 @@
   height: 4px;
   background-color: #f56c6c;
   border-radius: 10px;
-  margin-top: 8px;
+  margin-top: -60px;
 }
 
 .calendar-li-item {
@@ -382,4 +445,8 @@
   max-height: 300px;
   overflow-y: auto;
 }
+
+.el-calendar-table .el-calendar-day {
+  padding: 0;
+}
 </style>
diff --git a/src/views/workbench/approve/approve-interface.ts b/src/views/workbench/approve/approve-interface.ts
new file mode 100644
index 0000000..84167ef
--- /dev/null
+++ b/src/views/workbench/approve/approve-interface.ts
@@ -0,0 +1,3 @@
+export interface IListQuery {
+
+}
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index ad022d8..d2dca61 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -1,7 +1,207 @@
+<!-- 审批提醒列表页 -->
 <script name="WorkBenchApprove" 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 { IApprovalMessageListQuery } from '../workbench-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getApprovalMessageList } 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<IApprovalMessageListQuery> = ref({
+  endTime: '', // 通知结束时间
+  messageSourceModule: '', // 来源模块（字典code）
+  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),
+  }
+  getApprovalMessageList(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）
+    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',
+    },
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取数据
+})
 </script>
 
 <template>
-  <div>审批提醒</div>
+  <!-- 布局 -->
+  <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/src/views/workbench/editSchedule.vue b/src/views/workbench/editSchedule.vue
index b50f98f..0ee9f8a 100644
--- a/src/views/workbench/editSchedule.vue
+++ b/src/views/workbench/editSchedule.vue
@@ -6,6 +6,7 @@
 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组件
@@ -57,12 +58,14 @@
         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')
         })
       }
     }
@@ -93,20 +96,20 @@
   }
   getCalendarList(param).then((res) => {
     const response = res.data
-    for (const key in response) {
-      console.log(key, '---', form.value.date)
+    if (response[form.value.date].length) { // 选择的日期有日程
+      // for (const key in response) {
+      type.value = 'edit'
+      // console.log(response[key])
 
-      if (key === form.value.date) {
-        type.value = 'edit'
-        list.value = response[key]
-      }
-      else {
-        type.value = 'add'
-        list.value = [{
-          scheduleMatters: '', // 日程
-          id: '',
-        }]
-      }
+      list.value = response[form.value.date]
+      // }
+    }
+    else { // 选择的日期没有日程
+      type.value = 'add'
+      list.value = [{
+        scheduleMatters: '', // 日程
+        id: '',
+      }]
     }
   })
 }
@@ -136,7 +139,6 @@
       })
     })
 }
-
 watch(() => form.value.date, (newVal) => {
   const date = dayjs(new Date(newVal)).format('YYYY-MM')
   fetchCalendarList(date)
@@ -183,9 +185,9 @@
       <el-button @click="cancle">
         取消
       </el-button>
-      <el-button type="danger" @click="delAll">
+      <!-- <el-button type="danger" @click="delAll">
         删除所有日程
-      </el-button>
+      </el-button> -->
     </template>
   </el-dialog>
 </template>
diff --git a/src/views/workbench/workbench-interface.ts b/src/views/workbench/workbench-interface.ts
index 7699137..d18cc58 100644
--- a/src/views/workbench/workbench-interface.ts
+++ b/src/views/workbench/workbench-interface.ts
@@ -3,7 +3,7 @@
   endTime: string // 通知结束时间
   messageSourceModule: string // 来源模块（字典code）
   startTime: string // 通知开始时间
-  status: number // 已读1未读0
+  status: number | string // 已读1未读0
   offset: number
   limit: number
 }