From 31eee8d607ba9e5764ba63ebb3285f6e912205e8 Mon Sep 17 00:00:00 2001
From: kongjun <qdkongjun@gmail.com>
Date: Fri, 24 Jun 2022 18:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=BB=84=E4=BB=B6=E3=80=81=E9=A1=B9=E7=9B=AE=E7=AD=89?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsabilityai-relate-application.vue        | 91 ++++++++++---------
 .../modules/ability/bsabilityservice.vue      |  5 +
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai-relate-application.vue b/back/src/views/modules/ability/bsabilityai-relate-application.vue
index 3fe9d1ee..a08a977a 100644
--- a/back/src/views/modules/ability/bsabilityai-relate-application.vue
+++ b/back/src/views/modules/ability/bsabilityai-relate-application.vue
@@ -9,15 +9,15 @@
       :key="showKey"
     >
       <div class="relate-application-content">
-        <el-transfer 
-          v-model="transferValue" 
-          filterable 
-          :filter-method="filterMethod" 
-          filter-placeholder="请输入应用名称" 
-          :titles="['未关联应用名称', '已关联应用名称']"
+        <el-transfer
+          v-model="transferValue"
+          filterable
+          :filter-method="filterMethod"
+          filter-placeholder="请输入应用名称"
+          :titles="nameArray"
           :props="{
             key: 'id',
-            label: 'name'
+            label: 'name',
           }"
           :data="transferData"
         ></el-transfer>
@@ -33,65 +33,71 @@
 </template>
 
 <script>
-import debounce from 'lodash/debounce'
+import debounce from "lodash/debounce";
 export default {
-  components: {
-
-  },
-  data () {
+  components: {},
+  data() {
     return {
       showKey: 0,
       visible: true,
       transferData: [], //穿梭框所有数据
       transferValue: [], //已关联的数据id
-    }
+    };
   },
   props: {
     relateInfo: {
       type: Object,
-      default: {}
-    }
-  },
-  computed: {
-    
+      default: {},
+    },
+    nameArray: {
+      type: Array,
+      default: ["未关联应用名称", "已关联应用名称"],
+    },
   },
+  computed: {},
   methods: {
-    close () {
-      this.$emit('isShowRelatePopup', false)
+    close() {
+      this.$emit("isShowRelatePopup", false);
     },
     // 表单提交
     confirmSubmitHandle: debounce(
       function () {
-        this.$http.post('/dataResourceRel/saveDataResourceRel', { 
-          linkType: this.relateInfo.linkType || 2, 
-          id: this.relateInfo.id,
-          referenceIds: this.transferValue
-        }).then(({ data: res }) => {
-          if(res.code == 0) {
-            this.$message.success('关联成功！')
-          } else {
-            this.$message.error('关联失败，请联系管理员！')
-          }
-          this.$emit('isShowRelatePopup', false);
-        }).catch(() => { })
+        this.$http
+          .post("/dataResourceRel/saveDataResourceRel", {
+            linkType: this.relateInfo.linkType || 2,
+            id: this.relateInfo.id,
+            referenceIds: this.transferValue,
+          })
+          .then(({ data: res }) => {
+            if (res.code == 0) {
+              this.$message.success("关联成功！");
+            } else {
+              this.$message.error("关联失败，请联系管理员！");
+            }
+            this.$emit("isShowRelatePopup", false);
+          })
+          .catch(() => {});
       },
       1000,
       { leading: true, trailing: false }
     ),
     filterMethod(query, item) {
       return item.name && item.name.indexOf(query) > -1;
+    },
+  },
+  mounted() {
+    if (this.relateInfo && this.relateInfo.responseData) {
+      const alreadLinkedArr = this.relateInfo.responseData.alreadLinked || [];
+      this.transferData = alreadLinkedArr.concat(
+        this.relateInfo.responseData.notLinked || []
+      );
+      alreadLinkedArr.length &&
+        alreadLinkedArr.forEach((item) => {
+          this.transferValue.push(item.id);
+        });
     }
   },
-  mounted () {
-    if(this.relateInfo && this.relateInfo.responseData) {
-      const alreadLinkedArr = this.relateInfo.responseData.alreadLinked || [];
-      this.transferData = alreadLinkedArr.concat(this.relateInfo.responseData.notLinked || []);
-      alreadLinkedArr.length && alreadLinkedArr.forEach(item => {
-        this.transferValue.push(item.id);
-      });
-    }
-  }
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -125,5 +131,4 @@ export default {
     height: calc(100% - 102px);
   }
 }
-
 </style>
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 78f27f4e..a2a819dd 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -149,6 +149,7 @@
         v-if="relateApplicationResourceVisible"
         ref="relateApplication"
         :relateInfo="relationData"
+        :nameArray="topNameArray"
         @isShowRelatePopup="handleIsShowRelatePopupApply"
       ></relate-application>
     </div>
@@ -187,6 +188,7 @@ export default {
       qp: false,
       relateApplicationResourceVisible: false,
       relationData: {}, //打开穿梭框时传递的参数
+      topNameArray: [], //
     };
   },
   watch: {},
@@ -371,6 +373,7 @@ export default {
             linkType: "1",
             responseData: res.data,
           };
+          this.topNameArray = ["未关联组件名称", "已关联组件名称"];
           console.log(" this.relationData", this.relationData);
           //将数据传递给引入的组件
         });
@@ -402,6 +405,7 @@ export default {
             linkType: "1",
             responseData: res.data,
           };
+          this.topNameArray = ["未关联项目名称", "已关联项目名称"];
           //将数据传递给引入的组件
         });
     },
@@ -428,6 +432,7 @@ export default {
             linkType: "1",
             responseData: res.data,
           };
+          this.topNameArray = ["未关联基础设施名称", "已关联基础设施名称"];
           //将数据传递给引入的组件
         });
     },