diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue index b674067c..1c88d2fa 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue @@ -26,7 +26,10 @@ export default { default: () => [] }, yData: { - required: true, + type: Array, + default: () => [] + }, + series: { type: Array, default: () => [] } @@ -40,7 +43,15 @@ export default { }, methods: { createChart() { - const { title, grid, color, xData, yData } = this + const { title, grid, color, xData, yData, series } = this + const configSeries = (series => { + if (series.length) { + return series.map(item => ({ data: item.data, type: 'bar', barWidth: 15 })) + } else { + return [{ data: yData, type: 'bar', barWidth: 15 }] + } + })(series) + const option = { title: { text: title.text, @@ -104,13 +115,7 @@ export default { show: false } }, - series: [ - { - data: yData, - type: 'bar', - barWidth: 15 - } - ] + series: configSeries } this.jBarChart.setOption(option) } diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue index 131a6b5c..ff3fa32d 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue @@ -1,112 +1,75 @@ - -