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

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: '赋能场景'

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>

front/src/views/home/integrationServicesDetails.vue

@@ -301,9 +301,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 || []
         // 融合关系