diff --git a/README.md b/README.md index 1f0b47b1..d0c54bd7 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ │ ├── start.sh │ └── stop.sh ├── conf 配置文件目录 -│ └── bootstrap-dev.yml +│ └── bootstrap.yml ├── logs 启动日志目录 ├── cache 本地缓存目录 ├── lib 自定义扩展包&report-core核心包 @@ -107,7 +107,7 @@ sh build.sh unzip aj-report-xxxx.zip cd aj-report-xxxx -vim conf/bootstrap-dev.yml 修改数据库连接等信息 +vim conf/bootstrap.yml 修改数据库连接等信息 sh bin/start.sh Linux启动 bin/start.bat Windows修改第4行的JAVA_HOME后(去掉rem注释),双击启动 diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js index f81cb0a2..1f90f7c8 100644 --- a/doc/docs/.vuepress/config.js +++ b/doc/docs/.vuepress/config.js @@ -26,6 +26,7 @@ module.exports = { {title: '简介', path: '/guide/'}, {title: '谁在使用', path: '/guide/briefUsing'}, {title: '技术支持', path: '/guide/briefSupport'}, + {title: '更多案例', path: '/guide/bigScreenCase'}, ] }, { @@ -55,6 +56,7 @@ module.exports = { {title: '大屏报表', path: '/guide/dashboard'}, {title: '表格报表', path: '/guide/execl'}, {title: '导入导出', path: '/guide/importexport'}, + {title: '图表组件', path: '/guide/charts'}, ] }, { diff --git a/doc/docs/guide/charts.md b/doc/docs/guide/charts.md new file mode 100644 index 00000000..a440aa20 --- /dev/null +++ b/doc/docs/guide/charts.md @@ -0,0 +1,188 @@ +## 图表和数据集之间的关系 + +图表和数据集是强关联关系,一个图表需要什么样的数据才能进行展示下面都有说明,以柱状图举例,只能用俩个字段的数据集进行数据展示,那使用数据集有2个以上字段那肯定图表无法正常展示,反之有个数据集是3个字段,那就找能展示3个字段的图表,千万别搞小聪明定了好多个字段的数据集,然后从里面挑几个字段进行展示,不要在么干。
+ +## 文本框 + +![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)
+ +### 数据格式 + +![img1](../picture/charts/img.png)
+ +## 滚动文本 + +同上文本,操作无异
+ +## 超链接 + +![img2](../picture/charts/img_1.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +## 当前时间 + +已支持多种时间格式,其他格式请提Issue
+![img_1.png](../picture/dashboard/img_1.png)
+ +## 图片 + +![img_7.png](../picture/dashboard/img_7.png)
+**注:** 如果没有在bootstrap.yml配置文件中没有正确配置上传下载的路径,这里肯定是失败的
+ +## 视屏 + +**暂不支持循环播放**
+**注意视频的地址应是直接可以访问的,不需要登录之类**
+ +## 表格 + +![img](../picture/dashboard/img_22.png)
+表格字段对应的数据只选择“文本数字”。
+![img14](../picture/dashboard/img_23.png)
+**注意:** 多个字段的时候,需要在“配置-新增”添加你选择数据集所对应的字段,类似于映射关系。
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +## 内联框架 + +当超链接和视频链接无效的时候,请尝试使用内联框架
+ +## 柱状图 + +柱状图数据集对应字典值需要选择一个“X轴”、“柱状”,只需要2个字段
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +![img3](../picture/charts/img_2.png)
+ +## 柱形图-渐变色 + +同上柱形图,颜色调整为支持渐变色
+ +## 折线图 + +折线图数据集对应字典值需要选择一个“X轴”、“折线”,只需要2个字段
+![img_8.png](../picture/dashboard/img_8.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +同上柱形图数据格式
+ +## 柱线图 + +柱线图数据集对应字典值需要选择一个“X轴”、“柱状”、“折线”,需要3个字段
+![img9](../picture/dashboard/img_9.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +![img5](../picture/charts/img_4.png)
+ +## 饼图 + +饼图的数据集选择的时候,只能选择饼图对应的字典,即“Name”、“Value”,不明白可以参考静态数据
+![img8](../picture/charts/img_8.png)
+![img9](../picture/charts/img_9.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +![img6](../picture/charts/img_5.png)
+ +## 漏斗图 + +![img13](../picture/dashboard/img_13.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +和饼图数据格式一致。
+ +## 仪表盘 + +![img21](../picture/dashboard/img_21.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +![img7](../picture/charts/img_6.png)
+ +## 中国地图 + +迁徙图暂不支持动态数据
+ +## 南丁格尔玫瑰图 + +![img71](../picture/charts/img_7.png)
+![img10](../picture/charts/img_10.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +和饼图数据格式保持一致。
+ +## 百分百图 + +![img16](../picture/dashboard/img_16.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +和仪表盘数据格式保持一致。
+ +## 气泡地图 + +气泡地图是中国地图气泡样式展示形式
+气泡地图动态数据集,和饼图一样,对应字典值需要选择一个“Name”、“Value”,且name的字段值要和echarts图表里面的值能对应上,可参考静态数据
+![img15](../picture/dashboard/img_15.png)
+ +## 柱状堆叠图 + +动态的数据集对应字典值需要选择一个“X轴”、“Y轴”、“柱状”,也就是说需要3个字段,不明白可以看看静态数据
+![img.17](../picture/dashboard/img_17.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +## 数据格式 + +![img4](../picture/charts/img_3.png)
+ +## 折线堆叠图 + +动态的数据集对应字典值需要选择一个“X轴”、“Y轴”、“折线”,也就是说需要3个字段,不明白可以看看静态数据
+![img.17](../picture/dashboard/img_17.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +和柱状堆叠图数据格式保持一致。
+ +## 柱状对比图 + +数据集需要3个字段,其中一个作为对比的字段只能为2种值,只有2种值作为对比的字段要选择“y轴字段”字典。因为底层的解析用的是堆叠图的解析,这里的y轴字段并不是指的图表上面的y轴,还请注意,有强迫症可以自行修改源码的解析,剩下的2个字段对应字典看图
+![img18](../picture/dashboard/img_18.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +![img11](../picture/charts/img_11.png)
+ +## 折线对比图 + +数据集需要3个字段,其中一个作为对比的字段只能为2种值,只有2种值作为对比的字段要选择“y轴字段”字典,剩下的字典对应看图
+![img19](../picture/dashboard/img_19.png)
+**注**:如果提示语设置选择“十字形”,请注意需要选择 “X轴颜色、上Y轴颜色、下Y轴颜色”,不然预览图表鼠标选择是全白色,还请注意。
+![img20](../picture/dashboard/img_20.png) +**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +和柱状对比图数据格式一致。
+ +## 装饰饼图 + +装饰用,可单独使用或者配合文本框等图表组件来使整个大屏立体、丰满。
+![img12](../picture/charts/img_12.png)
\ No newline at end of file diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index 5a0ae7af..6cc68f2e 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -13,118 +13,7 @@ ![img_2.png](../picture/dashboard/img_2.png)
## 工具栏 +![img24](../picture/dashboard/img_24.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)
- -### 滚动文本 - -已支持动态数据,请参考文本框的操作
- -### 超链接 - -**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 当前时间 - -已支持多种时间格式,其他格式请提Issue
-![img_1.png](../picture/dashboard/img_1.png)
- -### 图片 - -![img_7.png](../picture/dashboard/img_7.png)
- -### 视屏 - -**暂不支持循环播放**
- -### 内联框架 - -当超链接和视频链接无效的时候,请尝试使用内联框架
- -### 表格 - -![img](../picture/dashboard/img_22.png)
-表格字段对应的数据只选择“文本数字”。
-![img14](../picture/dashboard/img_23.png)
-**注意:** 多个字段的时候,需要在“配置-新增”添加你选择数据集所对应的字段,类似于映射关系。
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 柱状图 - -柱状图数据集对应字典值需要选择一个“X轴”、“柱状”,只需要2个字段
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 柱状堆叠图 - -动态的数据集对应字典值需要选择一个“X轴”、“Y轴”、“柱状”,也就是说需要3个字段,不明白可以看看静态数据
-![img.17](../picture/dashboard/img_17.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 折线堆叠图 - -动态的数据集对应字典值需要选择一个“X轴”、“Y轴”、“折线”,也就是说需要3个字段,不明白可以看看静态数据
-![img.17](../picture/dashboard/img_17.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 折线图 - -折线图数据集对应字典值需要选择一个“X轴”、“折线”,只需要2个字段
-![img_8.png](../picture/dashboard/img_8.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 柱线图 - -柱线图数据集对应字典值需要选择一个“X轴”、“柱状”、“折线”,需要3个字段
-![img9](../picture/dashboard/img_9.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 饼图 - -饼图的数据集选择的时候,只能选择饼图对应的字典,即“Name”、“Value”,不明白可以参考静态数据
-![img10](../picture/dashboard/img_10.png)
-![img11](../picture/dashboard/img_11.png)
-![img12](../picture/dashboard/img_12.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 漏斗图 - -和饼图一样
-![img13](../picture/dashboard/img_13.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 仪表盘 - -数据集只能有一个字段,且字典选择“文本数字”
-![img21](../picture/dashboard/img_21.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 中国地图 - -**注**:气泡地图已支持动态数据,中国地图(迁徙图)暂不支持动态数据
-气泡地图动态数据集,和饼图一样,对应字典值需要选择一个“Name”、“Value”,且name的字段值要和echarts图表里面的值能对应上,可参考静态数据
-![img15](../picture/dashboard/img_15.png)
- -### 百分百图 - -数据集只能有一个字段,且字典选择“文本数字”
-![img16](../picture/dashboard/img_16.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -### 对比图 - -柱状对比图:
-数据集需要3个字段,其中一个作为对比的字段只能为2种值,只有2种值作为对比的字段要选择“y轴字段”字典。因为底层的解析用的是堆叠图的解析,这里的y轴字段并不是指的图表上面的y轴,还请注意,有强迫症可以自行修改源码的解析,剩下的2个字段对应字典看图
-![img18](../picture/dashboard/img_18.png)
-**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** - -折线对比图:
-数据集需要3个字段,其中一个作为对比的字段只能为2种值,只有2种值作为对比的字段要选择“y轴字段”字典,剩下的字典对应看图
-![img19](../picture/dashboard/img_19.png)
-**注**:如果提示语设置选择“十字形”,请注意需要选择 “X轴颜色、上Y轴颜色、下Y轴颜色”,不然预览图表鼠标选择是全白色,还请注意。
-![img20](../picture/dashboard/img_20.png) -**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** +## 图层 +![img25](../picture/dashboard/img_25.png)
diff --git a/doc/docs/guide/quicklyDistribution.md b/doc/docs/guide/quicklyDistribution.md index 065d8689..0503de80 100644 --- a/doc/docs/guide/quicklyDistribution.md +++ b/doc/docs/guide/quicklyDistribution.md @@ -1,6 +1,6 @@ ``` 第一步,下载zip包,解压
- 第二步,conf->bootstrap-dev.yml,修改mysql连接
+ 第二步,conf->bootstrap.yml,修改mysql连接
第三步,启动bin目录下start.sh
第四步,访问 http://localhost:9095 ``` @@ -8,13 +8,12 @@ ## 下载发行版 [下载地址](https://gitee.com/anji-plus/report/releases) :https://gitee.com/anji-plus/report/releases
-![img.png](../picture/quickly/img.png)
+![img.png](../picture/quickly/img_16.png)
## 修改mysql连接 -解压下载好的Zip包,找到bootstrap-dev.yml
-report-core-XXX --> conf --> bootstrap-dev.yml
-![img_1.png](../picture/quickly/img_1.png)
+解压下载好的Zip包,找到bootstrap.yml
+![img_1.png](../picture/quickly/img_17.png)
将图中关于mysql的连接配置信息换成你使用的IP
**注**:aj_report库是存放底层基础信息的库,flyway启动时会自动建立,如果你在这里修改了库,将会出错
@@ -34,6 +33,10 @@ aj-report-XXX --> bin -->sh start.sh
windows启动:
aj-report-XXX --> bin --> start.bat
+ +![img18](../picture/quickly/img_18.png)
+ +如果start.bat启动有问题的话,可以尝试以下方法解决。
修改第4行的JAVA_HOME,改成你自己的JAVA_HOME,并去掉**rem**注释,双击启动
![java.png](../picture/quickly/img_7.png)
**注**:如果你JAVA_HOME目录存在空格,将bat文件最下面的JAVA_HOME添加""号 diff --git a/doc/docs/guide/quicklySource.md b/doc/docs/guide/quicklySource.md index 9277d0ec..d9e1cdee 100644 --- a/doc/docs/guide/quicklySource.md +++ b/doc/docs/guide/quicklySource.md @@ -6,7 +6,7 @@ sh build.sh unzip aj-report-xxxx.zip cd aj-report-xxxx -vim conf/bootstrap-dev.yml 修改数据库连接、上传文件的路径以及地址 +vim conf/bootstrap.yml 修改数据库连接、上传文件的路径以及地址 sh bin/start.sh 访问 @@ -36,8 +36,8 @@ git clone https://gitee.com/anji-plus/report.git
## 修改mysql连接 -解压aj-report-xxxx.zip,找到bootstrap-dev.yml
-![img_1.png](../picture/quickly/img_1.png)
+解压aj-report-xxxx.zip,找到bootstrap.yml
+![img_1.png](../picture/quickly/img_17.png)
将图中关于mysql的连接配置信息换成你使用的IP
**注**:aj_report库是存放底层基础信息的库,flyway启动时会自动建立,如果你在这里修改了库,将会出错
@@ -52,9 +52,12 @@ git clone https://gitee.com/anji-plus/report.git
## 启动 +linux启动:
aj-report-XXX --> bin --> start.sh
sh bin/start.sh
+注意啊,如果你在linux打包,然后在win上执行,要转化start.bat文件的格式,反之也是一样。 + ## 日志位置 看到控制台提示“The AJ-Report started!”,说明report正在启动,可以看看日志以确定程序启动到哪里了。
diff --git a/doc/docs/picture/charts/img.png b/doc/docs/picture/charts/img.png new file mode 100644 index 00000000..a79ca248 Binary files /dev/null and b/doc/docs/picture/charts/img.png differ diff --git a/doc/docs/picture/charts/img_1.png b/doc/docs/picture/charts/img_1.png new file mode 100644 index 00000000..559a4684 Binary files /dev/null and b/doc/docs/picture/charts/img_1.png differ diff --git a/doc/docs/picture/charts/img_10.png b/doc/docs/picture/charts/img_10.png new file mode 100644 index 00000000..3529c67c Binary files /dev/null and b/doc/docs/picture/charts/img_10.png differ diff --git a/doc/docs/picture/charts/img_11.png b/doc/docs/picture/charts/img_11.png new file mode 100644 index 00000000..d65b776b Binary files /dev/null and b/doc/docs/picture/charts/img_11.png differ diff --git a/doc/docs/picture/charts/img_12.png b/doc/docs/picture/charts/img_12.png new file mode 100644 index 00000000..c423915a Binary files /dev/null and b/doc/docs/picture/charts/img_12.png differ diff --git a/doc/docs/picture/charts/img_2.png b/doc/docs/picture/charts/img_2.png new file mode 100644 index 00000000..506977c0 Binary files /dev/null and b/doc/docs/picture/charts/img_2.png differ diff --git a/doc/docs/picture/charts/img_3.png b/doc/docs/picture/charts/img_3.png new file mode 100644 index 00000000..d0f41bb8 Binary files /dev/null and b/doc/docs/picture/charts/img_3.png differ diff --git a/doc/docs/picture/charts/img_4.png b/doc/docs/picture/charts/img_4.png new file mode 100644 index 00000000..53013fe6 Binary files /dev/null and b/doc/docs/picture/charts/img_4.png differ diff --git a/doc/docs/picture/charts/img_5.png b/doc/docs/picture/charts/img_5.png new file mode 100644 index 00000000..a328b25f Binary files /dev/null and b/doc/docs/picture/charts/img_5.png differ diff --git a/doc/docs/picture/charts/img_6.png b/doc/docs/picture/charts/img_6.png new file mode 100644 index 00000000..cb44beed Binary files /dev/null and b/doc/docs/picture/charts/img_6.png differ diff --git a/doc/docs/picture/charts/img_7.png b/doc/docs/picture/charts/img_7.png new file mode 100644 index 00000000..4b2205e8 Binary files /dev/null and b/doc/docs/picture/charts/img_7.png differ diff --git a/doc/docs/picture/charts/img_8.png b/doc/docs/picture/charts/img_8.png new file mode 100644 index 00000000..ed66ea81 Binary files /dev/null and b/doc/docs/picture/charts/img_8.png differ diff --git a/doc/docs/picture/charts/img_9.png b/doc/docs/picture/charts/img_9.png new file mode 100644 index 00000000..2e220283 Binary files /dev/null and b/doc/docs/picture/charts/img_9.png differ diff --git a/doc/docs/picture/dashboard/img_10.png b/doc/docs/picture/dashboard/img_10.png deleted file mode 100644 index d47bfbfb..00000000 Binary files a/doc/docs/picture/dashboard/img_10.png and /dev/null differ diff --git a/doc/docs/picture/dashboard/img_11.png b/doc/docs/picture/dashboard/img_11.png deleted file mode 100644 index 7aa467c6..00000000 Binary files a/doc/docs/picture/dashboard/img_11.png and /dev/null differ diff --git a/doc/docs/picture/dashboard/img_12.png b/doc/docs/picture/dashboard/img_12.png deleted file mode 100644 index fdfbc909..00000000 Binary files a/doc/docs/picture/dashboard/img_12.png and /dev/null differ diff --git a/doc/docs/picture/dashboard/img_24.png b/doc/docs/picture/dashboard/img_24.png new file mode 100644 index 00000000..acc8cb1b Binary files /dev/null and b/doc/docs/picture/dashboard/img_24.png differ diff --git a/doc/docs/picture/dashboard/img_25.png b/doc/docs/picture/dashboard/img_25.png new file mode 100644 index 00000000..f7c0088b Binary files /dev/null and b/doc/docs/picture/dashboard/img_25.png differ diff --git a/doc/docs/picture/quickly/img.png b/doc/docs/picture/quickly/img.png deleted file mode 100644 index 6f6123c3..00000000 Binary files a/doc/docs/picture/quickly/img.png and /dev/null differ diff --git a/doc/docs/picture/quickly/img_1.png b/doc/docs/picture/quickly/img_1.png deleted file mode 100644 index d741757f..00000000 Binary files a/doc/docs/picture/quickly/img_1.png and /dev/null differ diff --git a/doc/docs/picture/quickly/img_16.png b/doc/docs/picture/quickly/img_16.png new file mode 100644 index 00000000..4927dc08 Binary files /dev/null and b/doc/docs/picture/quickly/img_16.png differ diff --git a/doc/docs/picture/quickly/img_17.png b/doc/docs/picture/quickly/img_17.png new file mode 100644 index 00000000..38b90856 Binary files /dev/null and b/doc/docs/picture/quickly/img_17.png differ diff --git a/doc/docs/picture/quickly/img_18.png b/doc/docs/picture/quickly/img_18.png new file mode 100644 index 00000000..5cf8bac9 Binary files /dev/null and b/doc/docs/picture/quickly/img_18.png differ