From 70fa84544c7a7dec0dd4e681957b57d181e2560d Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Thu, 1 Jul 2021 15:05:26 +0800 Subject: [PATCH 1/2] report --- .../modules/dashboard/controller/dto/ReportDashboardDto.java | 2 -- .../business/modules/dashboard/dao/entity/ReportDashboard.java | 3 --- .../gaea/business/modules/report/controller/dto/ReportDto.java | 3 +++ .../gaea/business/modules/report/dao/entity/Report.java | 3 +++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java index 30518bac..68123524 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java @@ -35,8 +35,6 @@ public class ReportDashboardDto extends GaeaBaseDTO implements Serializable { /** 背景图片 */ private String backgroundImage; - private String previewImage; - /** 工作台中的辅助线 */ private String presetLine; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java index 960e0f9c..bf89396e 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java @@ -35,9 +35,6 @@ public class ReportDashboard extends GaeaBaseEntity { @ApiModelProperty(value = "背景图片") private String backgroundImage; - @ApiModelProperty(value = "列表缩略图") - private String previewImage; - @ApiModelProperty(value = "工作台中的辅助线") private String presetLine; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java index fa7d4c78..fb80145b 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java @@ -41,4 +41,7 @@ public class ReportDto extends GaeaBaseDTO implements Serializable { /** 数据总计 */ private long total; + /** 报表缩略图 */ + private String reportImage; + } diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java index 3af94863..32951b84 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java @@ -33,6 +33,9 @@ public class Report extends GaeaBaseEntity { @ApiModelProperty(value = "报表类型") private String reportType; + @ApiModelProperty(value = "报表缩略图") + private String reportImage; + @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG") private Integer enableFlag; From cb0b5fd195b5e155d928407a477b7f3aef1d9a84 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Thu, 1 Jul 2021 15:17:26 +0800 Subject: [PATCH 2/2] report --- report-ui/src/views/report/bigscreen/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/report-ui/src/views/report/bigscreen/index.vue b/report-ui/src/views/report/bigscreen/index.vue index dccefe01..83d1795e 100644 --- a/report-ui/src/views/report/bigscreen/index.vue +++ b/report-ui/src/views/report/bigscreen/index.vue @@ -44,7 +44,7 @@
- +
{{ item.reportName }}