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

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

@@ -22,7 +22,7 @@
                 </el-tooltip>
             </div>
 
-            <div class="more">
+            <div class="more" @click="goPage(dataInfo.url)">
                 查看更多 >
             </div>
         </div>
@@ -51,7 +51,12 @@ export default {
     methods: {
         formatNum(num) {
             return num || num === 0 ? num : '--'
-        }
+        },
+        goPage(url) {
+            this.$router.push({
+                path: url
+            });
+        },
     }
 }
 </script>

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: [],

front/src/views/detailsAll/DeveloperComponents.vue

@@ -12,6 +12,7 @@
     <!-- 导航 -->
     <developer-navigation
       :dataList="dataList.data"
+      :associatedComponents="associatedComponents"
       :class="{ fixed: scrollTop >= 600 }"
       :selectNow="selectNow"
     ></developer-navigation>

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

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,8 +85,14 @@
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
+        if (item.name == '关联能力') {
+          if (props.associatedComponents[0].dataList.length != 0) {
             item.show = true
           }
+        } else {
+          item.show = true
+        }
+      }
     })
     select.value = navList.value.filter(
       (item) => item.name === list.value[0]
@@ -121,8 +128,14 @@
         navList.value.forEach((item) => {
           console.log(item)
           if (list.value.indexOf(item.name) > -1) {
+            if (item.name == '关联能力') {
+              if (props.associatedComponents[0].dataList.length != 0) {
                 item.show = true
               }
+            } else {
+              item.show = true
+            }
+          }
         })
         if (list.value.length > 0) {
           select.value = navList.value.filter(