diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 9504e6b9..6e45aba5 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -4853,7 +4853,7 @@ const widgetTools = [ label: '', name: 'customColor', required: false, - value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }, { color: '#172CCD' }, { color: '#B817CD' }, { color: '#AFCD17' }], + value: [{ color: '#FF801C' }, { color: '#F5FF46' }, { color: '#00FE65' }, { color: '#00FEFF' }, { color: '#ffa800' }] }, ], }, diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue index dd298249..4f6f0fdb 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarchart.vue @@ -152,11 +152,11 @@ export default { } }, splitLine: { - show: optionsCollapse.isShowSplitLineX, - lineStyle: { - color: optionsCollapse.splitLineColorX - }, - }, + show: optionsCollapse.isShowSplitLineX, + lineStyle: { + color: optionsCollapse.splitLineColorX + } + } }; this.options.xAxis = xAxis; }, @@ -189,11 +189,11 @@ export default { } }, splitLine: { - show: optionsCollapse.isShowSplitLineY, - lineStyle: { - color: optionsCollapse.splitLineColorY - }, - }, + show: optionsCollapse.isShowSplitLineY, + lineStyle: { + color: optionsCollapse.splitLineColorY + } + } }; this.options.yAxis = yAxis; @@ -289,7 +289,6 @@ export default { setOptionsData() { const optionsSetup = this.optionsSetup; const optionsData = this.optionsData; // 数据类型 静态 or 动态 - console.log(optionsData); optionsData.dataType == "staticData" ? this.staticDataFn(optionsData.staticData, optionsSetup) : this.dynamicDataFn( diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue index 2f9bf8e2..5a43e532 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue @@ -1,145 +1,144 @@