From 42bad9af8e964d1ddbbbfff8f754acd42837793d Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 29 Jul 2022 09:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF=20=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E6=A0=87=E7=AD=BE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/infrastructure-modal.vue             | 13 ++++++++++++-
 .../components/infrastructure-tree.vue              |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

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 0d05d598..6c78daa0 100644
--- a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
+++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
@@ -40,6 +40,9 @@
                         <el-button type="primary" style="margin-left:10px;margin-top:4px" size="small" @click="getData">
                             搜索
                         </el-button>
+                        <el-button type="primary" style="margin-left:10px;margin-top:4px" size="small" @click="clear">
+                            重置
+                        </el-button>
                     </div>
                 </div>
 
@@ -252,6 +255,8 @@ export default {
             } else {
                 this.checkList.push(item.labelCode)
             }
+            console.log('this.checkList------------>', this.checkList);
+            this.getData()
         },
         // 获取列表
         getData(parentId = '') {
@@ -265,7 +270,7 @@ export default {
                 gpsX: '',
                 gpsY: '',
                 radius: '',
-                labelCodes: '',
+                labelCodes: this.checkList.join(),
             }
             return new Promise((resolve, reject) => {
                 this.$http.get('/api/project/selectByParentIdNew', { params: postData }).then(res => {
@@ -283,6 +288,7 @@ export default {
 
         },
         changeParentId(parentId) {
+            console.log('parentId------------>', parentId);
             this.getData(parentId)
         },
         confirmSubmitHandle() {
@@ -312,6 +318,11 @@ export default {
             this.transferData = [];
             this.$emit('closeModal');
         },
+        clear() {
+            this.cameraName = ''
+            this.selectedArray = [];
+            this.getData()
+        },
     }
 
 }
diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue
index 8b977a47..a4ccdd1b 100644
--- a/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue
+++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue
@@ -96,7 +96,7 @@ export default {
                 })
         },
         onSelect(item, val, child) {
-            // mybus.emit('getListByParentId', val.id)
+            this.$emit('changeParentId', val.id)
             this.getCameraAllOrgan({ parentId: val.id }).then((res) => {
                 if (res.data.code !== 1) {
                     return this.$message.error(res.msg);