diff --git a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barchart.js index a8c784ee..076423ea 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barchart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-barchart.js @@ -147,7 +147,7 @@ export const widgetBarchart = { value: 'rgba(30, 144, 255, 1)' }, { - type: 'el-input-text', + type: 'el-select', label: '字体粗细', name: 'subTextFontWeight', required: false, diff --git a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-funnel.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-funnel.js index 279f7095..f1c9ab6c 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-funnel.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-funnel.js @@ -33,55 +33,12 @@ export const widgetFunnel = { { type: 'el-switch', label: '翻转', - name: 'cending', + name: 'ending', require: false, placeholder: '', value: false, }, [ - { - name: '文字设置', - list: [ - { - type: 'el-switch', - label: '显示', - name: 'isShow', - require: false, - placeholder: '', - value: true, - }, - { - type: 'el-input-number', - label: '字体大小', - name: 'fontSize', - require: false, - placeholder: '', - value: 14, - }, - { - type: 'vue-color', - label: '字体颜色', - name: 'color', - require: false, - placeholder: '', - value: '#fff', - }, - { - type: 'el-select', - label: '字体粗细', - name: 'fontWeight', - require: false, - placeholder: '', - selectOptions: [ - {code: 'normal', name: '正常'}, - {code: 'bold', name: '粗体'}, - {code: 'bolder', name: '特粗体'}, - {code: 'lighter', name: '细体'} - ], - value: 'normal' - }, - ], - }, { name: '标题设置', list: [ @@ -91,7 +48,7 @@ export const widgetFunnel = { name: 'isNoTitle', required: false, placeholder: '', - value: true + value: false, }, { type: 'el-input-text', @@ -99,7 +56,7 @@ export const widgetFunnel = { name: 'titleText', required: false, placeholder: '', - value: '' + value: '', }, { type: 'vue-color', @@ -107,7 +64,7 @@ export const widgetFunnel = { name: 'textColor', required: false, placeholder: '', - value: '' + value: '#FFD700' }, { type: 'el-select', @@ -125,11 +82,11 @@ export const widgetFunnel = { }, { type: 'el-input-number', - label: '字体大小', + label: '字体字号', name: 'textFontSize', required: false, placeholder: '', - value: 12 + value: 20 }, { type: 'el-select', @@ -142,7 +99,7 @@ export const widgetFunnel = { {code: 'left', name: '左对齐'}, {code: 'right', name: '右对齐'}, ], - value: 'left' + value: 'center' }, { type: 'el-input-text', @@ -158,7 +115,7 @@ export const widgetFunnel = { name: 'subTextColor', required: false, placeholder: '', - value: '' + value: 'rgba(30, 144, 255, 1)' }, { type: 'el-select', @@ -176,32 +133,54 @@ export const widgetFunnel = { }, { type: 'el-input-number', - label: '字体大小', + label: '字体字号', name: 'subTextFontSize', required: false, placeholder: '', - value: '' + value: 16 }, ], }, { - name: '提示语设置', + name: '数值设置', list: [ + { + type: 'el-switch', + label: '显示', + name: 'isShow', + require: false, + placeholder: '', + value: true, + }, { type: 'el-input-number', - label: '字体大小', - name: 'tipFontSize', - required: false, + label: '字体字号', + name: 'fontSize', + require: false, placeholder: '', - value: '' + value: 14, }, { type: 'vue-color', - label: '网格线颜色', - name: 'lineColor', - required: false, + label: '字体颜色', + name: 'color', + require: false, placeholder: '', - value: '' + value: '#fff', + }, + { + type: 'el-select', + label: '字体粗细', + name: 'fontWeight', + require: false, + placeholder: '', + selectOptions: [ + {code: 'normal', name: '正常'}, + {code: 'bold', name: '粗体'}, + {code: 'bolder', name: '特粗体'}, + {code: 'lighter', name: '细体'} + ], + value: 'normal' }, ], }, @@ -226,7 +205,7 @@ export const widgetFunnel = { }, { type: 'el-input-number', - label: '字体大小', + label: '字体字号', name: 'lengedFontSize', required: false, placeholder: '', @@ -279,6 +258,27 @@ export const widgetFunnel = { }, ], }, + { + name: '提示语设置', + list: [ + { + type: 'el-input-number', + label: '字体字号', + name: 'tipFontSize', + required: false, + placeholder: '', + value: 14 + }, + { + type: 'vue-color', + label: '字体颜色', + name: 'lineColor', + required: false, + placeholder: '', + value: '' + }, + ], + }, { name: '自定义配色', list: [ diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue index d8c80267..9ef5f5f3 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue @@ -111,7 +111,7 @@ export default { methods: { // 修改图标options属性 editorOptions() { - this.setCending(); + this.setEnding(); this.setOptionsText(); this.setOptionsTitle(); this.setOptionsTooltip(); @@ -120,16 +120,16 @@ export default { this.setOptionsData(); }, // 翻转 - setCending(){ + setEnding() { const optionsSetup = this.optionsSetup; const series = this.options.series; - if (optionsSetup.cending) { + if (optionsSetup.ending) { series[0].sort = "ascending"; } else { series[0].sort = "descending"; } }, - // 文字设置 + // 数值设置 setOptionsText() { const optionsSetup = this.optionsSetup; const normal = { @@ -148,8 +148,8 @@ export default { setOptionsTitle() { const optionsSetup = this.optionsSetup; const title = {}; - title.show = optionsSetup.isNoTitle; title.text = optionsSetup.titleText; + title.show = optionsSetup.isNoTitle; title.left = optionsSetup.textAlign; title.textStyle = { color: optionsSetup.textColor,