From cd8e7878d04bc5fa25935ae2eac200d261634bd0 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Mon, 29 May 2023 20:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/equipmentTable.vue | 508 ++++++++---------- .../components/searchBox.vue | 36 +- .../correlationEquipment2/index.vue | 18 +- 3 files changed, 221 insertions(+), 341 deletions(-) diff --git a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue index dfa5c19..898f634 100644 --- a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue +++ b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue @@ -1,339 +1,251 @@ \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment2/components/searchBox.vue b/src/views/systemManagement/correlationEquipment2/components/searchBox.vue index dfa5c19..71a2697 100644 --- a/src/views/systemManagement/correlationEquipment2/components/searchBox.vue +++ b/src/views/systemManagement/correlationEquipment2/components/searchBox.vue @@ -106,11 +106,7 @@ export default { getVideoList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - let data_params = { - data: this.check_push_table_data, - params: this.only_params, - }; - this.$emit("push_data_to_table", data_params); // 传给父亲,再转给兄弟Table + this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table }); }, // 智能设备按钮查全部 @@ -122,11 +118,7 @@ export default { getVideoList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - let data_params = { - data: this.check_push_table_data, - params: this.only_params, - }; - this.$emit("push_data_to_table", data_params); // 传给父亲,再转给兄弟Table + this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table }); }, // 视频设备复选查询 @@ -142,11 +134,7 @@ export default { getVideoList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - let data_params = { - data: this.check_push_table_data, - params: this.only_params, - }; - this.$emit("push_data_to_table", data_params); // 传给父亲,再转给兄弟Table + this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table }); } else { // 取消 @@ -161,11 +149,7 @@ export default { getVideoList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - let data_params = { - data: this.check_push_table_data, - params: this.only_params, - }; - this.$emit("push_data_to_table", data_params); // 传给父亲,再转给兄弟Table + this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table }); } }, @@ -181,11 +165,7 @@ export default { this.devicePerceptionSubTypes.toString(); // 这个入参可能会有变化 getPerceptionList(this.only_params).then((res) => { this.check_push_table_data = res; - let data_params = { - data: this.check_push_table_data, - params: this.only_params, - }; - this.$emit("push_data_to_table", data_params); // 传给父亲,再转给兄弟Table + this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table }); } else { // 取消 @@ -199,11 +179,7 @@ export default { this.devicePerceptionSubTypes.toString(); // 这个入参可能会有变化 getPerceptionList(this.only_params).then((res) => { this.check_push_table_data = res; - let data_params = { - data: this.check_push_table_data, - params: this.only_params, - }; - this.$emit("push_data_to_table", data_params); // 传给父亲,再转给兄弟Table + this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table }); } }, diff --git a/src/views/systemManagement/correlationEquipment2/index.vue b/src/views/systemManagement/correlationEquipment2/index.vue index a3a6807..b2edeb2 100644 --- a/src/views/systemManagement/correlationEquipment2/index.vue +++ b/src/views/systemManagement/correlationEquipment2/index.vue @@ -96,11 +96,7 @@ export default { console.log("resVideoList", res.rows); //res.rows res.total // 传给右下方表格数据 this.push_table_data = res; - let data_params = { - data: this.push_table_data, - params: this.only_params, - }; - this.push_data_to_table(data_params); + this.push_data_to_table(this.push_table_data,this.only_params); }); }); }, @@ -139,15 +135,11 @@ export default { getVideoList(this.only_params).then((res) => { console.log("resVideoList", res.rows); this.push_table_data = res; - let data_params = { - data: this.push_table_data, - params: this.only_params, - }; - this.push_data_to_table(data_params); + this.push_data_to_table(this.push_table_data,this.only_params); }); }, - push_data_to_table(data_params) { - this.$refs.equipmentTable.obtain_table_data(data_params); + push_data_to_table(data,params) { + this.$refs.equipmentTable.obtain_table_data(data,params); }, }, }; @@ -318,7 +310,7 @@ export default { margin-top: 1vh; width: 64vw; height: 52vh; - // border: 0.1px solid #485f6c; + border: 0.1px solid #485f6c; } } }