diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js index 69f00877..83c24aa9 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/percentCharts/widget-gauge.js @@ -233,6 +233,14 @@ export const widgetGauge = { placeholder: '', value: 0, }, + { + type: 'vue-color', + label: '颜色', + name: 'labelColor', + required: false, + placeholder: '', + value: '#fff', + }, { type: 'el-input-number', label: '字号', @@ -242,12 +250,31 @@ export const widgetGauge = { value: 10, }, { - type: 'vue-color', - label: '颜色', - name: 'labelColor', + type: 'el-select', + label: '字体粗细', + name: 'labelFontWeight', required: false, placeholder: '', - value: '#fff', + selectOptions: [ + { code: 'normal', name: '正常' }, + { code: 'bold', name: '粗体' }, + { code: 'bolder', name: '特粗体' }, + { code: 'lighter', name: '细体' } + ], + value: 'normal' + }, + { + type: 'el-select', + label: '字体风格', + name: 'labelFontStyle', + required: false, + placeholder: '', + selectOptions: [ + { code: 'normal', name: '正常' }, + { code: 'italic', name: 'italic斜体' }, + { code: 'oblique', name: 'oblique斜体' }, + ], + value: 'normal' }, ] }, @@ -257,7 +284,7 @@ export const widgetGauge = { { type: 'vue-color', label: '颜色', - name: 'labelColor', + name: 'detailColor', required: false, placeholder: '', value: '#fff', @@ -265,7 +292,7 @@ export const widgetGauge = { { type: 'el-input-number', label: '字号', - name: 'labelFontSize', + name: 'detailFontSize', require: false, placeholder: '', value: 14, @@ -273,7 +300,7 @@ export const widgetGauge = { { type: 'el-select', label: '字体粗细', - name: 'labelFontWeight', + name: 'detailFontWeight', required: false, placeholder: '', selectOptions: [ @@ -284,6 +311,19 @@ export const widgetGauge = { ], value: 'normal' }, + { + type: 'el-select', + label: '字体风格', + name: 'detailFontStyle', + required: false, + placeholder: '', + selectOptions: [ + { code: 'normal', name: '正常' }, + { code: 'italic', name: 'italic斜体' }, + { code: 'oblique', name: 'oblique斜体' }, + ], + value: 'normal' + }, ] }, ], diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue index bd87eda0..977051fe 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/percent/widgetGauge.vue @@ -1,11 +1,12 @@