diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue index 6121ac7..9f8c992 100644 --- a/src/views/dashboard/LineChart.vue +++ b/src/views/dashboard/LineChart.vue @@ -62,7 +62,7 @@ export default { this.chart = echarts.init(this.$el, 'macarons') this.setOptions(this.chartData) }, - setOptions({expectedData, actualData} = {}) { + setOptions({expectedData, actualData,expedData} = {}) { const week = () =>{ let today = new Date(); let firstDayOfYear = new Date(today.getFullYear(), 0, 1); @@ -77,7 +77,7 @@ export default { } this.chart.setOption({ title: { - text: `第${week()}周`, + text: `第${week()}周产量`, textStyle: { align: 'center', color: '#000', @@ -87,7 +87,7 @@ export default { left: '0%', }, xAxis: { - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], + data: ['2023-12-11', '2023-12-12', '2023-12-13', '2023-12-14', '2023-12-15', '2023-12-16', '2023-12-17'], // boundaryGap: false, axisTick: { show: false @@ -124,7 +124,7 @@ export default { }, series: [ { - name: 'actual1', + name: '订单违约率', type: 'bar', yAxisIndex:1, itemStyle: { @@ -144,7 +144,7 @@ export default { animationEasing: 'quadraticOut' }, { - name: 'actual', + name: '产量', smooth: false, type: 'line', itemStyle: { @@ -159,7 +159,7 @@ export default { } } }, - data: actualData, + data: expedData, animationDuration: 1000, animationEasing: 'quadraticOut' } diff --git a/src/views/dashboard/LineChart1.vue b/src/views/dashboard/LineChart1.vue index f71e915..f292087 100644 --- a/src/views/dashboard/LineChart1.vue +++ b/src/views/dashboard/LineChart1.vue @@ -76,7 +76,7 @@ export default { } this.chart.setOption({ title: { - text: `第${week()}周`, + text: `第${week()}周清单率`, textStyle: { align: 'center', color: '#000', @@ -86,7 +86,7 @@ export default { left: '0%', }, xAxis: { - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], + data: ['2023-12-11', '2023-12-12', '2023-12-13', '2023-12-14', '2023-12-15', '2023-12-16', '2023-12-17'], boundaryGap: false, axisTick: { show: false @@ -117,7 +117,7 @@ export default { series: [ { - name: 'actual', + name: '清单率', smooth: false, type: 'line', itemStyle: { diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 066c91f..8610b0f 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -9,7 +9,7 @@