client/package.json

@@ -51,6 +51,7 @@
     "dayjs": "^1.11.10",
     "diagram-js": "^12.3.0",
     "echarts": "^5.4.3",
+    "echarts-wordcloud": "^2.1.0",
     "element-plus": "2.3.14",
     "fast-xml-parser": "^4.3.0",
     "file-saver": "^2.0.5",

client/src/router/modules/remaining.ts

@@ -88,7 +88,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'mainOfficeCenter',
         name: 'MainOfficeCenter',
-        component: () => import('@/views/OaSystem/officeCenter/mainOfficeCenter/index.vue'),
+        component: () => import('@/views/OaSystem/mainOfficeCenter/index.vue'),
         meta: {
           title: '办件中心'
         }

client/src/views/OaSystem/mainOfficeCenter/index.vue

@@ -532,8 +532,8 @@ const {
  */
 const recoverActivityHandle = (item: any) => {
   recoverActivity({
-    activityInstanceId: item['ACTIVITYINSID'],
-    participantId: item['PARTICIPANTID']
+    activityInstanceId: item['activityinsid'],
+    participantId: item['participantid']
   }).then((res) => {
     if (res) {
       message.success('追回成功！')

client/src/views/OaSystem/mainOfficeCenter/inullyApply.ts

@@ -43,10 +43,10 @@ const useInullyApply = (option: InullyApplyOptionType) => {
     inullyApplyForm.nullyApplyTime = getCurrentDate()
     inullyApplyForm.iNullied = iNullied
     inullyApplyForm.flowInstanceId = generateUUID()
-    inullyApplyForm.voidFlowInstanceId = row?.FLOWINSID ?? ''
-    inullyApplyForm.voidFlowCode = row?.CODE ?? ''
-    inullyApplyForm.voidFlowDesc = row?.DESCRIBTION ?? ''
-    inullyApplyForm.voidFlowName = row?.ACTIVITYNAME ?? ''
+    inullyApplyForm.voidFlowInstanceId = row?.flowinsid ?? ''
+    inullyApplyForm.voidFlowCode = row?.code ?? ''
+    inullyApplyForm.voidFlowDesc = row?.describtion ?? ''
+    inullyApplyForm.voidFlowName = row?.activityname ?? ''
     inullyApplyForm.nullyReason = ''
   }
   const cancelFlow = (row) => {
@@ -75,7 +75,7 @@ const useInullyApply = (option: InullyApplyOptionType) => {
    */
   const recoverINullyApplyHandle = (item: any) => {
     getINullyApplyExample({
-      voidFlowInstanceId: item['flowinsid'],
+      voidFlowInstanceId: item['FLOWINSID'],
       isRecover: 1
     }).then((result: any) => {
       if (result) {
@@ -89,7 +89,7 @@ const useInullyApply = (option: InullyApplyOptionType) => {
    */
   const completelyVoidINullyApplyHandle = (item: any) => {
     completelyVoidINullyApply({
-      flowInstanceId: item['flowinsid']
+      flowInstanceId: item['FLOWINSID']
     }).then((res: any) => {
       if (res === 'ok') {
         option?.success && option.success(InullyApplyEnum.Nullify)

client/src/views/OaSystem/mainOfficeCenter/lookAndApplyFlow.ts

@@ -27,8 +27,8 @@ const useLookAndApplyFlow = () => {
    */
   const openFlowHandle = (item: any, status?: string) => {
     const saveAndGetUrlReqParam = {
-      activityInsId: item['activityinsid'] || '',
-      flowInsId: item['flowinsid'] || '',
+      activityInsId: status == '160' ? item['nullyId'] : item['activityinsid'] || '',
+      flowInsId: status == '160' ? item['FLOWINSID'] : item['flowinsid'] || '',
       participantId: item['participantid'] || '',
       status: item['status'] || status,
       userId: '',

client/src/views/OaSystem/oaLayout/menus.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="oa_menus">
-    <div
+    <!-- <div
       class="menus-tabs"
       v-for="(item, index) in reactiveData.routes"
       :key="index"
@@ -12,6 +12,30 @@
         </div>
         <p class="title">{{ item.name }}</p>
       </div>
+    </div> -->
+    <div class="menus-tabs">
+      <el-menu default-active="2" class="el-menu-vertical-demo">
+        <div
+          v-for="(item, index) in reactiveData.routes"
+          :key="index"
+          class="menuDiv"
+          @mouseenter="handleMouseEnter(item, index)"
+          @mouseleave="handleMouseLeave(item, index)"
+          v-show="item.name != '个人档案'"
+        >
+          <el-menu-item @click="menuClick(item, index)" :index="String(index)">
+            <icon :icon="item.icon" />
+            <span>{{ item.name }}</span>
+            <span
+              class="project_corner"
+              v-if="['个人中心'].includes(item.name) && projectCorner > 0"
+            >
+              {{ projectCorner }}
+            </span>
+          </el-menu-item>
+          <MenusActive :menuData="menuData" v-if="mouseenterIndex == index" />
+        </div>
+      </el-menu>
     </div>
   </div>
 </template>
@@ -25,6 +49,7 @@ import { getAttendCount } from '@/api/oa/index'
 import subscribe from '@/utils/Subscribe'
 import request from '@/config/axios'
 import { useUserStoreWithOut } from '@/store/modules/user'
+import MenusActive from './menusActive.vue'
 
 defineOptions({ name: 'Header' })
 const { t } = useI18n()
@@ -58,7 +83,8 @@ const getProjectCheckNum = async () => {
   )
   projectCorner.value = result
 }
-getProjectCheckNum()
+// getProjectCheckNum()
+
 /***
  * 根据用户ID获取待办角标
  */
@@ -131,14 +157,11 @@ onMounted(() => {
   width: calc(100%);
   height: 100%;
   background: #fff;
-  box-shadow: 0px 2px 5px 1px rgba(0, 0, 0, 0.05);
-  border-radius: 3px;
-  overflow-y: auto;
-  padding: 10px 0px;
 }
-
+.menuDiv {
+  position: relative;
+}
 .menus-tabs {
-  padding: 10px 10px;
   .menu_item_box {
     .icon {
       width: 40px;

client/src/views/OaSystem/oaLayout/menusActive.vue

@@ -48,7 +48,7 @@ const menuClick = (item: any) => {
     })
     return
   }
-  push('/oaSystem/' + pushName.value + '/' + item.path)
+  push('/OaSystem/' + pushName.value + '/' + item.path)
 }
 const initAbsolute = () => {
   let active: any = document.querySelector('.menusActive')
@@ -67,7 +67,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .menusActive {
   position: absolute;
-  left: 184px;
+  left: 160px;
   top: 0;
   z-index: 99999999;
   // width: 566px;

zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/IFlowHandlerCountServce.java

@@ -1,5 +1,6 @@
 package com.zjugis.z_workflow.service;
 
+import cn.hutool.log.Log;
 import com.zjugis.z_workflow.dao.IFlowInstanceDao;
 import com.zjugis.z_workflow.entityExtend.HandlerCaseCenterListParamVo;
 import com.zjugis.z_workflow.utils.ConvertUtils;
@@ -227,7 +228,7 @@ public class IFlowHandlerCountServce {
 		NORMAL("待办", (r, p) -> {
 			try {
 				Map<String, Integer> map = iFlowInstanceDaoBean.listHandlerCaseCountByAwait(p);
-				r.put("NORMAL", ConvertUtils.toInteger(map.get("NUM")));
+				r.put("NORMAL", ConvertUtils.toInteger(map.get("num")));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -244,7 +245,7 @@ public class IFlowHandlerCountServce {
 			} catch (Exception ex) {
 				ex.printStackTrace();
 			}
-			r.put("FINISH", ConvertUtils.toInteger(map.get("NUM")));
+			r.put("FINISH", ConvertUtils.toInteger(map.get("num")));
 		}),
         ARCHIVE("归档", (r, p) -> {
             Map<String, Integer> map = null;
@@ -253,12 +254,12 @@ public class IFlowHandlerCountServce {
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-            r.put("ARCHIVE", ConvertUtils.toInteger(map.get("NUM")));
+            r.put("ARCHIVE", ConvertUtils.toInteger(map.get("num")));
         }),
 		CALLBACK("退回", (r, p) -> {
 			try {
 				Map<String, Integer> map = iFlowInstanceDaoBean.listHandlerCaseCountByCallback(p);
-				r.put("CALLBACK", ConvertUtils.toInteger(map.get("NUM")));
+				r.put("CALLBACK", ConvertUtils.toInteger(map.get("num")));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -266,7 +267,7 @@ public class IFlowHandlerCountServce {
 		HANGUP("挂起", (r, p) -> {
 			try {
 				Map<String, Integer> map = iFlowInstanceDaoBean.listHandlerCaseCountByHangUp(p);
-				r.put("HANG_UP", ConvertUtils.toInteger(map.get("NUM")));
+				r.put("HANG_UP", ConvertUtils.toInteger(map.get("num")));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -289,14 +290,14 @@ public class IFlowHandlerCountServce {
 		CC("抄送", (r, p) -> {
 			try {
 				Map<String, Integer> map = iFlowInstanceDaoBean.findCarbonCopyListCount(p);
-				r.put("CC", ConvertUtils.toInteger(map.get("NUM")));
+				r.put("CC", ConvertUtils.toInteger(map.get("num")));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
 		}),
 		SUPERVISE("督办", (r, p) -> {
 			Map<String, Integer> map = iFlowInstanceDaoBean.listHandlerCaseCountBySupervise(p);
-			r.put("SUPERVISE", ConvertUtils.toInteger(map.get("NUM")));
+			r.put("SUPERVISE", ConvertUtils.toInteger(map.get("num")));
 		}),
 		TIMEOUT("超时", (r, p) -> {
 			r.put("TIMEOUT", iFlowInstanceDaoBean.listMonitorCenterTimeOutCount(p));
@@ -310,7 +311,7 @@ public class IFlowHandlerCountServce {
 				} else {//已办
 					map = iFlowInstanceDaoBean.getFinishedCountByDelegation(p);
 				}
-				r.put("DELEGATION", ConvertUtils.toInteger(map.get("NUM")));
+				r.put("DELEGATION", ConvertUtils.toInteger(map.get("num")));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}