diff --git a/report-ui/src/mixins/queryform.js b/report-ui/src/mixins/queryform.js index 683a2549..bf7a2e98 100644 --- a/report-ui/src/mixins/queryform.js +++ b/report-ui/src/mixins/queryform.js @@ -129,8 +129,8 @@ export default { return this.stackChartFn(params.chartProperties, data) } else if (chartType == "widget-coord") { return this.coordChartFn(params.chartProperties, data) - } else if (chartType == "widget-mapline") { - return this.maplineChartFn(params.chartProperties, data) + } else if (chartType == "widget-linemap") { + return this.linemapChartFn(params.chartProperties, data) } else { return data } @@ -251,7 +251,7 @@ export default { return ananysicData; }, // 中国地图。路线图数据解析,适合source、target、value - maplineChartFn(chartProperties, data) { + linemapChartFn(chartProperties, data) { const ananysicData = []; for (let i = 0; i < data.length; i++) { const obj = {}; diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js index 9fc7437c..730da101 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js @@ -1,6 +1,6 @@ /* * @Descripttion: 气泡地图json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:35:32 * @LastEditors: qianlishi @@ -20,7 +20,7 @@ export const widgetAirbubbleMap = { name: 'layerName', required: false, placeholder: '', - value: '气泡地图', + value: '中国地图-气泡图', }, { type: 'vue-color', 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 99aa10c5..48e309ff 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 @@ -9,7 +9,7 @@ export const widgetMap = { code: 'widget-map', type: 'chart', - label: '中国地图', + label: '路线地图', icon: 'iconzhongguoditu', options: { setup: [ @@ -19,7 +19,7 @@ export const widgetMap = { name: 'layerName', required: false, placeholder: '', - value: '路线图', + value: '中国地图-路线图', }, { type: 'vue-color', @@ -266,7 +266,7 @@ export const widgetMap = { required: false, placeholder: '', relactiveDom: 'dataType', - chartType: 'widget-mapline', + chartType: 'widget-linemap', 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/map/widgetLineMap.vue similarity index 99% rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue index 7d030820..a6f968c0 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetLineMap.vue @@ -4,7 +4,7 @@