Merge branch 'master' of https://gitee.com/anji-plus/report

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;
 

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;
 

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;
+
 }

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;
 

report-ui/src/views/report/bigscreen/index.vue

@@ -44,7 +44,7 @@
     <el-row :gutter="20">
       <el-col v-for="item in list" :key="item.id" :span="6">
         <div class="bg">
-          <img class="bg-img" src="../../../assets/images/charts.jpg" alt="" />
+          <img class="bg-img" :src="item.reportImage == null ? require('../../../assets/images/charts.jpg') : item.reportImage" alt="" />
           <div class="content">
             <header>{{ item.reportName }}</header>
             <footer>
@@ -90,6 +90,7 @@ export default {
   data() {
     return {
       list: [],
+      rules: {},
       totalCount: 0,
       totalPage: 0,
       params: {