From d54f56ad8086c27b228647747acd7fdfe5a0ae3b Mon Sep 17 00:00:00 2001 From: qianming Date: Tue, 8 Nov 2022 16:52:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=B1=E7=BA=BF=E5=9B=BEXY=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=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-compare.js | 116 +++++++++++++----- .../configure/barCharts/widget-barchart.js | 6 +- .../barlineCharts/widget-bar-line-stack.js | 79 +++++++++++- .../barlineCharts/widget-barlinechart.js | 79 +++++++++++- .../barlineCharts/widget-more-bar-line.js | 79 +++++++++++- .../lineCharts/widget-line-compare.js | 94 +++++++------- .../widget/bar/widgetBarCompareChart.vue | 33 ++--- .../barline/widgetBarLineStackChart.vue | 14 ++- .../widget/barline/widgetBarlinechart.vue | 14 ++- .../widget/barline/widgetMoreBarLineChart.vue | 16 ++- .../widget/line/widgetLineCompareChart.vue | 8 +- 11 files changed, 418 insertions(+), 120 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js index 87147012..97762379 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js @@ -268,7 +268,7 @@ export const widgetBarCompare = { list: [ { type: 'el-switch', - label: '显示', + label: '数值显示', name: 'hideXLeft', required: false, placeholder: '', @@ -285,7 +285,7 @@ export const widgetBarCompare = { { type: 'vue-color', label: '数值颜色', - name: 'XcolorLeft', + name: 'colorXLeft', required: false, placeholder: '', value: '#fff', @@ -298,9 +298,21 @@ export const widgetBarCompare = { placeholder: '', value: 14, }, + { + type: 'el-select', + label: '数值位置', + name: 'positionXLeft', + required: false, + placeholder: '', + selectOptions: [ + { code: 'bottom', name: '底部' }, + { code: 'top', name: '顶部' }, + ], + value: 'bottom' + }, { type: 'el-switch', - label: '刻度线', + label: '刻度线显示', name: 'tickLineLeft', require: false, placeholder: '', @@ -308,15 +320,15 @@ export const widgetBarCompare = { }, { type: 'el-switch', - label: 'X轴线', - name: 'xLineLeft', + label: '坐标轴显示', + name: 'lineXLeft', require: false, placeholder: '', value: false, }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorXLeft', required: false, placeholder: '', @@ -324,8 +336,8 @@ export const widgetBarCompare = { }, { type: 'el-switch', - label: '竖分割线', - name: 'SplitLineLeft', + label: '分割线显示', + name: 'isShowSplitLineLeft', require: false, placeholder: '', value: false, @@ -333,7 +345,7 @@ export const widgetBarCompare = { { type: 'vue-color', label: '分割线颜色', - name: 'SplitLineColorLeft', + name: 'splitLineColorLeft', required: false, placeholder: '', value: '#fff', @@ -341,19 +353,35 @@ export const widgetBarCompare = { { type: 'el-input-number', label: '分割线宽度', - name: 'SplitLinefontSizeLeft', + name: 'splitLineFontWidthLeft', required: false, placeholder: '', value: 1, }, { type: 'el-switch', - label: '边框线', + label: '边框线显示', name: 'frameLineLeft', require: false, placeholder: '', value: false, }, + { + type: 'vue-color', + label: '边框线颜色', + name: 'borderColorLeft', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '边框线宽度', + name: 'borderWidthLeft', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -361,7 +389,7 @@ export const widgetBarCompare = { list: [ { type: 'el-switch', - label: '显示', + label: '数值显示', name: 'hideXRight', required: false, placeholder: '', @@ -378,7 +406,7 @@ export const widgetBarCompare = { { type: 'vue-color', label: '数值颜色', - name: 'XcolorRight', + name: 'colorXRight', required: false, placeholder: '', value: '#fff', @@ -391,9 +419,21 @@ export const widgetBarCompare = { placeholder: '', value: 14, }, + { + type: 'el-select', + label: '数值位置', + name: 'positionXRight', + required: false, + placeholder: '', + selectOptions: [ + { code: 'bottom', name: '底部' }, + { code: 'top', name: '顶部' }, + ], + value: 'bottom' + }, { type: 'el-switch', - label: '刻度线', + label: '刻度线显示', name: 'tickLineRight', require: false, placeholder: '', @@ -401,15 +441,15 @@ export const widgetBarCompare = { }, { type: 'el-switch', - label: 'X轴线', - name: 'xLineRight', + label: '坐标轴显示', + name: 'lineXRight', require: false, placeholder: '', value: false, }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorXRight', required: false, placeholder: '', @@ -417,8 +457,8 @@ export const widgetBarCompare = { }, { type: 'el-switch', - label: '竖分割线', - name: 'SplitLineRight', + label: '分割线显示', + name: 'isShowSplitLineRight', require: false, placeholder: '', value: false, @@ -426,7 +466,7 @@ export const widgetBarCompare = { { type: 'vue-color', label: '分割线颜色', - name: 'SplitLineColorRight', + name: 'splitLineColorRight', required: false, placeholder: '', value: '#fff', @@ -434,19 +474,35 @@ export const widgetBarCompare = { { type: 'el-input-number', label: '分割线宽度', - name: 'SplitLinefontSizeRight', + name: 'splitLineFontWidthRight', required: false, placeholder: '', value: 1, }, { type: 'el-switch', - label: '边框线', + label: '边框线显示', name: 'frameLineRight', require: false, placeholder: '', value: false, }, + { + type: 'vue-color', + label: '边框线颜色', + name: 'borderColorRight', + required: false, + placeholder: '', + value: '#fff', + }, + { + type: 'el-input-number', + label: '边框线宽度', + name: 'borderWidthRight', + required: false, + placeholder: '', + value: 1, + }, ], }, { @@ -454,7 +510,7 @@ export const widgetBarCompare = { list: [ { type: 'el-switch', - label: '显示', + label: '数值显示', name: 'hideY', required: false, placeholder: '', @@ -478,20 +534,20 @@ export const widgetBarCompare = { }, { type: 'el-select', - label: '数值对齐', - name: 'textAlign', + label: '数值位置', + name: 'textAlignY', required: false, placeholder: '', selectOptions: [ { code: 'center', name: '居中' }, - { code: 'left', name: '左对齐' }, - { code: 'right', name: '右对齐' }, + { code: 'left', name: '右对齐' }, + { code: 'right', name: '左对齐' }, ], value: 'center' }, { type: 'el-switch', - label: '刻度线', + label: '刻度线显示', name: 'tickLineY', require: false, placeholder: '', @@ -499,7 +555,7 @@ export const widgetBarCompare = { }, { type: 'el-switch', - label: 'Y轴线', + label: '坐标轴显示', name: 'lineY', require: false, placeholder: '', @@ -507,7 +563,7 @@ export const widgetBarCompare = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorY', required: false, placeholder: '', 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 38c59f33..b46aaa79 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 @@ -242,7 +242,7 @@ export const widgetBarchart = { }, { type: 'el-input-number', - label: '文字字号', + label: '数值字号', name: 'fontSizeX', required: false, placeholder: '', @@ -250,7 +250,7 @@ export const widgetBarchart = { }, { type: 'el-input-number', - label: '文字间隔', + label: '数值间隔', name: 'textInterval', required: false, placeholder: '', @@ -258,7 +258,7 @@ export const widgetBarchart = { }, { type: 'el-slider', - label: '文字角度', + label: '数值角度', name: 'textAngleX', required: false, placeholder: '', 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 9aa35961..98001d5d 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 @@ -398,11 +398,11 @@ export const widgetBarLineStack = { ], }, { - name: 'Y轴设置', + name: '左Y轴设置', list: [ { type: 'el-switch', - label: '左显示', + label: '显示', name: 'isShowYLeft', require: false, placeholder: '', @@ -464,14 +464,38 @@ export const widgetBarLineStack = { placeholder: '', value: 0 }, + { + type: 'el-switch', + label: '刻度线显示', + name: 'tickLineYLeft', + require: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '坐标轴显示', + name: 'lineYLeft', + require: false, + placeholder: '', + value: true, + }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYLeft', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthYLeft', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -488,9 +512,22 @@ export const widgetBarLineStack = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineFontWidthYLeft', + required: false, + placeholder: '', + value: 1, + }, + ], + }, + { + name: '右Y轴设置', + list: [ { type: 'el-switch', - label: '右显示', + label: '显示', name: 'isShowYRight', require: false, placeholder: '', @@ -551,14 +588,38 @@ export const widgetBarLineStack = { placeholder: '', value: 0 }, + { + type: 'el-switch', + label: '刻度线显示', + name: 'tickLineYRight', + require: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '坐标轴显示', + name: 'lineYRight', + require: false, + placeholder: '', + value: true, + }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYRight', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthYRight', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -575,6 +636,14 @@ export const widgetBarLineStack = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineFontWidthYRight', + 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 e94078ba..a43e4817 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 @@ -426,11 +426,11 @@ export const widgetBarlinechart = { ], }, { - name: 'Y轴设置', + name: '左Y轴设置', list: [ { type: 'el-switch', - label: '左显示', + label: '显示', name: 'isShowYLeft', require: false, placeholder: '', @@ -492,14 +492,38 @@ export const widgetBarlinechart = { placeholder: '', value: 0 }, + { + type: 'el-switch', + label: '刻度线显示', + name: 'tickLineYLeft', + require: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '坐标轴显示', + name: 'lineYLeft', + require: false, + placeholder: '', + value: true, + }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYLeft', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthYLeft', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -516,9 +540,22 @@ export const widgetBarlinechart = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineFontWidthYLeft', + required: false, + placeholder: '', + value: 1, + }, + ], + }, + { + name: '右Y轴设置', + list: [ { type: 'el-switch', - label: '右显示', + label: '显示', name: 'isShowYRight', require: false, placeholder: '', @@ -579,14 +616,38 @@ export const widgetBarlinechart = { placeholder: '', value: 0 }, + { + type: 'el-switch', + label: '刻度线显示', + name: 'tickLineYRight', + require: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '坐标轴显示', + name: 'lineYRight', + require: false, + placeholder: '', + value: true, + }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYRight', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthYRight', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -603,6 +664,14 @@ export const widgetBarlinechart = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineFontWidthYRight', + 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 06aefdf2..f88870e8 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 @@ -418,11 +418,11 @@ export const widgetMoreBarLine = { ], }, { - name: 'Y轴设置', + name: '左Y轴设置', list: [ { type: 'el-switch', - label: '左显示', + label: '显示', name: 'isShowYLeft', require: false, placeholder: '', @@ -484,14 +484,38 @@ export const widgetMoreBarLine = { placeholder: '', value: 0 }, + { + type: 'el-switch', + label: '刻度线显示', + name: 'tickLineYLeft', + require: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '坐标轴显示', + name: 'lineYLeft', + require: false, + placeholder: '', + value: true, + }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYLeft', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthYLeft', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -508,9 +532,22 @@ export const widgetMoreBarLine = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineFontWidthYLeft', + required: false, + placeholder: '', + value: 1, + }, + ], + }, + { + name: '右Y轴设置', + list: [ { type: 'el-switch', - label: '右显示', + label: '显示', name: 'isShowYRight', require: false, placeholder: '', @@ -571,14 +608,38 @@ export const widgetMoreBarLine = { placeholder: '', value: 0 }, + { + type: 'el-switch', + label: '刻度线显示', + name: 'tickLineYRight', + require: false, + placeholder: '', + value: true, + }, + { + type: 'el-switch', + label: '坐标轴显示', + name: 'lineYRight', + require: false, + placeholder: '', + value: true, + }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYRight', required: false, placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '坐标轴宽度', + name: 'lineWidthYRight', + required: false, + placeholder: '', + value: 1, + }, { type: 'el-switch', label: '分割线显示', @@ -595,6 +656,14 @@ export const widgetMoreBarLine = { placeholder: '', value: '#fff', }, + { + type: 'el-input-number', + label: '分割线宽度', + name: 'splitLineFontWidthYRight', + required: false, + placeholder: '', + value: 1, + }, ], }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js index 0e470f7b..2d7a738c 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js @@ -81,7 +81,7 @@ export const widgetLineCompare = { name: 'lineWidth', required: false, placeholder: '', - value: 2, + value: 10, }, ], }, @@ -324,7 +324,7 @@ export const widgetLineCompare = { }, { type: 'el-input-number', - label: '坐标字号', + label: '坐标名字号', name: 'nameFontSizeX', required: false, placeholder: '', @@ -364,7 +364,7 @@ export const widgetLineCompare = { }, { type: 'el-switch', - label: '刻度线', + label: '刻度线显示', name: 'tickLineX', require: false, placeholder: '', @@ -372,7 +372,7 @@ export const widgetLineCompare = { }, { type: 'el-switch', - label: 'X轴线', + label: '坐标轴显示', name: 'lineX', require: false, placeholder: '', @@ -380,7 +380,7 @@ export const widgetLineCompare = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorX', required: false, placeholder: '', @@ -416,47 +416,47 @@ export const widgetLineCompare = { }, { type: 'el-input-number', - label: '坐标字号', - name: 'namefontSizeYTop', + label: '坐标名字号', + name: 'nameFontSizeYTop', required: false, placeholder: '', value: 14, }, { - type: 'el-switch', - label: '缩放', - name: 'scaleYTop', + type: 'vue-color', + label: '数值颜色', + name: 'colorYTop', required: false, placeholder: '', - value: false, + value: '#fff', }, { type: 'el-input-number', - label: '数值切分', - name: 'splitNumberYTop', + label: '数值字号', + name: 'fontSizeYTop', required: false, placeholder: '', - value: '' + value: 14, }, { - type: 'vue-color', - label: '数值颜色', - name: 'colorYTop', + type: 'el-switch', + label: '缩放', + name: 'scaleYTop', required: false, placeholder: '', - value: '#fff', + value: false, }, { type: 'el-input-number', - label: '数值字号', - name: 'fontSizeYTop', + label: '均分', + name: 'splitNumberYTop', required: false, placeholder: '', - value: 14, + value: '' }, { type: 'el-switch', - label: '刻度线', + label: '刻度线显示', name: 'tickLineYTop', require: false, placeholder: '', @@ -464,7 +464,7 @@ export const widgetLineCompare = { }, { type: 'el-switch', - label: 'y轴线', + label: '坐标轴显示', name: 'lineYTop', require: false, placeholder: '', @@ -472,7 +472,7 @@ export const widgetLineCompare = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYTop', required: false, placeholder: '', @@ -480,7 +480,7 @@ export const widgetLineCompare = { }, { type: 'el-switch', - label: '分割线', + label: '分割线显示', name: 'splitLineYTop', require: false, placeholder: '', @@ -497,7 +497,7 @@ export const widgetLineCompare = { { type: 'el-input-number', label: '分割线宽度', - name: 'splitLinefontSizeYTop', + name: 'splitLineFontWidthYTop', required: false, placeholder: '', value: 1, @@ -532,47 +532,47 @@ export const widgetLineCompare = { }, { type: 'el-input-number', - label: '坐标字号', - name: 'namefontSizeYBottom', + label: '坐标名字号', + name: 'nameFontSizeYBottom', required: false, placeholder: '', value: 14, }, { - type: 'el-switch', - label: '缩放', - name: 'scaleYBottom', + type: 'vue-color', + label: '数值颜色', + name: 'colorYBottom', required: false, placeholder: '', - value: false, + value: '#fff', }, { type: 'el-input-number', - label: '数值切分', - name: 'splitNumberYBottom', + label: '数值字号', + name: 'fontSizeYBottom', required: false, placeholder: '', - value: '' + value: 14, }, { - type: 'vue-color', - label: '数值颜色', - name: 'colorYBottom', + type: 'el-switch', + label: '缩放', + name: 'scaleYBottom', required: false, placeholder: '', - value: '#fff', + value: false, }, { type: 'el-input-number', - label: '数值字号', - name: 'fontSizeYBottom', + label: '均分', + name: 'splitNumberYBottom', required: false, placeholder: '', - value: 14, + value: '' }, { type: 'el-switch', - label: '刻度线', + label: '刻度线显示', name: 'tickLineYBottom', require: false, placeholder: '', @@ -580,7 +580,7 @@ export const widgetLineCompare = { }, { type: 'el-switch', - label: 'y轴线', + label: '坐标轴显示', name: 'lineYBottom', require: false, placeholder: '', @@ -588,7 +588,7 @@ export const widgetLineCompare = { }, { type: 'vue-color', - label: '轴颜色', + label: '坐标轴颜色', name: 'lineColorYBottom', required: false, placeholder: '', @@ -596,7 +596,7 @@ export const widgetLineCompare = { }, { type: 'el-switch', - label: '分割线', + label: '分割线显示', name: 'splitLineYBottom', require: false, placeholder: '', @@ -613,7 +613,7 @@ export const widgetLineCompare = { { type: 'el-input-number', label: '分割线宽度', - name: 'splitLinefontSizeYBottom', + name: 'splitLineFontWidthYBottom', required: false, placeholder: '', value: 1, diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue index 13af828f..d4062b83 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue @@ -314,8 +314,9 @@ export default { type: 'value', show : optionsSetup.hideXLeft, inverse: true, - axisLine: {//X轴线 - show: optionsSetup.xLineLeft, + //X轴线 + axisLine: { + show: optionsSetup.lineXLeft, lineStyle: { color: optionsSetup.lineColorXLeft, }, @@ -323,19 +324,19 @@ export default { axisTick: { show: optionsSetup.tickLineLeft, }, - position: 'bottom', + position: optionsSetup.positionXLeft, axisLabel: { // x轴 show: true, textStyle: { - color: optionsSetup.XcolorLeft, + color: optionsSetup.colorXLeft, fontSize: optionsSetup.fontSizeXLeft } }, splitLine: { // 分割线 - show: optionsSetup.SplitLineLeft, + show: optionsSetup.isShowSplitLineLeft, lineStyle: { - color: optionsSetup.SplitLineColorLeft, - width: optionsSetup.SplitLinefontSizeLeft, + color: optionsSetup.splitLineColorLeft, + width: optionsSetup.splitLineFontWidthLeft, type: 'solid' } } @@ -351,7 +352,7 @@ export default { show : optionsSetup.hideXRight, type: 'value', axisLine: {//X轴线 - show: optionsSetup.xLineRight, + show: optionsSetup.lineXRight, lineStyle: { color: optionsSetup.lineColorXRight, }, @@ -359,19 +360,19 @@ export default { axisTick: { show: optionsSetup.tickLineRight, }, - position: 'bottom', + position: optionsSetup.positionXRight, axisLabel: { // x轴 show: true, textStyle: { - color: optionsSetup.XcolorRight, + color: optionsSetup.colorXRight, fontSize: optionsSetup.fontSizeXRight } }, splitLine: { // 分割线 - show: optionsSetup.SplitLineRight, + show: optionsSetup.isShowSplitLineRight, lineStyle: { - color: optionsSetup.SplitLineColorRight, - width: optionsSetup.SplitLinefontSizeRight, + color: optionsSetup.splitLineColorRight, + width: optionsSetup.splitLineFontWidthRight, type: 'solid' } } @@ -393,7 +394,7 @@ export default { const axisLabel = { show: optionsSetup.hideY, textStyle: { - align: optionsSetup.textAlign, + align: optionsSetup.textAlignY, color: optionsSetup.colorY, fontSize: optionsSetup.fontSizeY, } @@ -461,6 +462,8 @@ export default { const grid = [ {//左 show: optionsSetup.frameLineLeft, + borderColor: optionsSetup.borderColorLeft, + borderWidth: optionsSetup.borderWidthLeft, left: optionsSetup.marginLeftRight, top: optionsSetup.marginTop, bottom: optionsSetup.marginBottom, @@ -476,6 +479,8 @@ export default { }, {//右 show: optionsSetup.frameLineRight, + borderColor: optionsSetup.borderColorRight, + borderWidth: optionsSetup.borderWidthRight, right: optionsSetup.marginLeftRight, top: optionsSetup.marginTop, bottom: optionsSetup.marginBottom, 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 fe031382..01aca685 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -227,16 +227,21 @@ export default { fontSize: optionsSetup.fontSizeYLeft } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYLeft, + }, axisLine: { - show: true, + show: optionsSetup.lineYLeft, lineStyle: { color: optionsSetup.lineColorYLeft, + width: optionsSetup.lineWidthYLeft, } }, splitLine: { show: optionsSetup.isShowSplitLineYLeft, lineStyle: { color: optionsSetup.splitLineColorYLeft, + width: optionsSetup.splitLineFontWidthYLeft, } } }, @@ -263,9 +268,13 @@ export default { fontSize: optionsSetup.fontSizeYRight } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYRight, + }, axisLine: { - show: true, + show: optionsSetup.lineYRight, lineStyle: { + width: optionsSetup.lineWidthYRight, color: optionsSetup.lineColorYRight, } }, @@ -273,6 +282,7 @@ export default { show: optionsSetup.isShowSplitLineYRight, lineStyle: { color: optionsSetup.splitLineColorYRight, + width: optionsSetup.splitLineFontWidthYRight, } } } 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 4e9a4f1a..1f00d441 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue @@ -233,9 +233,13 @@ export default { fontSize: optionsSetup.fontSizeYLeft } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYLeft, + }, axisLine: { - show: true, + show: optionsSetup.lineYLeft, lineStyle: { + width: optionsSetup.lineWidthYLeft, color: optionsSetup.lineColorYLeft, } }, @@ -243,6 +247,7 @@ export default { show: optionsSetup.isShowSplitLineYLeft, lineStyle: { color: optionsSetup.splitLineColorYLeft, + width: optionsSetup.splitLineFontWidthYLeft, } } }, @@ -269,9 +274,13 @@ export default { fontSize: optionsSetup.fontSizeYRight } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYRight, + }, axisLine: { - show: true, + show: optionsSetup.lineYRight, lineStyle: { + width: optionsSetup.lineWidthYRight, color: optionsSetup.lineColorYRight, } }, @@ -279,6 +288,7 @@ export default { show: optionsSetup.isShowSplitLineYRight, lineStyle: { color: optionsSetup.splitLineColorYRight, + width: optionsSetup.splitLineFontWidthYRight, } } } 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 f09aaa96..eb013a40 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue @@ -307,9 +307,13 @@ export default { fontSize: optionsSetup.fontSizeYLeft } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYLeft, + }, axisLine: { - show: true, + show: optionsSetup.lineYLeft, lineStyle: { + width: optionsSetup.lineWidthYLeft, color: optionsSetup.lineColorYLeft } }, @@ -317,6 +321,7 @@ export default { show: optionsSetup.isShowSplitLineYLeft, lineStyle: { color: optionsSetup.splitLineColorYLeft, + width: optionsSetup.splitLineFontWidthYLeft, } } }, @@ -343,16 +348,21 @@ export default { fontSize: optionsSetup.fontSizeYRight } }, + axisTick: { // 刻度 + show: optionsSetup.tickLineYRight, + }, axisLine: { - show: true, + show: optionsSetup.lineYRight, lineStyle: { - color: optionsSetup.lineColorYRight + width: optionsSetup.lineWidthYRight, + color: optionsSetup.lineColorYRight, } }, splitLine: { show: optionsSetup.isShowSplitLineYRight, lineStyle: { color: optionsSetup.splitLineColorYRight, + width: optionsSetup.splitLineFontWidthYRight, } } } diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue index 7a7bb817..8916e3d3 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue @@ -367,7 +367,7 @@ export default { name: optionsSetup.textNameYTop, // 坐标轴名称 nameTextStyle: { color: optionsSetup.nameColorYTop, - fontSize: optionsSetup.namefontSizeYTop + fontSize: optionsSetup.nameFontSizeYTop }, axisLabel: { show: true, @@ -388,7 +388,7 @@ export default { splitLine: { show: optionsSetup.splitLineYTop, lineStyle: { - width: optionsSetup.splitLinefontSizeYTop, + width: optionsSetup.splitLineFontWidthYTop, color: optionsSetup.splitLineColorYTop, }, }, @@ -409,7 +409,7 @@ export default { name: optionsSetup.textNameYBottom, // 坐标轴名称 nameTextStyle: { color: optionsSetup.nameColorYBottom, - fontSize: optionsSetup.namefontSizeYBottom + fontSize: optionsSetup.nameFontSizeYBottom }, inverse: true, // 翻转 axisLabel: { @@ -431,7 +431,7 @@ export default { splitLine: { show: optionsSetup.splitLineYBottom, lineStyle: { - width: optionsSetup.splitLinefontSizeYBottom, + width: optionsSetup.splitLineFontWidthYBottom, color: optionsSetup.splitLineColorYBottom, }, },