diff --git a/doc/docs/guide/charts.md b/doc/docs/guide/charts.md index 7d7abcaf..7e3a2218 100644 --- a/doc/docs/guide/charts.md +++ b/doc/docs/guide/charts.md @@ -1,6 +1,6 @@ ## 图表和数据集之间的关系 -图表和数据集是强关联关系,一个图表需要什么样的数据才能进行展示下面都有说明,以柱状图举例,只能用俩个字段的数据集进行数据展示,那使用数据集有2个以上字段那肯定图表无法正常展示,反之有个数据集是3个字段,那就找能展示3个字段的图表,千万别搞小聪明定了好多个字段的数据集,然后从里面挑几个字段进行展示,不要在么干。
+图表和数据集是强关联关系,一个图表需要什么样的数据才能进行展示下面都有说明,以柱状图举例,只能用俩个字段的数据集进行数据展示,那使用数据集有2个以上字段那肯定图表无法正常展示,反之有个数据集是3个字段,那就找能展示3个字段的图表,千万别搞小聪明定了好多个字段的数据集,然后从里面挑几个字段进行展示,不要这么干。
## 文本框 @@ -42,7 +42,7 @@ ![img](../picture/dashboard/img_22.png)
表格字段对应的数据只选择“文本数字”。
![img14](../picture/dashboard/img_23.png)
-**注意:** 多个字段的时候,需要在“配置-新增”添加你选择数据集所对应的字段,类似于映射关系。
+**注意:** 多个字段的时候,需要在“配置-新增”添加你选择数据集所对应的字段,即“配置”中“表体设置”的“key值”要和你“动态数据对应的字段名”保持一致,类似于映射关系。
**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ## 内联框架 @@ -52,6 +52,7 @@ ## 柱状图 柱状图数据集对应字典值需要选择一个“X轴”、“柱状”,只需要2个字段
+![img_13](../picture/charts/img_13.png)
**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 数据格式 @@ -65,7 +66,7 @@ ## 折线图 折线图数据集对应字典值需要选择一个“X轴”、“折线”,只需要2个字段
-![img_8.png](../picture/dashboard/img_8.png)
+![img14.png](../picture/charts/img_14.png)
**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 数据格式 @@ -74,14 +75,24 @@ ## 柱线图 -柱线图数据集对应字典值需要选择一个“X轴”、“柱状”、“折线”,需要3个字段
-![img9](../picture/dashboard/img_9.png)
+柱线图数据集对应字典值需要选择一个“X轴”、“柱状”、“折线”,需要3个字段,图例名称用 | 进行分隔。
+![img15](../picture/charts/img_15.png)
**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 数据格式 ![img5](../picture/charts/img_4.png)
+## 多柱线图 + +多柱线图对应数据字典需要选择一个“X轴”,剩下的字段可任意选择为“柱状”、“折线”,图例名称用 | 进行分隔。
+![img16](../picture/charts/img_16.png)
+**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** + +### 数据格式 + +![img17](../picture/charts/img_17.png)
+ ## 饼图 饼图的数据集选择的时候,只能选择饼图对应的字典,即“Name”、“Value”,不明白可以参考静态数据
@@ -95,7 +106,7 @@ ## 漏斗图 -![img13](../picture/dashboard/img_13.png)
+![img18](../picture/charts/img_18.png)
**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 数据格式 @@ -127,7 +138,7 @@ ## 百分百图 -![img16](../picture/dashboard/img_16.png)
+![img19](../picture/charts/img_19.png)
**如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** ### 数据格式 diff --git a/doc/docs/picture/charts/img_13.png b/doc/docs/picture/charts/img_13.png new file mode 100644 index 00000000..989e930c Binary files /dev/null and b/doc/docs/picture/charts/img_13.png differ diff --git a/doc/docs/picture/charts/img_14.png b/doc/docs/picture/charts/img_14.png new file mode 100644 index 00000000..d25509a1 Binary files /dev/null and b/doc/docs/picture/charts/img_14.png differ diff --git a/doc/docs/picture/charts/img_15.png b/doc/docs/picture/charts/img_15.png new file mode 100644 index 00000000..c8402895 Binary files /dev/null and b/doc/docs/picture/charts/img_15.png differ diff --git a/doc/docs/picture/charts/img_16.png b/doc/docs/picture/charts/img_16.png new file mode 100644 index 00000000..284cea6d Binary files /dev/null and b/doc/docs/picture/charts/img_16.png differ diff --git a/doc/docs/picture/charts/img_17.png b/doc/docs/picture/charts/img_17.png new file mode 100644 index 00000000..ea50480a Binary files /dev/null and b/doc/docs/picture/charts/img_17.png differ diff --git a/doc/docs/picture/charts/img_18.png b/doc/docs/picture/charts/img_18.png new file mode 100644 index 00000000..e7efbfc0 Binary files /dev/null and b/doc/docs/picture/charts/img_18.png differ diff --git a/doc/docs/picture/charts/img_19.png b/doc/docs/picture/charts/img_19.png new file mode 100644 index 00000000..d4aa954e Binary files /dev/null and b/doc/docs/picture/charts/img_19.png differ diff --git a/doc/docs/picture/dashboard/img_13.png b/doc/docs/picture/dashboard/img_13.png deleted file mode 100644 index ccaca184..00000000 Binary files a/doc/docs/picture/dashboard/img_13.png and /dev/null differ diff --git a/doc/docs/picture/dashboard/img_16.png b/doc/docs/picture/dashboard/img_16.png deleted file mode 100644 index 8f0ab24a..00000000 Binary files a/doc/docs/picture/dashboard/img_16.png and /dev/null differ diff --git a/doc/docs/picture/dashboard/img_8.png b/doc/docs/picture/dashboard/img_8.png deleted file mode 100644 index eaf5956b..00000000 Binary files a/doc/docs/picture/dashboard/img_8.png and /dev/null differ diff --git a/doc/docs/picture/dashboard/img_9.png b/doc/docs/picture/dashboard/img_9.png deleted file mode 100644 index fb052970..00000000 Binary files a/doc/docs/picture/dashboard/img_9.png and /dev/null differ