修改看板

src/api/workflow/task/index.ts

@@ -191,3 +191,25 @@ export const getNextNodeList = (data: any): any => {
     data: data
   });
 };
+
+/**
+ * 查询当前用户的待办任务数量
+ * @returns {Promise}
+ */
+export const countTaskWaitByCurrentUser = (): AxiosPromise<number> => {
+  return request({
+    url: '/workflow/task/countTaskWaitByCurrentUser',
+    method: 'get'
+  });
+};
+
+/**
+ * 查询当前用户的抄送任务数量
+ * @returns {Promise}
+ */
+export const countTaskCopyByCurrentUser = (): AxiosPromise<number> => {
+  return request({
+    url: '/workflow/task/countTaskCopyByCurrentUser',
+    method: 'get'
+  });
+};

src/components/TopNav/index.vue

@@ -1,19 +1,41 @@
 <template>
   <el-menu :default-active="activeMenu" mode="horizontal" :ellipsis="false" @select="handleSelect">
     <template v-for="(item, index) in topMenus">
-      <el-menu-item v-if="index < visibleNumber" :key="index" :style="{ '--theme': theme }" :index="item.path"
+      <el-menu-item v-if="index < visibleNumber" :key="index" :style="{ '--theme': theme }" :index="item.path">
-        ><svg-icon v-if="item.meta && item.meta.icon && item.meta.icon !== '#'" :icon-class="item.meta ? item.meta.icon : ''" />
+        <svg-icon v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
-        {{ item.meta?.title }}</el-menu-item
+                  :icon-class="item.meta ? item.meta.icon : ''" />
-      >
+        <span v-if="item.meta?.title !=='我的任务'">
+        {{ item.meta?.title }}
+        </span>
+        <el-badge :show-zero="false" :value="badge" type="primary" v-if="item.meta?.title ==='我的任务'"
+                  :offset="[0, 10]">
+          <span>{{ item.meta?.title }}</span>
+        </el-badge>
+      </el-menu-item>
     </template>
 
     <!-- 顶部菜单超出数量折叠 -->
     <el-sub-menu v-if="topMenus.length > visibleNumber" :style="{ '--theme': theme }" index="more">
-      <template #title>更多菜单</template>
+      <template #title>
+        <span v-if="!topMenus.find(e=>e.meta?.title ==='我的任务')">
+          更多菜单
+        </span>
+        <el-badge v-if="topMenus.find(e=>e.meta?.title ==='我的任务')" :show-zero="false" :value="badge" type="primary"
+                  :offset="[0, 10]">
+          <span>更多菜单</span>
+        </el-badge>
+      </template>
       <template v-for="(item, index) in topMenus">
-        <el-menu-item v-if="index >= visibleNumber" :key="index" :index="item.path"
+        <el-menu-item v-if="index >= visibleNumber" :key="index" :index="item.path">
-          ><svg-icon :icon-class="item.meta ? item.meta.icon : ''" /> {{ item.meta?.title }}</el-menu-item
+          <svg-icon :icon-class="item.meta ? item.meta.icon : ''" />
-        >
+          <span v-if="item.meta?.title !=='我的任务'">
+          {{ item.meta?.title }}
+          </span>
+          <el-badge :show-zero="false" :value="badge" type="primary" v-if="item.meta?.title ==='我的任务'"
+                    :offset="[0, 10]">
+            <span>{{ item.meta?.title }}</span>
+          </el-badge>
+        </el-menu-item>
       </template>
     </el-sub-menu>
   </el-menu>
@@ -26,6 +48,20 @@ import useAppStore from '@/store/modules/app';
 import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
 import { RouteRecordRaw } from 'vue-router';
+import { countTaskWaitByCurrentUser } from '@/api/workflow/task';
+
+const badge = ref(1);
+const getBadge = () => {
+  countTaskWaitByCurrentUser().then(e => {
+    badge.value = e.data;
+  });
+};
+onMounted(() => {
+  setInterval(() => {
+    getBadge();
+  }, 1000 * 10);
+  getBadge();
+});
 
 // 顶部栏初始数
 const visibleNumber = ref<number>(-1);

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,11 +1,17 @@
 <template>
   <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item, item.children) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
+    <template
+      v-if="hasOneShowingChild(item, item.children) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
           <svg-icon :icon-class="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" />
           <template #title>
+            <span class="menu-title" v-if="onlyOneChild.meta.title !=='我的待办'"
+                  :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span>
+            <el-badge :show-zero="false" :value="badge" type="primary" v-if="onlyOneChild.meta.title ==='我的待办'"
+                      :offset="[0, 10]">
               <span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span>
+            </el-badge>
           </template>
         </el-menu-item>
       </app-link>
@@ -14,7 +20,12 @@
     <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>
       <template v-if="item.meta" #title>
         <svg-icon :icon-class="item.meta ? item.meta.icon : ''" />
+        <span class="menu-title" :title="hasTitle(item.meta?.title)"
+              v-if="item.meta?.title !=='我的任务'">{{ item.meta?.title }}</span>
+        <el-badge :show-zero="false" :value="badge" type="primary" v-if="item.meta?.title ==='我的任务'"
+                  :offset="[0, 10]">
           <span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span>
+        </el-badge>
       </template>
 
       <sidebar-item
@@ -34,7 +45,22 @@ import { isExternal } from '@/utils/validate';
 import AppLink from './Link.vue';
 import { getNormalPath } from '@/utils/ruoyi';
 import { RouteRecordRaw } from 'vue-router';
+import { countTaskWaitByCurrentUser } from '@/api/workflow/task';
 
+const badge = ref(0);
+const getBadge = () => {
+  if (onlyOneChild.value.meta?.title === '我的待办' || props.item?.meta?.title === '我的任务') {
+    countTaskWaitByCurrentUser().then(e => {
+      badge.value = e.data;
+    });
+  }
+};
+onMounted(() => {
+  setInterval(() => {
+    getBadge();
+  }, 1000 * 10);
+  getBadge();
+});
 const props = defineProps({
   item: {
     type: Object as PropType<RouteRecordRaw>,

src/views/boardGenerate/index1.vue

@@ -295,6 +295,7 @@
         </el-dropdown>
       </div>
 
+      <div class="levels">
         <div class="level" v-for="i in nodes.filter(e=>e.type!=='area').reverse()">
           <div class="isShow">
             <el-icon style="cursor: pointer" color="#fff" :size="16">
@@ -314,6 +315,7 @@
           </div>
         </div>
       </div>
+    </div>
     <div class="center" @drop="onDrop" v-loading="loading">
       <FlowRuler>
         <VueFlow :min-zoom="0.01" ref="flowRef" v-model:nodes="nodes" v-model:edges="edges" fit-view-on-init
@@ -674,6 +676,7 @@ const selectTabs = (e) => {
   z-index: -1 !important;
   pointer-events: none !important;
 }
+
 .boardGenerate {
   width: 100%;
   height: 100%;
@@ -701,12 +704,19 @@ const selectTabs = (e) => {
       line-height: 50px;
       text-align: center;
       color: #FFF;
+      background-color: #293133;
       border-bottom: 1px solid #000;
     }
 
+    .levels {
+      width: 100%;
+      height: calc(100% - 50px);
+      overflow: auto;
+      background-color: #1C1F20;
+
       .level {
         display: flex;
-      align-items: center; /* 核心对齐逻辑 */
+        align-items: center;
         height: 50px;
         padding-left: 20px;
         border-bottom: 1px solid #000;
@@ -718,12 +728,14 @@ const selectTabs = (e) => {
 
         .isShow {
           width: 30px;
+          min-width: 30px;
           height: 50px;
           border-right: 1px solid #000;
         }
 
         .icon {
           width: 40px;
+          min-width: 40px;
         }
 
         .boardName {
@@ -733,6 +745,8 @@ const selectTabs = (e) => {
       }
     }
 
+  }
+
   .center {
     width: calc(100% - 500px);
     display: inline-block;