BUG修改

back/src/views/modules/ability/IntegratedServices-add.vue

@@ -373,7 +373,7 @@ export default {
       this.$nextTick(() => {
         for (const key in this.refsParseArray) {
           console.log('11111111111', data)
-          this.$refs[key] && this.$refs[key].getDataInfo && this.$refs[key].getDataInfo(data)
+          this.$refs[key] && this.$refs[key].IntegratedServicesGetDataInfo && this.$refs[key].IntegratedServicesGetDataInfo(data)
         }
         const _imgObj = data.fuseAttrList.find(v => v.attrType == '服务图片') || {}
         this.imageUrl = _imgObj.attrValue
@@ -387,7 +387,7 @@ export default {
           // })
           // console.log('回显2', arr2)
           // this.abilityListObj[k] = arr2
-          this.$refs['abilityAdd' + (index + 1)].getDataInfo(data)
+          this.$refs['abilityAdd' + (index + 1)].IntegratedServicesGetDataInfo(data)
         })
 
         console.log('this.dataForm----详情-------->', this.dataForm)

back/src/views/modules/ability/assignedScene/components/ability-add.vue

@@ -63,7 +63,7 @@
           <template slot-scope="scope">
             <el-popconfirm
                         confirm-button-text="确认"
-                        cancel-button-text="不用了"
+                        cancel-button-text="取消"
                         icon="el-icon-info"
                         icon-color="red"
                         title="确定删除该实例数据吗？"
@@ -86,117 +86,149 @@ export default {
   props: {
     dataForm: {
       type: Object,
-      default: () => {},
+      default: () => {}
     },
     title: {
       type: String,
-      default: "",
+      default: ''
     },
     typeList: {
       type: Array,
-      default: () => [],
+      default: () => []
-    },
+    }
   },
   watch: {
     dataInfo: {
-      handler(newVal) {
+      handler (newVal) {
-        this.dataInfo = newVal;
+        this.dataInfo = newVal
-        this.$emit("update", {
+        this.$emit('update', {
           title: this.title,
-          list: newVal,
+          list: newVal
-        });
+        })
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
     count: {
-      handler(newVal) {
+      handler (newVal) {
-        this.count = newVal;
+        this.count = newVal
-        this.$emit("updateCount", {
+        this.$emit('updateCount', {
           title: this.title,
-          count: newVal,
+          count: newVal
-        });
+        })
       },
       deep: true,
-      immediate: true,
+      immediate: true
+    }
   },
-  },
+  data () {
-  data() {
     return {
-      count: "",
+      count: '',
-      dataInfo: [],
+      dataInfo: []
-    };
+    }
   },
 
   methods: {
-    addBaseInfo() {
+    addBaseInfo () {
-      let data = {
+      const data = {
-        name: "",
+        name: '',
-        type: "",
+        type: '',
-        dept: "",
+        dept: ''
-      };
+      }
-      this.dataInfo.push(data);
+      this.dataInfo.push(data)
     },
-    handleDelete(row) {
+    handleDelete (row) {
-      this.dataInfo.splice(row, 1);
+      this.dataInfo.splice(row, 1)
     },
-    getDataInfo(dataForm) {
+    getDataInfo (dataForm) {
-      let arr = [];
+      let arr = []
       if (dataForm && (dataForm.id || dataForm.id === 0)) {
-        if (this.title === "基础设施") {
+        if (this.title === '基础设施') {
-          this.count = dataForm.infrastructureCount;
+          this.count = dataForm.infrastructureCount
         }
-        if (this.title === "组件服务") {
+        if (this.title === '组件服务') {
-          this.count = dataForm.componentCount;
+          this.count = dataForm.componentCount
         }
-        if (this.title === "数据资源") {
+        if (this.title === '数据资源') {
-          this.count = dataForm.dataSourceCount;
+          this.count = dataForm.dataSourceCount
         }
 
-        let fuseAttrList = dataForm.fuseAttrList || [];
+        const fuseAttrList = dataForm.fuseAttrList || []
-        let obj = fuseAttrList.find((v) => v.attrType === this.title) || {};
+        const obj = fuseAttrList.find((v) => v.attrType === this.title) || {}
-        let attrValue = JSON.parse(obj.attrValue || "[]");
+        const attrValue = JSON.parse(obj.attrValue || '[]')
         if (attrValue.length > 0) {
           attrValue.map((v) => {
-            arr.push(v);
+            arr.push(v)
-          });
+          })
         } else {
-          arr = [];
+          arr = []
         }
       } else {
-        arr = [];
+        arr = []
       }
 
-      this.dataInfo = arr;
+      this.dataInfo = arr
+    },
+    IntegratedServicesGetDataInfo (dataForm) {
+      let arr = []
+      if (dataForm && (dataForm.id || dataForm.id === 0)) {
+        if (this.title === '基础设施') {
+          this.count = dataForm.infrastructureCount
+        }
+        if (this.title === '组件服务') {
+          this.count = dataForm.componentCount
+        }
+        if (this.title === '数据资源') {
+          this.count = dataForm.dataSourceCount
+        }
+
+        const fuseAttrList = dataForm.fuseResourceList || []
+        const obj = fuseAttrList.filter((v) => v.type === this.title)
+        console.log('回显数据=======>', obj)
+        if (obj.length > 0) {
+          obj.map((v) => {
+            v.name = v.resourceName
+            v.dept = v.deptName
+            v.type = v.typeSecond
+            arr.push(v)
+          })
+        } else {
+          arr = []
+        }
+      } else {
+        arr = []
+      }
+
+      this.dataInfo = arr
     },
     // 新增
-    addItem() {
+    addItem () {
-      let index = this.dataInfo.length - 1;
+      const index = this.dataInfo.length - 1
-      if (this.dataInfo[index][this.keyTextObj.descObj.key] === "") {
+      if (this.dataInfo[index][this.keyTextObj.descObj.key] === '') {
-        return this.$message.warning("请填写完整信息！");
+        return this.$message.warning('请填写完整信息！')
       }
       this.dataInfo.push({
-        [this.keyTextObj.descObj.key]: "",
+        [this.keyTextObj.descObj.key]: ''
-      });
+      })
     },
     // 删除
-    deleteItem(index) {
+    deleteItem (index) {
-      this.$confirm("确认是否删除?", "提示", {
+      this.$confirm('确认是否删除?', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       })
         .then(() => {
           this.$message({
-            type: "success",
+            type: 'success',
-            message: "删除成功!",
+            message: '删除成功!'
-          });
-          this.dataInfo.splice(index, 1);
           })
-        .catch(() => {});
+          this.dataInfo.splice(index, 1)
-    },
+        })
-  },
+        .catch(() => {})
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-table thead {