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 2ee0baca..3864a583 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -22,7 +22,7 @@
-
@@ -51,7 +51,12 @@ export default {
methods: {
formatNum(num) {
return num || num === 0 ? num : '--'
- }
+ },
+ goPage(url) {
+ this.$router.push({
+ path: url
+ });
+ },
}
}
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index c86fe596..95f5bca3 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -54,7 +54,8 @@ export default {
textColor: '#f86f01',
num: 0,
list: [],
- nameStr: 'taskName'
+ nameStr: 'taskName',
+ url: 'activiti-my-todo-task'
},
// 部门已办
hasToDodoData: {
@@ -66,7 +67,8 @@ export default {
textColor: '#21b107',
num: 0,
list: [],
- nameStr: 'processDefinitionName'
+ nameStr: 'processDefinitionName',
+ url: 'activiti-my-join-task'
},
// 部门申请
resourceData: [],
diff --git a/front/src/views/detailsAll/DeveloperComponents.vue b/front/src/views/detailsAll/DeveloperComponents.vue
index d4cf3941..2047bcbd 100644
--- a/front/src/views/detailsAll/DeveloperComponents.vue
+++ b/front/src/views/detailsAll/DeveloperComponents.vue
@@ -12,6 +12,7 @@
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
index a584b464..9853e728 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
@@ -41,9 +41,10 @@
},
})
}
- if (props.associatedComponents) {
+ if (props.associatedComponents[0].dataList.length != 0) {
flag.value = true
dataFrom.value = props.associatedComponents
+ debugger
console.log('dataFrom.value', dataFrom.value)
} else {
flag.value = false
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
index dc751b18..6e3d9926 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
@@ -60,6 +60,7 @@
const props = defineProps({
selectNow: { type: String, default: '' },
dataList: { type: Object, default: null },
+ associatedComponents: { type: Array, default: null },
})
const select = ref('algorithm-display')
const list = ref([])
@@ -84,7 +85,13 @@
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
- item.show = true
+ if (item.name == '关联能力') {
+ if (props.associatedComponents[0].dataList.length != 0) {
+ item.show = true
+ }
+ } else {
+ item.show = true
+ }
}
})
select.value = navList.value.filter(
@@ -121,7 +128,13 @@
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
- item.show = true
+ if (item.name == '关联能力') {
+ if (props.associatedComponents[0].dataList.length != 0) {
+ item.show = true
+ }
+ } else {
+ item.show = true
+ }
}
})
if (list.value.length > 0) {