diff --git a/README.md b/README.md index 9e4bf6ea00ab1580a8ecfe2246818883b2c9d6e7..2f2d40345963355fc7291aea4506b800993d46db 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ ####   组件介绍    大屏设计(AJ-Report)是一个可视化拖拽编辑的,直观,酷炫,具有科技感的图表工具全开源项目。 内置的基础功能包括数据源,数据集,报表管理,项目部分截图如下。
-**在线案例还在努力创造中,敬请期待!!!** +**[更多案例](https://report.anji-plus.com/report-doc/guide/bigScreenCase.html)**
![操作](https://images.gitee.com/uploads/images/2021/0703/094742_c0243f70_1728982.gif "2021-07-03_09-43-50.gif") -![更多案例](https://report.anji-plus.com/report-doc/static/Rhea.mp4)
+![视频](https://report.anji-plus.com/report-doc/static/Rhea.mp4)
## 数据流程图 @@ -145,7 +145,6 @@ sql文件的目录在:report-core --> src --> main --> resources -- > db.migra
- ## 未来计划 - 大屏宽高动态可视化 diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js index d8e946e5c56bee508ee5009c8fb6db7ddafb3a8a..775780bf71b2748aa7f9facd87906a30c7bee4d7 100644 --- a/doc/docs/.vuepress/config.js +++ b/doc/docs/.vuepress/config.js @@ -15,6 +15,7 @@ module.exports = { {text: 'GitHub', link: 'https://github.com/anji-plus/report'}, {text: 'Gitee', link: 'https://gitee.com/anji-plus/report'}, {text: '谁在使用', link: '/guide/briefUsing'}, + {text: '更多案例', link: '/guide/bigScreenCase'}, ], sidebar: { '/guide/': [ diff --git a/doc/docs/guide/bigScreenCase.md b/doc/docs/guide/bigScreenCase.md new file mode 100644 index 0000000000000000000000000000000000000000..2d074b26745794c3941a7840bf9fdc7f01335df5 --- /dev/null +++ b/doc/docs/guide/bigScreenCase.md @@ -0,0 +1,7 @@ +## 案例一: + +由社区 **[~无痕~@tengzhouboy](https://gitee.com/tengzhouboy)** 提供
+[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/mtwbjPot)
+ +![img.png](../picture/bigScreenCase/img.png)
+ diff --git a/doc/docs/picture/bigScreenCase/img.png b/doc/docs/picture/bigScreenCase/img.png new file mode 100644 index 0000000000000000000000000000000000000000..2d12a31f811cae51f59b175de8b71c387b9f54a2 Binary files /dev/null and b/doc/docs/picture/bigScreenCase/img.png differ diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java index 216b32286d0da7b6fcf5acb61c1e6444454d9fe9..b4ef25e84eaaece03aaac35a12fded8acdbcf81c 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java @@ -35,6 +35,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -313,7 +314,7 @@ public class DataSetServiceImpl implements DataSetService { DataSourceDto dataSourceDto = new DataSourceDto(); BeanUtils.copyProperties(dataSource, dataSourceDto); dataSourceDto.setDynSentence(dynSentence); - dataSourceDto.setContextData(dto.getContextData()); + dataSourceDto.setContextData(setContextData(dto.getDataSetParamDtoList())); //获取total,判断DataSetParamDtoList中是否传入分页参数 Map collect = dto.getDataSetParamDtoList().stream().collect(Collectors.toMap(DataSetParamDto::getParamName, DataSetParamDto::getSampleItem)); @@ -389,4 +390,17 @@ public class DataSetServiceImpl implements DataSetService { // dataSetTransformService.insertBatch(dataSetTransformList); } + /** + * dataSetParamDtoList转map + * @param dataSetParamDtoList + * @return + */ + public Map setContextData(List dataSetParamDtoList){ + Map map = new HashMap<>(); + if (null != dataSetParamDtoList && dataSetParamDtoList.size() > 0) { + dataSetParamDtoList.forEach(dataSetParamDto -> map.put(dataSetParamDto.getParamName(), dataSetParamDto.getSampleItem())); + } + return map; + } + } diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue index 620ea3c6fba1b6e9dd305c0aae9b20497de93c97..120c0f7510270e7331035066d8e9df2f5521489d 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue @@ -196,7 +196,6 @@ export default { }, tableFiledWidth(index){ var styleJson = {}; - debugger if(this.optionsSetUp.dynamicAddTable[index].width ){ styleJson["width"] = this.optionsSetUp.dynamicAddTable[index].width } diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index 82fe522df6c9163597c9ae190322144d2c4a9621..bdda5160c3ddd615d97c17efe6a0ceb3103a6128 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -274,7 +274,6 @@ export default { }, methods: { operateDataset(type, prop) { - debugger this.dialogVisibleSetDataSet = true; if (prop && prop.msg) { this.dataSet = prop.msg;