wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

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

This commit is contained in:
gaoyuanwei 2022-07-21 11:26:59 +08:00
parent 2be53d5e28 f62af22a5e
commit dbe688f3aa
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51 * @Date: 2022-06-29 15:59:51
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-21 09:39:13 * @LastEditTime: 2022-07-21 10:35:13
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->
@ -92,13 +92,13 @@
<script> <script>
// 引入工作流公共方法 // 引入工作流公共方法
import processModule from '@/mixins/process-module' import processModule from '@/mixins/process-module'
import mixinViewModule from '@/mixins/view-module' // import mixinViewModule from '@/mixins/view-module'
import debounce from 'lodash/debounce' import debounce from 'lodash/debounce'
import qs from 'qs' import qs from 'qs'
import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail' import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
export default { export default {
// 注入公共方法 // 注入公共方法
mixins: [mixinViewModule, processModule], mixins: [processModule],
data () { data () {
return { return {
dialogVisible: false, dialogVisible: false,

5
back/src/views/modules/workBench/components/dept-todo-view.vue
View File

@ -15,10 +15,11 @@
<div v-for="(item, i) in dataInfo.list" :key="i"> <div v-for="(item, i) in dataInfo.list" :key="i">
<!-- 待办 --> <!-- 待办 -->
<el-tooltip effect="dark" v-if="dataInfo.type === 'todo'" <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"> placement="top">
<div class="list-item ellipsis"> <div class="list-item ellipsis">
{{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
{{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')}}
</div> </div>
</el-tooltip> </el-tooltip>
<!-- 已办 --> <!-- 已办 -->

9
front/src/views/abilityStatistics/components/AtlasResources.vue
View File

@ -270,7 +270,12 @@
departmentList.value = res.data.data.deptList departmentList.value = res.data.data.deptList
} }
nextTick(() => { nextTick(() => {
console.log('生成气泡=================>', res, navSelect.value) console.log(
'生成气泡=================>',
res,
navSelect.value,
bubbleList.value
)
coordinate.value = [] coordinate.value = []
bubbleRandom(1) bubbleRandom(1)
bubbleRandom(2) bubbleRandom(2)
@ -712,7 +717,7 @@
position: absolute; position: absolute;
opacity: 0; opacity: 0;
top: 2.59rem; top: 2.59rem;
left: 471.05rem; left: 4.71rem;
transition: all 1s; transition: all 1s;
span { span {
overflow: hidden; overflow: hidden;