Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

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,

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>
                 <!-- 已办 -->

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;