From 810e1836117692b2565d9fe2b79d4c5de576131f Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 11 Aug 2022 09:33:21 +0800
Subject: [PATCH] =?UTF-8?q?ifx:=20=E9=97=A8=E6=88=B7=E8=AF=A6=E6=83=85=20-?=
 =?UTF-8?q?-=E8=B5=84=E6=BA=90key=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/home/components/packageAbilityList.vue |  4 +---
 front/src/views/home/packagingDetails.vue            | 12 ++++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/front/src/views/home/components/packageAbilityList.vue b/front/src/views/home/components/packageAbilityList.vue
index d72eeaa8..92727a4e 100644
--- a/front/src/views/home/components/packageAbilityList.vue
+++ b/front/src/views/home/components/packageAbilityList.vue
@@ -3,7 +3,7 @@
         <div class="img" :style="{ 'background-image': `url(${abilityInfo.bgImg || ''})` }"></div>
         <div class="list-box" v-if="abilityInfo.list.length">
             <div class="list-item" v-for="(item, i) in abilityInfo.list" :key="i" :class="i % 2 == 0 ? 'one' : ''">
-                {{ item }}</div>
+                {{ (item || item === 0) ? item : '--' }}</div>
         </div>
         <div class="no-data" v-else>
             <a-empty description="暂无数据" />
@@ -15,8 +15,6 @@ const props = defineProps({
     abilityInfo: { type: Object, default: () => { } },
 })
 
-console.log('abilityInfo------------>', props.abilityInfo);
-
 
 </script>
 <style lang="less" scoped>
diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue
index d1a293ca..c8043426 100644
--- a/front/src/views/home/packagingDetails.vue
+++ b/front/src/views/home/packagingDetails.vue
@@ -80,21 +80,25 @@ const abilityList = ref([
   {
     name: '数据资源',
     bgImg: require('../../assets/home/integration/sjzyDetail.png'),
-    list: []
+    list: [],
+    showTextKey: 'zyname',
   },
   {
     name: '组件服务',
     bgImg: require('../../assets/home/integration/zjfwDetail.png'),
-    list: []
+    list: [],
+    showTextKey: 'name',
   },
   {
     name: '基础设施',
     bgImg: require('../../assets/home/integration/jcssDetail.png'),
-    list: []
+    list: [],
+    showTextKey: 'channelName',
   },
 ])
 const imgUrl = ref('')
 
+
 // 融合服务--详情
 const getIntegrationServicesDeatil = (id) => {
   loadingPage.value = true
@@ -110,7 +114,7 @@ const getIntegrationServicesDeatil = (id) => {
       let fuseResourceList = detailInfoObj.value.fuseResourceList || []
       abilityList.value.map(v => {
         let list = fuseResourceList.filter(x => x.type == v.name) || [];
-        v.list = list.map(v => v.resource && v.resource.channelName) || []
+        v.list = list.map(x => x.resource && x.resource[v.showTextKey]) || []
       })
       let imgList = detailInfoObj.value.fuseAttrList.filter((val) => val.attrType == '服务图片') || []
       imgUrl.value = imgList[0] && imgList[0].attrValue || ''