diff --git a/README.md b/README.md
index 9e4bf6ea..2f2d4034 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,10 @@
#### 组件介绍
大屏设计(AJ-Report)是一个可视化拖拽编辑的,直观,酷炫,具有科技感的图表工具全开源项目。 内置的基础功能包括数据源,数据集,报表管理,项目部分截图如下。
-**在线案例还在努力创造中,敬请期待!!!**
+**[更多案例](https://report.anji-plus.com/report-doc/guide/bigScreenCase.html)**

-
+
## 数据流程图
@@ -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 d8e946e5..775780bf 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 00000000..2d074b26
--- /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)
+
+
+
diff --git a/doc/docs/picture/bigScreenCase/img.png b/doc/docs/picture/bigScreenCase/img.png
new file mode 100644
index 00000000..2d12a31f
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 216b3228..b4ef25e8 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 620ea3c6..120c0f75 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 82fe522d..bdda5160 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;