From ea66cc222824e10ecb54c1f6204f9c3fde57c235 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 10 Jan 2023 14:08:47 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/IntegratedServices-add.vue        |   4 +-
 .../assignedScene/components/ability-add.vue  | 166 +++++++++++-------
 2 files changed, 101 insertions(+), 69 deletions(-)

diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue
index 4ef16860..b9942d2a 100644
--- a/back/src/views/modules/ability/IntegratedServices-add.vue
+++ b/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)
diff --git a/back/src/views/modules/ability/assignedScene/components/ability-add.vue b/back/src/views/modules/ability/assignedScene/components/ability-add.vue
index 199dd0a9..5e73243b 100644
--- a/back/src/views/modules/ability/assignedScene/components/ability-add.vue
+++ b/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) {
-        this.dataInfo = newVal;
-        this.$emit("update", {
+      handler (newVal) {
+        this.dataInfo = newVal
+        this.$emit('update', {
           title: this.title,
-          list: newVal,
-        });
+          list: newVal
+        })
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
     count: {
-      handler(newVal) {
-        this.count = newVal;
-        this.$emit("updateCount", {
+      handler (newVal) {
+        this.count = newVal
+        this.$emit('updateCount', {
           title: this.title,
-          count: newVal,
-        });
+          count: newVal
+        })
       },
       deep: true,
-      immediate: true,
-    },
+      immediate: true
+    }
   },
-  data() {
+  data () {
     return {
-      count: "",
-      dataInfo: [],
-    };
+      count: '',
+      dataInfo: []
+    }
   },
 
   methods: {
-    addBaseInfo() {
-      let data = {
-        name: "",
-        type: "",
-        dept: "",
-      };
-      this.dataInfo.push(data);
+    addBaseInfo () {
+      const data = {
+        name: '',
+        type: '',
+        dept: ''
+      }
+      this.dataInfo.push(data)
     },
-    handleDelete(row) {
-      this.dataInfo.splice(row, 1);
+    handleDelete (row) {
+      this.dataInfo.splice(row, 1)
     },
-    getDataInfo(dataForm) {
-      let arr = [];
+    getDataInfo (dataForm) {
+      let arr = []
       if (dataForm && (dataForm.id || dataForm.id === 0)) {
-        if (this.title === "基础设施") {
-          this.count = dataForm.infrastructureCount;
+        if (this.title === '基础设施') {
+          this.count = dataForm.infrastructureCount
         }
-        if (this.title === "组件服务") {
-          this.count = dataForm.componentCount;
+        if (this.title === '组件服务') {
+          this.count = dataForm.componentCount
         }
-        if (this.title === "数据资源") {
-          this.count = dataForm.dataSourceCount;
+        if (this.title === '数据资源') {
+          this.count = dataForm.dataSourceCount
         }
 
-        let fuseAttrList = dataForm.fuseAttrList || [];
-        let obj = fuseAttrList.find((v) => v.attrType === this.title) || {};
-        let attrValue = JSON.parse(obj.attrValue || "[]");
+        const fuseAttrList = dataForm.fuseAttrList || []
+        const obj = fuseAttrList.find((v) => v.attrType === this.title) || {}
+        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() {
-      let index = this.dataInfo.length - 1;
-      if (this.dataInfo[index][this.keyTextObj.descObj.key] === "") {
-        return this.$message.warning("请填写完整信息！");
+    addItem () {
+      const index = this.dataInfo.length - 1
+      if (this.dataInfo[index][this.keyTextObj.descObj.key] === '') {
+        return this.$message.warning('请填写完整信息！')
       }
       this.dataInfo.push({
-        [this.keyTextObj.descObj.key]: "",
-      });
+        [this.keyTextObj.descObj.key]: ''
+      })
     },
     // 删除
-    deleteItem(index) {
-      this.$confirm("确认是否删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+    deleteItem (index) {
+      this.$confirm('确认是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.dataInfo.splice(index, 1);
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.dataInfo.splice(index, 1)
         })
-        .catch(() => {});
-    },
-  },
-};
+        .catch(() => {})
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-table thead {
@@ -245,4 +277,4 @@ export default {
 .add-btn {
   margin-left: 10px;
 }
-</style>
\ No newline at end of file
+</style>