From 1873f17e4c4c4d27f92fc9a40636a000d97d25d0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 1 Feb 2024 09:32:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0cems=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigScreen/enpComponents/cemsExport.vue | 136 ++++++++++++++++++ src/views/bigScreen/index_enp_blue.vue | 7 +- 2 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 src/views/bigScreen/enpComponents/cemsExport.vue diff --git a/src/views/bigScreen/enpComponents/cemsExport.vue b/src/views/bigScreen/enpComponents/cemsExport.vue new file mode 100644 index 00000000..9f03823d --- /dev/null +++ b/src/views/bigScreen/enpComponents/cemsExport.vue @@ -0,0 +1,136 @@ + + + \ No newline at end of file diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index 6393aff5..18290fa9 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -22,7 +22,7 @@ 排放口清单 CEMS监测清单 CEMS监测预警 - CEMS报表导出 + CEMS报表导出 @@ -284,6 +284,7 @@ + @@ -298,13 +299,15 @@ import * as BABYLON_MATERIAL from "@/utils/babylonMaterial" import orgDialog from "./enpComponents/orgwryList" import cemsDrawer from './enpComponents/cems.vue' import cems2Drawer from './enpComponents/cems2.vue' +import cemsExport from './enpComponents/cemsExport.vue' import 'babylonjs-loaders'; import 'animate.css'; export default { components: { orgDialog, cemsDrawer, - cems2Drawer + cems2Drawer, + cemsExport }, data() { return { From 868a7e7f510011e9c736a48c441d174835b2f749 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 1 Feb 2024 14:02:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20cems.vue=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/enpComponents/cems.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue index 9457550f..0e870001 100644 --- a/src/views/bigScreen/enpComponents/cems.vue +++ b/src/views/bigScreen/enpComponents/cems.vue @@ -76,7 +76,7 @@ export default { data() { return { apiObj: this.$API.enp.drain_equip.list, - params: { drain__type: 10, equipment_type: 30, has_envdata: 'yes' }, + params: { drain__type: 10, equipment__type: 20, has_envdata: 'yes' }, currentEquipmentId: '', currentEquipmentName: '', timeRange: [], From eeeadd9b98ab5c122ecb8c90e73cf9c2f1a3e905 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 1 Feb 2024 14:15:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20cems=E5=AF=BC=E5=87=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/enp.js | 10 ++++++++++ src/views/bigScreen/enpComponents/cemsExport.vue | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/api/model/enp.js b/src/api/model/enp.js index 0ee57605..e681d98c 100644 --- a/src/api/model/enp.js +++ b/src/api/model/enp.js @@ -73,4 +73,14 @@ export default { } } }, + envdata: { + export_excel: { + name: "导出Excel", + req: async function(data){ + return await http.post( + `${config.API_URL}/enp/envdata/export_excel/`, + data); + } + } + } } diff --git a/src/views/bigScreen/enpComponents/cemsExport.vue b/src/views/bigScreen/enpComponents/cemsExport.vue index 9f03823d..dd0ffe46 100644 --- a/src/views/bigScreen/enpComponents/cemsExport.vue +++ b/src/views/bigScreen/enpComponents/cemsExport.vue @@ -109,8 +109,11 @@ export default { }, exportExcel() { this.eLoading = true; - console.log(this.query) - this.eLoading = false; + this.$API.enp.envdata.export_excel.req(this.query).then(res => { + if (res.path) { + window.open(res.path, '_blank') + } + }).then(() => { this.eLoading = false; }) } }, }