diff --git a/report-ui/src/mixins/queryform.js b/report-ui/src/mixins/queryform.js index 51ae970..db79240 100644 --- a/report-ui/src/mixins/queryform.js +++ b/report-ui/src/mixins/queryform.js @@ -212,7 +212,7 @@ export default { if(seriesCapacityData.length>0){ series.push({ - type:'line', + type:'bar', name:'容量', data:seriesCapacityData }) diff --git a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-bar-line-chart.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-bar-line-chart.js index 89234b6..1ef2d16 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-bar-line-chart.js +++ b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/monitorConfigJson/monitor-custom-bar-line-chart.js @@ -724,7 +724,7 @@ export const monitorCustomBarLineChart = { label: '', name: 'customColor', required: false, - value: [{color: '#3b91ff'}, {color: '#2c2f90'}, {color: '#ff1111'}], + value: [{color: '#FF795D'}, {color: '#24AAFF'}, {color: '#ff1111'}], }, ], }, diff --git a/report-ui/src/views/report/bigscreen/designer/widget/monitor/customBarLineChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/monitor/customBarLineChart.vue index 97944ba..00490fc 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/monitor/customBarLineChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/monitor/customBarLineChart.vue @@ -89,7 +89,7 @@ export default { }, { name: "", - type: "line", + type: "bar", yAxisIndex: 1, data: [], itemStyle: {} @@ -621,6 +621,7 @@ export default { barBorderRadius: null } item.barMinHeight=2; + item.stack='total'; //切换页面后bar的宽度改变 item.barWidth = this.optionsSetup.maxWidth; }else if(item.type=='line'){