diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-map.js index 05f80887..7224046e 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-map.js @@ -210,8 +210,8 @@ export const widgetMap = { required: false, placeholder: '', relactiveDom: 'dataType', - chartType: 'widget-piechart', - dictKey: 'MAP_PROPERTIES', + chartType: 'widget-mapline', + dictKey: 'SOUTAR_PROPERTIES', relactiveDomValue: 'dynamicData', value: '', }, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue index 74fd02f8..59d4ec16 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue @@ -418,6 +418,15 @@ export default { }); }, renderingFn(val) { + const series = this.options.series; + series[0]["data"] = this.convertData(val) + series[1]["data"] = this.convertData(val) + series[2]["data"] = val.map(function (dataItem) { + return { + name: dataItem.target, + value: geoCoordMap[dataItem.target].concat([dataItem.value]) + } + }); } } };