From a8aac3591be5a00cd450e6264f84ff7f5fe52c53 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Sun, 26 Sep 2021 13:43:09 +0800 Subject: [PATCH] =?UTF-8?q?excel=E5=88=86=E4=BA=AB=E6=9A=82=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/report/bigscreen/index.vue | 2 +- .../src/views/report/excelreport/index.vue | 294 +++++++++++++----- report-ui/src/views/report/report/index.vue | 21 +- 3 files changed, 236 insertions(+), 81 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/index.vue b/report-ui/src/views/report/bigscreen/index.vue index 3bef1030..0fa6380c 100644 --- a/report-ui/src/views/report/bigscreen/index.vue +++ b/report-ui/src/views/report/bigscreen/index.vue @@ -120,7 +120,7 @@ export default { params: { reportCode: "", reportName: "", - // reportType: '', + reportType: 'report_screen', pageNumber: 1, pageSize: 8, order: "DESC", diff --git a/report-ui/src/views/report/excelreport/index.vue b/report-ui/src/views/report/excelreport/index.vue index 07444152..69c3fac7 100644 --- a/report-ui/src/views/report/excelreport/index.vue +++ b/report-ui/src/views/report/excelreport/index.vue @@ -6,101 +6,251 @@ !-->