From 4a0f2eff6870cd067e0db0db5e8ec291517fbdc8 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 26 Aug 2022 17:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89tooltip=EF=BC=8C=E6=9B=B4=E6=94=B9=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=BC=B9=E6=A1=86=E4=B8=8D=E9=80=89=E6=8B=A9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/assignedScene/components/display-list.vue     | 8 +++-----
 .../assignedScene/components/infrastructure-modal.vue     | 4 ++--
 .../views/modules/ability/components/combine-ability.vue  | 6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/back/src/views/modules/ability/assignedScene/components/display-list.vue b/back/src/views/modules/ability/assignedScene/components/display-list.vue
index 34e4a90b..3ebb14e8 100644
--- a/back/src/views/modules/ability/assignedScene/components/display-list.vue
+++ b/back/src/views/modules/ability/assignedScene/components/display-list.vue
@@ -2,11 +2,9 @@
     <div class="show-box" v-if="displayList.length > 0">
         <div class="list-box">
             <div v-for="(item, i) in displayList" :key="i">
-                <el-tooltip popper-class="testTooltip" effect="dark" :content="item[showKey] || '--'" placement="top">
-                    <div class="list-item">
-                        {{ item[showKey] || '--' }}
-                    </div>
-                </el-tooltip>
+                <div class="list-item">
+                    {{ item[showKey] || '--' }}
+                </div>
             </div>
         </div>
     </div>
diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
index bf8d6c71..ae7be4fe 100644
--- a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
+++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
@@ -319,13 +319,13 @@ export default {
             })
             this.$emit('update', {
                 title: this.type,
-                list: this.selectedArray.map(v => v.idtCameraChannel)
+                list: idtCameraChannelArray
             })
         },
         close() {
             this.showModal = false;
             this.searchData.cameraName = ''
-            this.selectedArray = [];
+            // this.selectedArray = [];
             this.$emit('closeModal');
         },
         clear() {
diff --git a/back/src/views/modules/ability/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue
index 81dffd6b..d3d25a63 100644
--- a/back/src/views/modules/ability/components/combine-ability.vue
+++ b/back/src/views/modules/ability/components/combine-ability.vue
@@ -130,11 +130,11 @@ const res = {
 }
 
 const keyObj = {
-  数据资源: {
+  "数据资源": {
     idKey: 'id',
     nameKey: 'name'
   },
-  组件服务: {
+  "组件服务": {
     idKey: 'id',
     nameKey: 'name'
   }
@@ -258,7 +258,7 @@ export default {
     },
     close () {
       this.showModal = false
-      this.selectedArray = []
+      // this.selectedArray = []
       this.allData = []
       this.transferData = []
     }