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

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>
         </div>
     </div>

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() {

back/src/views/modules/ability/components/combine-ability.vue

@@ -152,11 +152,11 @@ const res = {
 }
 
 const keyObj = {
-  数据资源: {
+  "数据资源": {
     idKey: 'id',
     nameKey: 'name'
   },
-  组件服务: {
+  "组件服务": {
     idKey: 'id',
     nameKey: 'name'
   }
@@ -323,7 +323,7 @@ export default {
     },
     close () {
       this.showModal = false
-      this.selectedArray = []
+      // this.selectedArray = []
       this.allData = []
       this.transferData = []
     },