From 8773ecad0c5b6abbe9516ff7bf76422f25b7c966 Mon Sep 17 00:00:00 2001 From: qianming Date: Tue, 8 Nov 2022 19:00:09 +0800 Subject: [PATCH] =?UTF-8?q?XY=E9=85=8D=E7=BD=AE=E9=A1=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configure/barCharts/widget-bar-stack.js | 50 +++++-- .../configure/barCharts/widget-barchart.js | 44 ++++++- .../barCharts/widget-gradient-barchart.js | 30 ++++- .../barlineCharts/widget-bar-line-stack.js | 30 ++++- .../barlineCharts/widget-barlinechart.js | 30 ++++- .../barlineCharts/widget-more-bar-line.js | 30 ++++- .../tools/configure/heatmap/widget-heatmap.js | 122 +++++++++++------- .../configure/lineCharts/widget-line-stack.js | 50 +++++-- .../configure/lineCharts/widget-linechart.js | 50 +++++-- .../widget/bar/widgetBarStackChart.vue | 12 +- .../designer/widget/bar/widgetBarchart.vue | 12 +- .../bar/widgetGradientColorBarchart.vue | 12 +- .../barline/widgetBarLineStackChart.vue | 6 +- .../widget/barline/widgetBarlinechart.vue | 6 +- .../widget/barline/widgetMoreBarLineChart.vue | 6 +- .../designer/widget/heatmap/widgetHeatmap.vue | 31 +++-- .../widget/line/widgetLineStackChart.vue | 12 +- .../designer/widget/line/widgetLinechart.vue | 12 +- 18 files changed, 397 insertions(+), 148 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js index b88cacec..a0c74d92 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-stack.js @@ -320,7 +320,7 @@ export const widgetBarStack = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -328,7 +328,7 @@ export const widgetBarStack = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -336,7 +336,7 @@ export const widgetBarStack = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -344,7 +344,7 @@ export const widgetBarStack = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', @@ -352,7 +352,7 @@ export const widgetBarStack = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -360,12 +360,20 @@ export const widgetBarStack = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -381,7 +389,15 @@ export const widgetBarStack = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -461,7 +477,7 @@ export const widgetBarStack = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalY', required: false, placeholder: '', @@ -469,12 +485,20 @@ export const widgetBarStack = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorY', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthY', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -491,6 +515,14 @@ export const widgetBarStack = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthY', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js index b46aaa79..673d26f6 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-barchart.js @@ -234,7 +234,7 @@ export const widgetBarchart = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -266,7 +266,7 @@ export const widgetBarchart = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -274,12 +274,20 @@ export const widgetBarchart = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -295,7 +303,15 @@ export const widgetBarchart = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -375,7 +391,7 @@ export const widgetBarchart = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalY', required: false, placeholder: '', @@ -383,12 +399,20 @@ export const widgetBarchart = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorY', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthY', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -405,6 +429,14 @@ export const widgetBarchart = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthY', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js index 97a096b1..17646d3a 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js @@ -226,7 +226,7 @@ export const widgetGradientBarchart = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -234,7 +234,7 @@ export const widgetGradientBarchart = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -242,7 +242,7 @@ export const widgetGradientBarchart = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -250,7 +250,7 @@ export const widgetGradientBarchart = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', @@ -258,7 +258,7 @@ export const widgetGradientBarchart = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -266,12 +266,20 @@ export const widgetGradientBarchart = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -287,7 +295,15 @@ export const widgetGradientBarchart = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js index 98001d5d..47c58a99 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js @@ -333,7 +333,7 @@ export const widgetBarLineStack = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -341,7 +341,7 @@ export const widgetBarLineStack = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -349,7 +349,7 @@ export const widgetBarLineStack = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -357,7 +357,7 @@ export const widgetBarLineStack = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', @@ -365,7 +365,7 @@ export const widgetBarLineStack = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -373,12 +373,20 @@ export const widgetBarLineStack = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -394,7 +402,15 @@ export const widgetBarLineStack = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js index a43e4817..8ea9696d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js @@ -361,7 +361,7 @@ export const widgetBarlinechart = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -369,7 +369,7 @@ export const widgetBarlinechart = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -377,7 +377,7 @@ export const widgetBarlinechart = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -385,7 +385,7 @@ export const widgetBarlinechart = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', @@ -393,7 +393,7 @@ export const widgetBarlinechart = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -401,12 +401,20 @@ export const widgetBarlinechart = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -422,7 +430,15 @@ export const widgetBarlinechart = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js index f88870e8..7b9302c1 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js @@ -353,7 +353,7 @@ export const widgetMoreBarLine = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -361,7 +361,7 @@ export const widgetMoreBarLine = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -369,7 +369,7 @@ export const widgetMoreBarLine = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -377,7 +377,7 @@ export const widgetMoreBarLine = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', @@ -385,7 +385,7 @@ export const widgetMoreBarLine = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -393,12 +393,20 @@ export const widgetMoreBarLine = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -414,7 +422,15 @@ export const widgetMoreBarLine = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js index 201cf15a..77cbb184 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/heatmap/widget-heatmap.js @@ -173,76 +173,84 @@ export const widgetHeatmap = { }, { type: 'el-input-text', - label: 'X轴别名', - name: 'xName', + label: '坐标名', + name: 'nameX', required: false, placeholder: '', value: '' }, { type: 'vue-color', - label: '别名颜色', - name: 'xNameColor', + label: '坐标名颜色', + name: 'nameColorX', required: false, placeholder: '', value: '#fff' }, { type: 'el-input-number', - label: '别名字号', - name: 'xNameFontSize', + label: '坐标名字号', + name: 'nameFontSizeX', required: false, placeholder: '', value: 14 }, { - type: 'el-switch', - label: '轴反转', - name: 'reversalX', + type: 'vue-color', + label: '数值颜色', + name: 'colorX', required: false, placeholder: '', - value: false + value: '#fff', }, { - type: 'el-slider', - label: '文字角度', - name: 'textAngleX', + type: 'el-input-number', + label: '数值字号', + name: 'fontSizeX', required: false, placeholder: '', - value: 0 + value: 14, }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', value: '' }, { - type: 'vue-color', - label: '文字颜色', - name: 'Xcolor', + type: 'el-slider', + label: '数值角度', + name: 'textAngleX', required: false, placeholder: '', - value: '#fff', + value: 0 }, { - type: 'el-input-number', - label: '文字字号', - name: 'fontSizeX', + type: 'el-switch', + label: '坐标轴反转', + name: 'reversalX', required: false, placeholder: '', - value: 14, + value: false }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -258,7 +266,7 @@ export const widgetHeatmap = { }, { type: 'el-input-text', - label: 'Y轴别名', + label: '坐标名', name: 'textNameY', require: false, placeholder: '', @@ -266,59 +274,83 @@ export const widgetHeatmap = { }, { type: 'vue-color', - label: '别名颜色', - name: 'NameColorY', + label: '坐标名颜色', + name: 'nameColorY', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '坐标名字号', + name: 'nameFontSizeY', + required: false, + placeholder: '', + value: 14, + }, + { + type: 'vue-color', + label: '数值颜色', + name: 'colorY', required: false, placeholder: '', value: '#fff', }, { type: 'el-input-number', - label: '别名字号', - name: 'NameFontSizeY', + label: '数值字号', + name: 'fontSizeY', required: false, placeholder: '', value: 14, }, { type: 'el-switch', - label: '轴反转', - name: 'reversalY', + label: '缩放', + name: 'scale', + require: false, + placeholder: '', + value: false, + }, + { + type: 'el-input-number', + label: '均分', + name: 'splitNumberY', required: false, placeholder: '', - value: false + value: '' }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleY', required: false, placeholder: '', value: 0 }, { - type: 'vue-color', - label: '文字颜色', - name: 'colorY', + type: 'el-switch', + label: '坐标轴反转', + name: 'reversalY', required: false, placeholder: '', - value: '#fff', + value: false }, { - type: 'el-input-number', - label: '文字字号', - name: 'fontSizeY', + type: 'vue-color', + label: '坐标轴颜色', + name: 'lineColorY', required: false, placeholder: '', - value: 14, + value: '#fff', }, { - type: 'vue-color', - label: '轴颜色', - name: 'lineColorY', + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthY', required: false, placeholder: '', - value: '#fff', + value: 1, }, ], }, diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js index 39e81407..834672e3 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js @@ -340,7 +340,7 @@ export const widgetLineStack = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -348,7 +348,7 @@ export const widgetLineStack = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -356,7 +356,7 @@ export const widgetLineStack = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -364,7 +364,7 @@ export const widgetLineStack = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', @@ -372,7 +372,7 @@ export const widgetLineStack = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -380,12 +380,20 @@ export const widgetLineStack = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -401,7 +409,15 @@ export const widgetLineStack = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -481,7 +497,7 @@ export const widgetLineStack = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalY', required: false, placeholder: '', @@ -489,12 +505,20 @@ export const widgetLineStack = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorY', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthY', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -511,6 +535,14 @@ export const widgetLineStack = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthY', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js index 5352ee53..50e788a6 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js @@ -250,7 +250,7 @@ export const widgetLinechart = { }, { type: 'vue-color', - label: '文字颜色', + label: '数值颜色', name: 'colorX', required: false, placeholder: '', @@ -258,7 +258,7 @@ export const widgetLinechart = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -266,7 +266,7 @@ export const widgetLinechart = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -274,7 +274,7 @@ export const widgetLinechart = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', @@ -282,7 +282,7 @@ export const widgetLinechart = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalX', required: false, placeholder: '', @@ -290,12 +290,20 @@ export const widgetLinechart = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthX', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -311,7 +319,15 @@ export const widgetLinechart = { required: false, placeholder: '', value: '#fff', - } + }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthX', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -391,7 +407,7 @@ export const widgetLinechart = { }, { type: 'el-switch', - label: '轴反转', + label: '坐标轴反转', name: 'reversalY', required: false, placeholder: '', @@ -399,12 +415,20 @@ export const widgetLinechart = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorY', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthY', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -421,6 +445,14 @@ export const widgetLinechart = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineWidthY', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue index 68a12c37..acf82a5b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarStackChart.vue @@ -153,13 +153,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -196,13 +198,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, splitLine: { show: optionsSetup.isShowSplitLineY, lineStyle: { - color: optionsSetup.splitLineColorY + color: optionsSetup.splitLineColorY, + width: optionsSetup.splitLineWidthY, } } }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue index ff1394a7..21143686 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue @@ -153,13 +153,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -196,13 +198,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, splitLine: { show: optionsSetup.isShowSplitLineY, lineStyle: { - color: optionsSetup.splitLineColorY + color: optionsSetup.splitLineColorY, + width: optionsSetup.splitLineWidthY, } } }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue index 595119f5..02165bce 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue @@ -223,13 +223,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -266,13 +268,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, splitLine: { show: optionsSetup.isShowSplitLineY, lineStyle: { - color: optionsSetup.splitLineColorY + color: optionsSetup.splitLineColorY, + width: optionsSetup.splitLineWidthY, } } }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue index 01aca685..a4a670d5 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -188,13 +188,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue index 1f00d441..cded0c9f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue @@ -194,13 +194,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue index eb013a40..059bb2a4 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue @@ -268,13 +268,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue index ac7c9157..f3cb9f59 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/heatmap/widgetHeatmap.vue @@ -177,10 +177,10 @@ export default { // 坐标轴是否显示 show: optionsSetup.hideX, // 坐标轴名称 - name: optionsSetup.xName, + name: optionsSetup.nameX, nameTextStyle: { - color: optionsSetup.xNameColor, - fontSize: optionsSetup.xNameFontSize + color: optionsSetup.nameColorX, + fontSize: optionsSetup.nameFontSizeX }, // 轴反转 inverse: optionsSetup.reversalX, @@ -192,19 +192,17 @@ export default { rotate: optionsSetup.textAngleX, textStyle: { // 坐标文字颜色 - color: optionsSetup.Xcolor, + color: optionsSetup.colorX, fontSize: optionsSetup.fontSizeX } }, axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, - splitArea: { - show: false, - }, }; this.options.xAxis = xAxis; }, @@ -212,16 +210,19 @@ export default { setOptionsY() { const optionsSetup = this.optionsSetup; const yAxis = { - type: "category", + type: "value", + scale: optionsSetup.scale, + // 均分 + splitNumber: optionsSetup.splitNumberY, // 坐标轴是否显示 show: optionsSetup.isShowY, // 坐标轴名称 name: optionsSetup.textNameY, nameTextStyle: { - color: optionsSetup.NameColorY, - fontSize: optionsSetup.NameFontSizeY + color: optionsSetup.nameColorY, + fontSize: optionsSetup.nameFontSizeY }, - // y轴反转 + // 轴反转 inverse: optionsSetup.reversalY, axisLabel: { show: true, @@ -236,12 +237,10 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, - splitArea: { - show: false, - }, }; this.options.yAxis = yAxis; }, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue index 67319681..8fad663b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue @@ -153,13 +153,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -196,13 +198,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, splitLine: { show: optionsSetup.isShowSplitLineY, lineStyle: { - color: optionsSetup.splitLineColorY + color: optionsSetup.splitLineColorY, + width: optionsSetup.splitLineWidthY, } } }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue index 7048a44b..9ae2ccb4 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue @@ -159,13 +159,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorX + color: optionsSetup.lineColorX, + width: optionsSetup.lineWidthX, } }, splitLine: { show: optionsSetup.isShowSplitLineX, lineStyle: { - color: optionsSetup.splitLineColorX + color: optionsSetup.splitLineColorX, + width: optionsSetup.splitLineWidthX, } } }; @@ -202,13 +204,15 @@ export default { axisLine: { show: true, lineStyle: { - color: optionsSetup.lineColorY + color: optionsSetup.lineColorY, + width: optionsSetup.lineWidthY, } }, splitLine: { show: optionsSetup.isShowSplitLineY, lineStyle: { - color: optionsSetup.splitLineColorY + color: optionsSetup.splitLineColorY, + width: optionsSetup.splitLineWidthY, } } };