diff --git a/README.md b/README.md index 694a963e..c282b849 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,8 @@ bin/start.bat Windows修改第4行的JAVA_HOME后,双击启动 启动后访问 http://serverip:9095 ``` +源码编译部署和发行版部署可参考在线文档
+https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html ## 谁在使用 diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md index 6494fc6c..8a5d34e0 100644 --- a/doc/docs/guide/dashboard.md +++ b/doc/docs/guide/dashboard.md @@ -35,40 +35,55 @@ **存在问题,还在开发中**
### 柱状图 -目前**柱状图-渐变色**图形右侧功能区还在开发调整中
+柱状图数据集对应字典值需要选择一个“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)
** + +### 折线堆叠图 开发中
### 折线图 -**如有问题,请提交 [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)
** ### 柱线图 -**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** +柱线图数据集对应字典值需要选择一个“X轴”、“柱状”、“折线”,需要3个字段
![img9](../picture/dashboard/img_9.png) +**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 饼图 -**如有问题,请提交 [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)
** ### 漏斗图 -**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** +和饼图一样
![img13](../picture/dashboard/img_13.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 仪表盘 -**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** +数据集只能有一个字段,且字典选择“文本数字”
![img14](../picture/dashboard/img_14.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 中国地图 **注**:气泡地图已支持动态数据,中国地图(迁徙图)暂不支持动态数据 +气泡地图动态数据集,和饼图一样,对应字典值需要选择一个“Name”、“Value”,且name的字段值要和echarts图表里面的值能对应上,可参考静态数据
![img15](../picture/dashboard/img_15.png)
+ ### 百分百图 -**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** +数据集只能有一个字段,且字典选择“文本数字”
![img16](../picture/dashboard/img_16.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 热力图 **开发中**
diff --git a/doc/docs/picture/dashboard/img_17.png b/doc/docs/picture/dashboard/img_17.png new file mode 100644 index 00000000..7f0db579 Binary files /dev/null and b/doc/docs/picture/dashboard/img_17.png differ diff --git a/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql b/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql index f8013454..c3dce938 100644 --- a/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql +++ b/report-core/src/main/resources/db/migration/V1.0.10__create_report_share.sql @@ -25,3 +25,15 @@ INSERT INTO `aj_report`.`gaea_dict_item`(`id`, `dict_code`, `item_name`, `item_v INSERT INTO `aj_report`.`gaea_dict_item`(`id`, `dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES (default, 'SHARE_VAILD', '1天', '1', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-18 13:30:39', 'admin', '2021-08-18 13:30:39', 1); INSERT INTO `aj_report`.`gaea_dict_item`(`id`, `dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES (default, 'SHARE_VAILD', '7天', '7', NULL, 1, 'zh', NULL, 3, 'admin', '2021-08-18 13:30:51', 'admin', '2021-08-18 13:30:56', 2); INSERT INTO `aj_report`.`gaea_dict_item`(`id`, `dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES (default, 'SHARE_VAILD', '30天', '30', NULL, 1, 'zh', NULL, 4, 'admin', '2021-08-18 13:31:11', 'admin', '2021-08-18 13:31:11', 1); + + +/*堆叠图数据*/ +INSERT INTO `aj_report_init`.`aj_report_barstack`(`id`, `time`, `type`, `nums`) VALUES (1, '2021-07-27', 'A', 12); +INSERT INTO `aj_report_init`.`aj_report_barstack`(`id`, `time`, `type`, `nums`) VALUES (2, '2021-07-27', 'B', 20); +INSERT INTO `aj_report_init`.`aj_report_barstack`(`id`, `time`, `type`, `nums`) VALUES (3, '2021-07-27', 'C', 11); +INSERT INTO `aj_report_init`.`aj_report_barstack`(`id`, `time`, `type`, `nums`) VALUES (4, '2021-07-26', 'A', 11); +INSERT INTO `aj_report_init`.`aj_report_barstack`(`id`, `time`, `type`, `nums`) VALUES (5, '2021-07-26', 'B', 30); +INSERT INTO `aj_report_init`.`aj_report_barstack`(`id`, `time`, `type`, `nums`) VALUES (6, '2021-07-25', 'B', 20); +INSERT INTO `aj_report_init`.`aj_report_barstack`(`id`, `time`, `type`, `nums`) VALUES (7, '2021-07-25', 'C', 15); + +INSERT INTO `aj_report`.`gaea_report_data_set`(`set_code`, `set_name`, `set_desc`, `source_code`, `dyn_sentence`, `case_result`, `enable_flag`, `delete_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('barstack_ajreport', '柱状堆叠数据', '', 'mysql_ajreport', 'select time,type,nums from aj_report_barstack', '[{\"time\":\"2021-07-27\",\"type\":\"A\",\"nums\":12},{\"time\":\"2021-07-27\",\"type\":\"B\",\"nums\":20},{\"time\":\"2021-07-27\",\"type\":\"C\",\"nums\":11},{\"time\":\"2021-07-26\",\"type\":\"A\",\"nums\":11},{\"time\":\"2021-07-26\",\"type\":\"B\",\"nums\":30},{\"time\":\"2021-07-25\",\"type\":\"B\",\"nums\":20},{\"time\":\"2021-07-25\",\"type\":\"C\",\"nums\":15}]', 1, 0, 'admin', '2021-07-27 19:50:52', 'admin', '2021-08-16 14:08:51', 7); diff --git a/report-ui/src/assets/iconfont/demo_index.html b/report-ui/src/assets/iconfont/demo_index.html index f335efb5..f92c2da9 100644 --- a/report-ui/src/assets/iconfont/demo_index.html +++ b/report-ui/src/assets/iconfont/demo_index.html @@ -54,6 +54,18 @@