调整--目录结构调整

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";
 

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: {
     // 配置

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: {

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: {

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";
 

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: {

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: {

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: {
     // 配置

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";