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 1/3] =?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; } } } From 6cee1f65329a845af8b79619ac2dc09d71697a01 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Mon, 29 May 2023 23:28:19 +0800 Subject: [PATCH 2/3] =?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 | 241 +++++++++++++++--- .../components/searchBox.vue | 87 +++++-- .../correlationEquipment2/index.vue | 12 +- 3 files changed, 279 insertions(+), 61 deletions(-) diff --git a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue index 898f634..00eff83 100644 --- a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue +++ b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue @@ -1,24 +1,24 @@ \ 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 71a2697..7adc432 100644 --- a/src/views/systemManagement/correlationEquipment2/components/searchBox.vue +++ b/src/views/systemManagement/correlationEquipment2/components/searchBox.vue @@ -86,6 +86,7 @@ export default { perception_btn_img_src: require("@/assets/companyFile/intelligence02.png"), perception_text: "智能感知设备", check_push_table_data: {}, // 复选框查询的表格数据传递给表格 + flag: true, }; }, methods: { @@ -101,55 +102,83 @@ export default { video_all_check() { this.perception_checkgroup = []; //智能设备复选框清空 this.video_checkgroup = []; // 视频设备复选框清空 - delete this.only_params.devicePerceptionSubType; // 删除智能查询携带的入参 - this.only_params.deviceVideoSubType = ""; // 按钮查视频设备的全部 + this.deviceVideoSubTypes = [] + this.devicePerceptionSubTypes = []; + delete this.only_params.devicePerceptionSubTypes; // 删除智能查询携带的入参 + this.only_params.deviceVideoSubTypes = ""; // 按钮查视频设备的全部 + this.flag = true; getVideoList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table + this.$emit( + "push_data_to_table", + this.check_push_table_data, + this.only_params, + this.flag + ); // 传给父亲,再转给兄弟Table }); }, // 智能设备按钮查全部 perception_all_check() { this.perception_checkgroup = []; //智能设备复选框清空 this.video_checkgroup = []; // 视频设备复选框清空 - delete this.only_params.deviceVideoSubType; // 删除视频查询携带的入参 - this.only_params.devicePerceptionSubType = ""; // 按钮查智能设备的全部 - getVideoList(this.only_params).then((res) => { + this.deviceVideoSubTypes = [] + this.devicePerceptionSubTypes = []; + delete this.only_params.deviceVideoSubTypes; // 删除视频查询携带的入参 + this.only_params.devicePerceptionSubTypes = ""; // 按钮查智能设备的全部 + this.flag = false; + getPerceptionList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table + this.$emit( + "push_data_to_table", + this.check_push_table_data, + this.only_params, + this.flag + ); // 传给父亲,再转给兄弟Table }); }, // 视频设备复选查询 video_check_search(e, value) { if (e) { // 点击 - delete this.only_params.devicePerceptionSubType; // 删除智能查询携带的入参 + delete this.only_params.devicePerceptionSubTypes; // 删除智能查询携带的入参 this.perception_checkgroup = []; //智能设备复选框清空 this.devicePerceptionSubTypes = []; // 智能查询参数清空 this.deviceVideoSubTypes.push(value); // 收集视频类型查询入参 - this.only_params.deviceVideoSubType = - this.deviceVideoSubTypes.toString(); // 这个入参可能会有变化 + this.only_params.deviceVideoSubTypes = + this.deviceVideoSubTypes.sort((a,b)=>{return a-b}).toString(); // 这个入参可能会有变化 + this.flag = true; getVideoList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table + this.$emit( + "push_data_to_table", + this.check_push_table_data, + this.only_params, + this.flag + ); // 传给父亲,再转给兄弟Table }); } else { // 取消 - delete this.only_params.devicePerceptionSubType; // 删除智能查询携带的入参 + delete this.only_params.devicePerceptionSubTypes; // 删除智能查询携带的入参 this.perception_checkgroup = []; //智能设备复选框清空 this.devicePerceptionSubTypes = []; // 智能查询参数清空 this.deviceVideoSubTypes = this.deviceVideoSubTypes.filter( (item) => item != value ); // 收集视频类型查询入参 - this.only_params.deviceVideoSubType = - this.deviceVideoSubTypes.toString(); // 这个入参可能会有变化 + this.only_params.deviceVideoSubTypes = + this.deviceVideoSubTypes.sort((a,b)=>{return a-b}).toString(); // 这个入参可能会有变化 + this.flag = true; getVideoList(this.only_params).then((res) => { console.log("res_video", res); this.check_push_table_data = res; - this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table + this.$emit( + "push_data_to_table", + this.check_push_table_data, + this.only_params, + this.flag + ); // 传给父亲,再转给兄弟Table }); } }, @@ -157,29 +186,41 @@ export default { perception_check_search(e, value) { if (e) { // 点击 - delete this.only_params.deviceVideoSubType; // 删除视频查询携带的入参 + delete this.only_params.deviceVideoSubTypes; // 删除视频查询携带的入参 this.video_checkgroup = []; // 视频设备复选框清空 this.deviceVideoSubTypes = []; // 视频设备复选框清空 this.devicePerceptionSubTypes.push(value); // 收集智能类型查询入参 - this.only_params.devicePerceptionSubType = - this.devicePerceptionSubTypes.toString(); // 这个入参可能会有变化 + this.only_params.devicePerceptionSubTypes = + this.devicePerceptionSubTypes.sort((a,b)=>{return a-b}).toString(); // 这个入参可能会有变化 + this.flag = false; getPerceptionList(this.only_params).then((res) => { this.check_push_table_data = res; - this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table + this.$emit( + "push_data_to_table", + this.check_push_table_data, + this.only_params, + this.flag + ); // 传给父亲,再转给兄弟Table }); } else { // 取消 - delete this.only_params.deviceVideoSubType; // 删除视频查询携带的入参 + delete this.only_params.deviceVideoSubTypes; // 删除视频查询携带的入参 this.video_checkgroup = []; // 视频设备复选框清空 this.deviceVideoSubTypes = []; // 视频设备复选框清空 this.devicePerceptionSubTypes = this.devicePerceptionSubTypes.filter( (item) => item != value ); // 收集智能类型查询入参 - this.only_params.devicePerceptionSubType = - this.devicePerceptionSubTypes.toString(); // 这个入参可能会有变化 + this.only_params.devicePerceptionSubTypes = + this.devicePerceptionSubTypes.sort((a,b)=>{return a-b}).toString(); // 这个入参可能会有变化 + this.flag = false; getPerceptionList(this.only_params).then((res) => { this.check_push_table_data = res; - this.$emit("push_data_to_table", this.check_push_table_data,this.only_params); // 传给父亲,再转给兄弟Table + this.$emit( + "push_data_to_table", + this.check_push_table_data, + this.only_params, + this.flag + ); // 传给父亲,再转给兄弟Table }); } }, diff --git a/src/views/systemManagement/correlationEquipment2/index.vue b/src/views/systemManagement/correlationEquipment2/index.vue index b2edeb2..dce060f 100644 --- a/src/views/systemManagement/correlationEquipment2/index.vue +++ b/src/views/systemManagement/correlationEquipment2/index.vue @@ -96,7 +96,7 @@ export default { console.log("resVideoList", res.rows); //res.rows res.total // 传给右下方表格数据 this.push_table_data = res; - this.push_data_to_table(this.push_table_data,this.only_params); + this.push_data_to_table(this.push_table_data,this.only_params,true); }); }); }, @@ -135,11 +135,11 @@ export default { getVideoList(this.only_params).then((res) => { console.log("resVideoList", res.rows); this.push_table_data = res; - this.push_data_to_table(this.push_table_data,this.only_params); + this.push_data_to_table(this.push_table_data,this.only_params,true); }); }, - push_data_to_table(data,params) { - this.$refs.equipmentTable.obtain_table_data(data,params); + push_data_to_table(data,params,flag) { + this.$refs.equipmentTable.obtain_table_data(data,params,flag); }, }, }; @@ -305,12 +305,12 @@ export default { .right { width: 64vw; height: 78vh; - border: 0.1px solid #485f6c; + // border: 0.1px solid #485f6c; .right_table { margin-top: 1vh; width: 64vw; height: 52vh; - border: 0.1px solid #485f6c; + // border: 0.1px solid #485f6c; } } } From 25b878018258d0cb0dfc5cabc0d6cce40f96dbda Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Tue, 30 May 2023 13:57:29 +0800 Subject: [PATCH 3/3] =?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 | 52 ++- .../components/videoForm.vue | 349 ++++++++++++++++++ 2 files changed, 395 insertions(+), 6 deletions(-) create mode 100644 src/views/systemManagement/correlationEquipment2/components/videoForm.vue diff --git a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue index 00eff83..8a42a95 100644 --- a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue +++ b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue @@ -31,7 +31,7 @@
- + {{ item.label }} @@ -89,13 +89,13 @@ @@ -150,7 +150,7 @@
+ + @@ -318,8 +356,10 @@ export default { .table_video { width: 64vw; height: 34vh; + margin-left: 10px; } /deep/.el-table { + width: 98.2%; .el-table__body-wrapper { overflow: auto; background: #233438; diff --git a/src/views/systemManagement/correlationEquipment2/components/videoForm.vue b/src/views/systemManagement/correlationEquipment2/components/videoForm.vue new file mode 100644 index 0000000..244c750 --- /dev/null +++ b/src/views/systemManagement/correlationEquipment2/components/videoForm.vue @@ -0,0 +1,349 @@ + + + \ No newline at end of file