From 10fe94fbfada690d186d13c61695d41d7d73cfb5 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Thu, 13 Oct 2022 15:47:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/integrationServicesDetails.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index 5319a75a..4343167b 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -292,9 +292,9 @@
           return message.error(res.data.msg)
         }
         detailInfoObj.value = res.data.data || {}
-        dataSourceCount.value = res.data.dataSourceCount || 0
-        infrastructureCount.value = res.data.infrastructureCount || 0
-        componentCount.value = res.data.componentCount || 0
+        dataSourceCount.value = res.data.data.dataSourceCount || 0
+        infrastructureCount.value = res.data.data.infrastructureCount || 0
+        componentCount.value = res.data.data.componentCount || 0
         // 资源属性
         let fuseAttrList = res.data.data.fuseAttrList || []
         // 融合关系

From 07a924cce48b077b16cab328be4274fbc9277cb3 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Thu, 13 Oct 2022 15:51:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/integrationServicesDetails.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index 4343167b..24efca0d 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -293,7 +293,7 @@
         }
         detailInfoObj.value = res.data.data || {}
         dataSourceCount.value = res.data.data.dataSourceCount || 0
-        infrastructureCount.value = res.data.data.infrastructureCount || 0
+        infrastructureCount.value = res.data.data.infrastructureCount|| 0
         componentCount.value = res.data.data.componentCount || 0
         // 资源属性
         let fuseAttrList = res.data.data.fuseAttrList || []

From 6d45680b9a6d67abe80278a95a708b23f0f7836c Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Thu, 13 Oct 2022 15:54:50 +0800
Subject: [PATCH 3/4] 1

---
 .../modules/ability/assignedScene/add-update-scene.vue    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
index 5ba410c8..9f121c0e 100644
--- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue
+++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
@@ -357,10 +357,10 @@ export default {
             update: 'put'
           }
           this.dataForm.fuseResourceList = this.getFuseResourceList()
-          // if (this.imageUrl == '') {
-          //   this.$message.error('请上传图片！')
-          //   return
-          // }
+          if (this.imageUrl == '') {
+            this.$message.error('请上传图片！')
+            return
+          }
           this.dataForm.fuseAttrList.find(v => v.attrType == '服务图片').attrValue = this.imageUrl || ''
           const _obj = Object.assign({}, this.dataForm, {
             type: '赋能场景'

From f4f5292540f320b328d1e71ecb550aab36d961b8 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Thu, 13 Oct 2022 16:19:03 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/AbilityToApplyFor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 9eb8fd49..0a6a6153 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -105,7 +105,7 @@
               }}
             </div>
           </div>
-          <div class="remove" @click="removeFunction(val)"></div>
+          <div class="remove" v-if="item.arr.length>1" @click="removeFunction(val)"></div>
         </div>
       </template>
     </div>