From 7e7f9a89b4993df53fb84b26005c151464986e25 Mon Sep 17 00:00:00 2001 From: qianming Date: Thu, 28 Apr 2022 18:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4--=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/views/screenDesigner/components/temp.vue | 4 ++-- .../config/barCharts/widget-gradient-barchart.js | 2 +- .../{barCharts => barlineCharts}/widget-barlinechart.js | 4 ++-- .../{barCharts => barlineCharts}/widget-more-bar-line.js | 4 ++-- report-ui/src/views/screenDesigner/config/configs.js | 5 +++-- .../screenDesigner/config/percentCharts/widget-gauge.js | 2 +- .../config/percentCharts/widget-pie-percentage.js | 2 +- .../config/pieCharts/widget-pie-nightingale.js | 2 +- .../{barCharts => barlineCharts}/widgetBarlinechart.vue | 0 .../{barCharts => barlineCharts}/widgetMoreBarLineChart.vue | 0 report-ui/src/views/screenDesigner/widget/index.vue | 4 ++-- 11 files changed, 15 insertions(+), 14 deletions(-) rename report-ui/src/views/screenDesigner/config/{barCharts => barlineCharts}/widget-barlinechart.js (99%) rename report-ui/src/views/screenDesigner/config/{barCharts => barlineCharts}/widget-more-bar-line.js (99%) rename report-ui/src/views/screenDesigner/widget/{barCharts => barlineCharts}/widgetBarlinechart.vue (100%) rename report-ui/src/views/screenDesigner/widget/{barCharts => barlineCharts}/widgetMoreBarLineChart.vue (100%) diff --git a/report-ui/src/views/screenDesigner/components/temp.vue b/report-ui/src/views/screenDesigner/components/temp.vue index 18e052f7..3fc31c72 100644 --- a/report-ui/src/views/screenDesigner/components/temp.vue +++ b/report-ui/src/views/screenDesigner/components/temp.vue @@ -25,7 +25,7 @@ import widgetVideo from "../widget/texts/widgetVideo.vue"; import widgetBarchart from "../widget/barCharts/widgetBarchart.vue"; import widgetGradientColorBarchart from "../widget/barCharts/widgetGradientColorBarchart.vue"; import widgetLinechart from "../widget/lineCharts/widgetLinechart.vue"; -import widgetBarlinechart from "../widget/barCharts/widgetBarlinechart"; +import widgetBarlinechart from "../widget/barlineCharts/widgetBarlinechart"; import WidgetPiechart from "../widget/pieCharts/widgetPiechart.vue"; import WidgetFunnel from "../widget/funnelCharts/widgetFunnel.vue"; import WidgetGauge from "../widget/percentCharts/widgetGauge.vue"; @@ -38,7 +38,7 @@ import widgetLineStackChart from "../widget/lineCharts/widgetLineStackChart"; import widgetBarCompareChart from "../widget/barCharts/widgetBarCompareChart"; import widgetLineCompareChart from "../widget/lineCharts/widgetLineCompareChart"; import widgetDecoratePieChart from "../widget/decorateCharts/widgetDecoratePieChart"; -import widgetMoreBarLineChart from "../widget/barCharts/widgetMoreBarLineChart"; +import widgetMoreBarLineChart from "../widget/barlineCharts/widgetMoreBarLineChart"; import widgetWordCloud from "../widget/wordcloudCharts/widgetWordCloud"; import widgetHeatmap from "../widget/heatmap/widgetHeatmap"; diff --git a/report-ui/src/views/screenDesigner/config/barCharts/widget-gradient-barchart.js b/report-ui/src/views/screenDesigner/config/barCharts/widget-gradient-barchart.js index be4efe08..8c2dc926 100644 --- a/report-ui/src/views/screenDesigner/config/barCharts/widget-gradient-barchart.js +++ b/report-ui/src/views/screenDesigner/config/barCharts/widget-gradient-barchart.js @@ -10,7 +10,7 @@ export const widgetGradientBarchart = { code: 'widget-gradient-color-barchart', type: 'barChart', tabName: '柱状图', - label: '柱状图-渐变色', + label: '柱状-渐变色', icon: 'iconzhuzhuangtu', options: { // 配置 diff --git a/report-ui/src/views/screenDesigner/config/barCharts/widget-barlinechart.js b/report-ui/src/views/screenDesigner/config/barlineCharts/widget-barlinechart.js similarity index 99% rename from report-ui/src/views/screenDesigner/config/barCharts/widget-barlinechart.js rename to report-ui/src/views/screenDesigner/config/barlineCharts/widget-barlinechart.js index efe1402e..6fbb3709 100644 --- a/report-ui/src/views/screenDesigner/config/barCharts/widget-barlinechart.js +++ b/report-ui/src/views/screenDesigner/config/barlineCharts/widget-barlinechart.js @@ -8,8 +8,8 @@ */ export const widgetBarlinechart = { code: 'widget-barlinechart', - type: 'barChart', - tabName: '柱状图', + type: 'barlineChart', + tabName: '柱线图', label: '柱线图', icon: 'iconzhuxiantu', options: { diff --git a/report-ui/src/views/screenDesigner/config/barCharts/widget-more-bar-line.js b/report-ui/src/views/screenDesigner/config/barlineCharts/widget-more-bar-line.js similarity index 99% rename from report-ui/src/views/screenDesigner/config/barCharts/widget-more-bar-line.js rename to report-ui/src/views/screenDesigner/config/barlineCharts/widget-more-bar-line.js index 39eeccb0..2760907f 100644 --- a/report-ui/src/views/screenDesigner/config/barCharts/widget-more-bar-line.js +++ b/report-ui/src/views/screenDesigner/config/barlineCharts/widget-more-bar-line.js @@ -8,8 +8,8 @@ */ export const widgetMoreBarLine = { code: 'widgetMoreBarLineChart', - type: 'barChart', - tabName: '柱状图', + type: 'barlineChart', + tabName: '柱线图', label: '多柱线图', icon: 'iconzhuxiantu', options: { diff --git a/report-ui/src/views/screenDesigner/config/configs.js b/report-ui/src/views/screenDesigner/config/configs.js index 84da5814..2ab0d4fe 100644 --- a/report-ui/src/views/screenDesigner/config/configs.js +++ b/report-ui/src/views/screenDesigner/config/configs.js @@ -1,6 +1,7 @@ /** * 文本栏：{type: 'text',tabName: '文本栏'} * 柱状图：{type: 'barChart',tabName: '柱状图'} + * 柱线图：{type: 'barlineChart',tabName: '柱线图'} * 装饰图：{type: 'decorate',tabName: '装饰图'} * 漏斗图：{type: 'funnel',tabName: '漏斗图'} * 热力图：{type: 'heatmap',tabName: '热力图'} @@ -23,7 +24,7 @@ import {widgetVideo} from "./texts/widget-video" import {widgetBarchart} from './barCharts/widget-barchart' import {widgetGradientBarchart} from "./barCharts/widget-gradient-barchart" import {widgetLinechart} from "./lineCharts/widget-linechart" -import {widgetBarlinechart} from "./barCharts/widget-barlinechart" +import {widgetBarlinechart} from "./barlineCharts/widget-barlinechart" import {widgetPiechart} from "./pieCharts/widget-piechart" import {widgetFunnel} from "./funnelCharts/widget-funnel" import {widgetGauge} from "./percentCharts/widget-gauge" @@ -36,7 +37,7 @@ import {widgetLineStack} from "./lineCharts/widget-line-stack" import {widgetBarCompare} from "./barCharts/widget-bar-compare" import {widgetLineCompare} from "./lineCharts/widget-line-compare" import {widgetDecoratePie} from "./decorateCharts/widget-decorate-pie"; -import {widgetMoreBarLine} from "./barCharts/widget-more-bar-line"; +import {widgetMoreBarLine} from "./barlineCharts/widget-more-bar-line"; import {widgetWordCloud} from "./wordcloudCharts/widget-word-cloud"; import {widgetHeatmap} from "./heatmap/widget-heatmap"; diff --git a/report-ui/src/views/screenDesigner/config/percentCharts/widget-gauge.js b/report-ui/src/views/screenDesigner/config/percentCharts/widget-gauge.js index ec31f18a..7a5437f1 100644 --- a/report-ui/src/views/screenDesigner/config/percentCharts/widget-gauge.js +++ b/report-ui/src/views/screenDesigner/config/percentCharts/widget-gauge.js @@ -9,7 +9,7 @@ export const widgetGauge = { code: 'widget-gauge', type: 'percent', - tabName: '百分比图', + tabName: '百分比', label: '仪表盘', icon: 'iconyibiaopan', options: { diff --git a/report-ui/src/views/screenDesigner/config/percentCharts/widget-pie-percentage.js b/report-ui/src/views/screenDesigner/config/percentCharts/widget-pie-percentage.js index f2ae5028..7a0eaee7 100644 --- a/report-ui/src/views/screenDesigner/config/percentCharts/widget-pie-percentage.js +++ b/report-ui/src/views/screenDesigner/config/percentCharts/widget-pie-percentage.js @@ -9,7 +9,7 @@ export const widgetPiePercentage = { code: 'widgetPiePercentageChart', type: 'percent', - tabName: '百分比图', + tabName: '百分比', label: '百分比图', icon: 'iconbaifenbi', options: { diff --git a/report-ui/src/views/screenDesigner/config/pieCharts/widget-pie-nightingale.js b/report-ui/src/views/screenDesigner/config/pieCharts/widget-pie-nightingale.js index 0bc6457c..ad104377 100644 --- a/report-ui/src/views/screenDesigner/config/pieCharts/widget-pie-nightingale.js +++ b/report-ui/src/views/screenDesigner/config/pieCharts/widget-pie-nightingale.js @@ -10,7 +10,7 @@ export const widgetPieNightingale = { code: 'WidgetPieNightingaleRoseArea', type: 'pieChart', tabName: '饼图', - label: '南丁格尔玫瑰图', + label: '南丁格尔', icon: 'iconnandinggeermeiguitu', options: { // 配置 diff --git a/report-ui/src/views/screenDesigner/widget/barCharts/widgetBarlinechart.vue b/report-ui/src/views/screenDesigner/widget/barlineCharts/widgetBarlinechart.vue similarity index 100% rename from report-ui/src/views/screenDesigner/widget/barCharts/widgetBarlinechart.vue rename to report-ui/src/views/screenDesigner/widget/barlineCharts/widgetBarlinechart.vue diff --git a/report-ui/src/views/screenDesigner/widget/barCharts/widgetMoreBarLineChart.vue b/report-ui/src/views/screenDesigner/widget/barlineCharts/widgetMoreBarLineChart.vue similarity index 100% rename from report-ui/src/views/screenDesigner/widget/barCharts/widgetMoreBarLineChart.vue rename to report-ui/src/views/screenDesigner/widget/barlineCharts/widgetMoreBarLineChart.vue diff --git a/report-ui/src/views/screenDesigner/widget/index.vue b/report-ui/src/views/screenDesigner/widget/index.vue index a85090fc..6edb20c4 100644 --- a/report-ui/src/views/screenDesigner/widget/index.vue +++ b/report-ui/src/views/screenDesigner/widget/index.vue @@ -27,7 +27,7 @@ import widgetVideo from "./texts/widgetVideo.vue"; import widgetBarchart from "./barCharts/widgetBarchart.vue"; import widgetGradientColorBarchart from "./barCharts/widgetGradientColorBarchart.vue"; import widgetLinechart from "./lineCharts/widgetLinechart.vue"; -import widgetBarlinechart from "./barCharts/widgetBarlinechart"; +import widgetBarlinechart from "./barlineCharts/widgetBarlinechart"; import WidgetPiechart from "./pieCharts/widgetPiechart.vue"; import WidgetFunnel from "./funnelCharts/widgetFunnel.vue"; import WidgetGauge from "./percentCharts/widgetGauge.vue"; @@ -40,7 +40,7 @@ import widgetLineStackChart from "./lineCharts/widgetLineStackChart"; import widgetBarCompareChart from "./barCharts/widgetBarCompareChart"; import widgetLineCompareChart from "./lineCharts/widgetLineCompareChart"; import widgetDecoratePieChart from "./decorateCharts/widgetDecoratePieChart"; -import widgetMoreBarLineChart from "./barCharts/widgetMoreBarLineChart"; +import widgetMoreBarLineChart from "./barlineCharts/widgetMoreBarLineChart"; import widgetWordCloud from "./wordcloudCharts/widgetWordCloud"; import widgetHeatmap from "./heatmap/widgetHeatmap";