diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js similarity index 99% rename from report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js rename to report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js index 3dae2312..9e5b60e5 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-gradient-barchart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js @@ -8,8 +8,8 @@ */ export const widgetGradientBarchart = { code: 'widget-gradient-color-barchart', - type: 'barlineChart', - tabName: '柱线图', + type: 'barChart', + tabName: '柱状图', label: '柱状图-渐变色', icon: 'iconzhuzhuangtu', options: { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js similarity index 99% rename from report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js rename to report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js index 53ff6fd6..be8b1670 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js @@ -4,8 +4,8 @@ */ export const widgetBarLineStack = { code: 'widgetBarLineStackChart', - type: 'barChart', - tabName: '柱状图', + type: 'barlineCharts', + tabName: '柱线图', label: '柱线堆叠图', icon: 'iconzhuxiantu', options: { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js similarity index 99% rename from report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js rename to report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js index ff7e873e..67a84d64 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-barlinechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js @@ -8,7 +8,7 @@ */ export const widgetBarlinechart = { code: 'widget-barlinechart', - type: 'barlineChart', + type: 'barlineCharts', tabName: '柱线图', label: '柱线图', icon: 'iconzhuxiantu', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js similarity index 99% rename from report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js rename to report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js index b01347c8..1a342782 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineChart/widget-more-bar-line.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js @@ -8,7 +8,7 @@ */ export const widgetMoreBarLine = { code: 'widgetMoreBarLineChart', - type: 'barlineChart', + type: 'barlineCharts', tabName: '柱线图', label: '多柱线图', icon: 'iconzhuxiantu', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js similarity index 99% rename from report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js rename to report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js index 304df48d..6bb72b29 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-radar.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/radarCharts/widget-radar.js @@ -3,8 +3,8 @@ */ export const widgetRadar = { code: 'widget-radar', - type: 'text', - tabName: '文本栏', + type: 'radarCharts', + tabName: '雷达图', label: '雷达图', icon: 'iconleidatu', options: { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js index 496187da..67d41a9a 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js @@ -18,9 +18,9 @@ import { widgetTable } from "./configure/texts/widget-table" import { widgetIframe } from "./configure/texts/widget-iframe" import { widgetUniversal } from "./configure/widget-universal" import { widgetBarchart } from "./configure/barCharts/widget-barchart" -import { widgetGradientBarchart } from "./configure/barlineChart/widget-gradient-barchart" +import { widgetGradientBarchart } from "./configure/barCharts/widget-gradient-barchart" import { widgetLinechart } from "./configure/lineCharts/widget-linechart" -import { widgetBarlinechart } from "./configure/barlineChart/widget-barlinechart" +import { widgetBarlinechart } from "./configure/barlineCharts/widget-barlinechart" import { widgetPiechart } from "./configure/pieCharts/widget-piechart" import { widgetFunnel } from "./configure/funnelCharts/widget-funnel" import { widgetGauge } from "./configure/percentCharts/widget-gauge" @@ -33,11 +33,11 @@ import { widgetLineStack } from "./configure/lineCharts/widget-line-stack" import { widgetBarCompare } from "./configure/barCharts/widget-bar-compare" import { widgetLineCompare } from "./configure/lineCharts/widget-line-compare" import { widgetDecoratePie } from "./configure/decorateCharts/widget-decorate-pie"; -import { widgetMoreBarLine } from "./configure/barlineChart/widget-more-bar-line"; +import { widgetMoreBarLine } from "./configure/barlineCharts/widget-more-bar-line"; import { widgetWordCloud } from "./configure/wordcloudCharts/widget-word-cloud"; import { widgetHeatmap } from "./configure/heatmap/widget-heatmap"; -import { widgetRadar } from "./configure/texts/widget-radar"; -import { widgetBarLineStack } from "./configure/barCharts/widget-bar-line-stack"; +import { widgetRadar } from "./configure/radarCharts/widget-radar"; +import { widgetBarLineStack } from "./configure/barlineCharts/widget-bar-line-stack"; export const widgetTool = [ // type=html类型的组件 diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue similarity index 100% rename from report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarLineStackChart.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue similarity index 100% rename from report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarlinechart.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue similarity index 100% rename from report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetMoreBarLineChart.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue similarity index 100% rename from report-ui/src/views/bigscreenDesigner/designer/widget/widgetFunnel.vue rename to report-ui/src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue index c610e51f..b9507f6b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue @@ -21,10 +21,10 @@ import widgetVideo from "./widgetVideo.vue"; import WidgetIframe from "./widgetIframe.vue"; import widgetBarchart from "./bar/widgetBarchart.vue"; import widgetLinechart from "./line/widgetLinechart.vue"; -import widgetBarlinechart from "./bar/widgetBarlinechart"; +import widgetBarlinechart from "./barline/widgetBarlinechart"; import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue"; import WidgetPiechart from "./pie/widgetPiechart.vue"; -import WidgetFunnel from "./widgetFunnel.vue"; +import WidgetFunnel from "./funnel/widgetFunnel.vue"; import WidgetGauge from "./percent/widgetGauge.vue"; import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRose"; import widgetTable from "./widgetTable.vue"; @@ -36,11 +36,11 @@ import widgetLineStackChart from "./line/widgetLineStackChart"; import widgetBarCompareChart from "./bar/widgetBarCompareChart"; import widgetLineCompareChart from "./line/widgetLineCompareChart"; import widgetDecoratePieChart from "./decorate/widgetDecoratePieChart"; -import widgetMoreBarLineChart from "./bar/widgetMoreBarLineChart"; +import widgetMoreBarLineChart from "./barline/widgetMoreBarLineChart"; import widgetWordCloud from "./wordcloud/widgetWordCloud"; import widgetHeatmap from "./heatmap/widgetHeatmap"; import widgetRadar from "./radar/widgetRadar"; -import widgetBarLineStackChart from "./bar/widgetBarLineStackChart"; +import widgetBarLineStackChart from "./barline/widgetBarLineStackChart"; export default { name: "WidgetTemp", diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue index f1120b2e..621830d4 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widget.vue @@ -33,9 +33,9 @@ import WidgetIframe from "./widgetIframe.vue"; import widgetBarchart from "./bar/widgetBarchart.vue"; import widgetGradientColorBarchart from "./bar/widgetGradientColorBarchart.vue"; import widgetLinechart from "./line/widgetLinechart.vue"; -import widgetBarlinechart from "./bar/widgetBarlinechart"; +import widgetBarlinechart from "./barline/widgetBarlinechart"; import WidgetPiechart from "./pie/widgetPiechart.vue"; -import WidgetFunnel from "./widgetFunnel.vue"; +import WidgetFunnel from "./funnel/widgetFunnel.vue"; import WidgetGauge from "./percent/widgetGauge.vue"; import WidgetPieNightingaleRoseArea from "./pie/widgetPieNightingaleRose"; import widgetTable from "./widgetTable.vue"; @@ -47,11 +47,11 @@ import widgetLineStackChart from "./line/widgetLineStackChart"; import widgetBarCompareChart from "./bar/widgetBarCompareChart"; import widgetLineCompareChart from "./line/widgetLineCompareChart"; import widgetDecoratePieChart from "./decorate/widgetDecoratePieChart"; -import widgetMoreBarLineChart from "./bar/widgetMoreBarLineChart"; +import widgetMoreBarLineChart from "./barline/widgetMoreBarLineChart"; import widgetWordCloud from "./wordcloud/widgetWordCloud"; import widgetHeatmap from "./heatmap/widgetHeatmap"; import widgetRadar from "./radar/widgetRadar"; -import widgetBarLineStackChart from "./bar/widgetBarLineStackChart"; +import widgetBarLineStackChart from "./barline/widgetBarLineStackChart"; export default { name: "Widget",