diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js index 42bc294f..2ce8e90b 100644 --- a/doc/docs/.vuepress/config.js +++ b/doc/docs/.vuepress/config.js @@ -50,7 +50,9 @@ module.exports = { children: [ {title: '数据源', path: '/guide/datasource'}, {title: '数据集', path: '/guide/dataset'}, - {title: '大屏设计', path: '/guide/dashboard'}, + {title: '报表管理', path: '/guide/reportmanager'}, + {title: '大屏报表', path: '/guide/dashboard'}, + {title: '表格报表', path: '/guide/execl'}, {title: '导入导出', path: '/guide/importexport'}, ] }, diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index 9a4a6c72..1b8ed3a4 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -1,16 +1,21 @@ -## 介绍 -## 新增大屏 -![img.png](../picture/dashboard/img.png) +## 设计大屏 +进入大屏设计方法1:
+从报表管理模块选择需要设计的大屏,按图示进入大屏设计界面
+![img](../picture/dashboard/img22.png)
+ +进入大屏设计方法2:
+从大屏报表模块选择需要设计的大屏,按图示进入大屏设计界面
+![img](../picture/dashboard/img23.png)
## 大屏简介 -![img_2.png](../picture/dashboard/img_2.png) +![img_2.png](../picture/dashboard/img_2.png)
## 工具栏 ### 文本框 -![img_3.png](../picture/dashboard/img_3.png) -![img_4.png](../picture/dashboard/img_4.png) -![img_5.png](../picture/dashboard/img_5.png) -![img_6.png](../picture/dashboard/img_6.png) +![img_3.png](../picture/dashboard/img_3.png)
+![img_4.png](../picture/dashboard/img_4.png)
+![img_5.png](../picture/dashboard/img_5.png)
+![img_6.png](../picture/dashboard/img_6.png)
### 滚动文本 已支持动态数据,请参考文本框的操作
diff --git a/doc/docs/guide/execl.md b/doc/docs/guide/execl.md new file mode 100644 index 00000000..b3eeb720 --- /dev/null +++ b/doc/docs/guide/execl.md @@ -0,0 +1,27 @@ +# 介绍 +execl报表基于Luckysheet开发,[Luckysheet](https://gitee.com/mengshukeji/Luckysheet) 一款纯前端类似excel的在线表格,功能强大、配置简单、完全开源。 +**注意:** execl报表目前只是简单集成,如果你遇到了一些问题请在此[Issue](https://gitee.com/anji-plus/report/issues/I4CEWV) 下面进行回复。
+## 表格报表设计 +进入表格设计方法1:
+从报表管理模块选择需要设计的大屏,按图示进入大屏设计界面
+![img](../picture/execl/img.png)
+ +进入大屏设计方法2:
+从大屏报表模块选择需要设计的大屏,按图示进入大屏设计界面
+![img2](../picture/execl/img_1.png)
+ +## 简介 +![img3](../picture/execl/img_2.png)
+ +## 使用 +**注**:不建议一列中同时存在俩个字段数据,同时一列值也建议不要存到超大数据量,肯定无法显示的
+![img4](../picture/execl/img_3.png)
+ +## 预览/保存 +点击保存,则会将数据写入到库中。
+点击预览,则进入预览界面。
+![img](../picture/execl/img_4.png)
+ +## 预览界面 +可以进行导出操作。
+![img](../picture/execl/img_5.png)
diff --git a/doc/docs/guide/reportmanager.md b/doc/docs/guide/reportmanager.md new file mode 100644 index 00000000..b0be4011 --- /dev/null +++ b/doc/docs/guide/reportmanager.md @@ -0,0 +1,3 @@ +## 新增报表 +![img](../picture/reportmanager/img.png)
+状态默认为已启用。 diff --git a/doc/docs/picture/dashboard/img.png b/doc/docs/picture/dashboard/img.png deleted file mode 100644 index 67a0a19a..00000000 Binary files a/doc/docs/picture/dashboard/img.png and /dev/null differ diff --git a/doc/docs/picture/dashboard/img22.png b/doc/docs/picture/dashboard/img22.png new file mode 100644 index 00000000..a9b7723f Binary files /dev/null and b/doc/docs/picture/dashboard/img22.png differ diff --git a/doc/docs/picture/dashboard/img23.png b/doc/docs/picture/dashboard/img23.png new file mode 100644 index 00000000..83bcb8ce Binary files /dev/null and b/doc/docs/picture/dashboard/img23.png differ diff --git a/doc/docs/picture/execl/img.png b/doc/docs/picture/execl/img.png new file mode 100644 index 00000000..bbfa70cf Binary files /dev/null and b/doc/docs/picture/execl/img.png differ diff --git a/doc/docs/picture/execl/img_1.png b/doc/docs/picture/execl/img_1.png new file mode 100644 index 00000000..5c969c97 Binary files /dev/null and b/doc/docs/picture/execl/img_1.png differ diff --git a/doc/docs/picture/execl/img_2.png b/doc/docs/picture/execl/img_2.png new file mode 100644 index 00000000..45efaadb Binary files /dev/null and b/doc/docs/picture/execl/img_2.png differ diff --git a/doc/docs/picture/execl/img_3.png b/doc/docs/picture/execl/img_3.png new file mode 100644 index 00000000..0cc2fcae Binary files /dev/null and b/doc/docs/picture/execl/img_3.png differ diff --git a/doc/docs/picture/execl/img_4.png b/doc/docs/picture/execl/img_4.png new file mode 100644 index 00000000..eafd032e Binary files /dev/null and b/doc/docs/picture/execl/img_4.png differ diff --git a/doc/docs/picture/execl/img_5.png b/doc/docs/picture/execl/img_5.png new file mode 100644 index 00000000..c2112950 Binary files /dev/null and b/doc/docs/picture/execl/img_5.png differ diff --git a/doc/docs/picture/reportmanager/img.png b/doc/docs/picture/reportmanager/img.png new file mode 100644 index 00000000..8ce4974b Binary files /dev/null and b/doc/docs/picture/reportmanager/img.png differ