From 599250db0d6262a775683aee7a4d74f8a848cd8f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 21 Jul 2022 10:37:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/myAgent/demo/competency-application.vue   | 6 +++---
 .../views/modules/workBench/components/dept-todo-view.vue   | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 9f7bf380..113b5584 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 09:39:13
+ * @LastEditTime: 2022-07-21 10:35:13
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -92,13 +92,13 @@
 <script>
 // 引入工作流公共方法
 import processModule from '@/mixins/process-module'
-import mixinViewModule from '@/mixins/view-module'
+// import mixinViewModule from '@/mixins/view-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 export default {
   // 注入公共方法
-  mixins: [mixinViewModule, processModule],
+  mixins: [processModule],
   data () {
     return {
       dialogVisible: false,
diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
index da27db7e..f40c5dcf 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -15,10 +15,11 @@
             <div v-for="(item, i) in dataInfo.list" :key="i">
                 <!-- 待办 -->
                 <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
-                    :content="`${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}`"
+                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')"
                     placement="top">
                     <div class="list-item ellipsis">
-                        {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }}
+                        <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
+                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')}}
                     </div>
                 </el-tooltip>
                 <!-- 已办 -->

From f62af22a5e73a404b236d94a57ccf92b459346f3 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 21 Jul 2022 10:56:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abilityStatistics/components/AtlasResources.vue      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/AtlasResources.vue b/front/src/views/abilityStatistics/components/AtlasResources.vue
index 2ea72f94..49131229 100644
--- a/front/src/views/abilityStatistics/components/AtlasResources.vue
+++ b/front/src/views/abilityStatistics/components/AtlasResources.vue
@@ -270,7 +270,12 @@
       departmentList.value = res.data.data.deptList
     }
     nextTick(() => {
-      console.log('生成气泡=================>', res, navSelect.value)
+      console.log(
+        '生成气泡=================>',
+        res,
+        navSelect.value,
+        bubbleList.value
+      )
       coordinate.value = []
       bubbleRandom(1)
       bubbleRandom(2)
@@ -712,7 +717,7 @@
             position: absolute;
             opacity: 0;
             top: 2.59rem;
-            left: 471.05rem;
+            left: 4.71rem;
             transition: all 1s;
             span {
               overflow: hidden;