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

front/src/views/detailsAll/ApplicationDetails.vue

@@ -33,7 +33,7 @@
     ></application-associated-components>
     <!-- 关联能力 -->
     <application-associated-ability
-      :associatedComponents="associatedComponents"
+      :associatedComponents="associatedComponentsFunction()"
       id="application-associated-ability"
       class="scrollBox"
     ></application-associated-ability>
@@ -172,6 +172,15 @@
       console.log('预览==============', obj)
     }
   }
+  const associatedComponentsFunction = () => {
+    if (
+      associatedComponents.value[0].dataList.length > 0 ||
+      associatedComponents.value[1].dataList.length > 0 ||
+      associatedComponents.value[2].dataList.length > 0
+    ) {
+      return associatedComponents.value
+    }
+  }
   init(id)
   onBeforeUnmount(() => {
     mybus.off('flyToView')

front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue

@@ -46,6 +46,7 @@
       },
     })
   }
+  if (props.associatedComponents) {
     if (
       props.associatedComponents[0].dataList.length > 0 ||
       props.associatedComponents[1].dataList.length > 0 ||
@@ -57,13 +58,25 @@
     } else {
       flag.value = false
     }
+  } else {
+    flag.value = false
+  }
+
   watch(
     () => props.associatedComponents,
     (val) => {
-      if (val) {
+      if (props.associatedComponents) {
+        if (
+          val[0].dataList.length > 0 ||
+          val[1].dataList.length > 0 ||
+          val[2].dataList.length > 0
+        ) {
           flag.value = true
           dataFrom.value = props.associatedComponents
-        console.log('dataFrom.value', dataFrom.value)
+          // console.log('dataFrom.value', dataFrom.value)
+        } else {
+          flag.value = false
+        }
       } else {
         flag.value = false
       }