diff --git a/doc/docs/guide/charts.md b/doc/docs/guide/charts.md index d0cd2113..c6a08a40 100644 --- a/doc/docs/guide/charts.md +++ b/doc/docs/guide/charts.md @@ -6,9 +6,6 @@ ### 文本框 -![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)
#### 数据格式 @@ -60,6 +57,10 @@ ![img42](../picture/charts/img_42.png)
+### 流光直线 + +![img44](../picture/charts/img_44.png)
+ ### 装饰 ![img43](../picture/charts/img_43.png)
@@ -279,6 +280,16 @@ **如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** +### 柱形地图 + +底层解析增加了经纬度,字典值为“地址名称”、“经度坐标”、“维度坐标”、“数值” ,相对于气泡地图可在地图上显示非省会坐标。
+![img45](../picture/charts/img_45.png) + +#### 数据格式 + +可参考静态数据,目前也是全国总览。 +![img46](../picture/charts/img_46.png)
+ ## 词云图 ### 词云图 diff --git a/doc/docs/guide/dataset.md b/doc/docs/guide/dataset.md index d93ff4dc..8a93dfd0 100644 --- a/doc/docs/guide/dataset.md +++ b/doc/docs/guide/dataset.md @@ -149,3 +149,12 @@ function dataTransform(data) { ### 数据预览 针对此次数据集,进行数据预览,尽量不要使用 select * from table
+ +## URL传参 + +写法就是就URL链接后面拼接参数,唯一要注意的就是**参数名**要和数据集配置的**查询参数名**一致,多个参数则用 & 号。 + +例如:原始的大屏链接 +https://xxx.xxx.xxx/index.html#/bigscreen/viewer?reportCode=testForm +假设大屏里面部分数据集查询参数名是 startTime +https://xxx.xxx.xxx/index.html#/bigscreen/viewer?reportCode=testForm&startTime=2023-05-05 diff --git a/doc/docs/picture/charts/img_44.png b/doc/docs/picture/charts/img_44.png new file mode 100644 index 00000000..469263db Binary files /dev/null and b/doc/docs/picture/charts/img_44.png differ diff --git a/doc/docs/picture/charts/img_45.png b/doc/docs/picture/charts/img_45.png new file mode 100644 index 00000000..c1935987 Binary files /dev/null and b/doc/docs/picture/charts/img_45.png differ diff --git a/doc/docs/picture/charts/img_46.png b/doc/docs/picture/charts/img_46.png new file mode 100644 index 00000000..0ca4cc5f Binary files /dev/null and b/doc/docs/picture/charts/img_46.png differ diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-bar-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-bar-map.js index 0db14a7f..4fb215ad 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-bar-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/mapCharts/widget-bar-map.js @@ -410,21 +410,21 @@ export const widgetBarMap = { relactiveDom: 'dataType', relactiveDomValue: 'staticData', value: [ - {name: "北京仓库", latitude: 116.4073, longitude: 39.9041, value: 70,}, - {name: "天津仓库", latitude: 117.2015, longitude: 39.0853, value: 20,}, - {name: "上海仓库", latitude: 121.4648, longitude: 31.2891, value: 150,}, - {name: "重庆仓库", latitude: 107.7539, longitude: 30.1904, value: 75,}, - {name: "河南仓库", latitude: 113.753, longitude: 34.767, value: 83,}, - {name: "云南仓库", latitude: 102.7093, longitude: 25.0464, value: 50,}, - {name: "安徽仓库", latitude: 117.3301, longitude: 31.7345, value: 36,}, - {name: "山东仓库", latitude: 117.0207, longitude: 36.6702, value: 39,}, - {name: "江西仓库", latitude: 115.8165, longitude: 28.6372, value: 23,}, - {name: "青海仓库", latitude: 101.7804, longitude: 36.6225, value: 27,}, - {name: "四川仓库", latitude: 104.0764, longitude: 30.6516, value: 46,}, - {name: "海南仓库", latitude: 110.3487, longitude: 20.0186, value: 16,}, - {name: "西藏仓库", latitude: 91.1174, longitude: 29.6486, value: 31,}, - {name: "宁夏仓库", latitude: 106.2588, longitude: 38.4722, value: 47,}, - {name: "新疆仓库", latitude: 87.6285, longitude: 43.7933, value: 42,}, + {name: "北京", latitude: 116.4073, longitude: 39.9041, value: 70,}, + {name: "天津", latitude: 117.2015, longitude: 39.0853, value: 20,}, + {name: "上海", latitude: 121.4648, longitude: 31.2891, value: 150,}, + {name: "重庆", latitude: 107.7539, longitude: 30.1904, value: 75,}, + {name: "河南", latitude: 113.753, longitude: 34.767, value: 83,}, + {name: "云南", latitude: 102.7093, longitude: 25.0464, value: 50,}, + {name: "安徽", latitude: 117.3301, longitude: 31.7345, value: 36,}, + {name: "山东", latitude: 117.0207, longitude: 36.6702, value: 39,}, + {name: "江西", latitude: 115.8165, longitude: 28.6372, value: 23,}, + {name: "青海", latitude: 101.7804, longitude: 36.6225, value: 27,}, + {name: "四川", latitude: 104.0764, longitude: 30.6516, value: 46,}, + {name: "海南", latitude: 110.3487, longitude: 20.0186, value: 16,}, + {name: "西藏", latitude: 91.1174, longitude: 29.6486, value: 31,}, + {name: "宁夏", latitude: 106.2588, longitude: 38.4722, value: 47,}, + {name: "新疆", latitude: 87.6285, longitude: 43.7933, value: 42,}, ], }, {