diff --git a/Web/src/views/statisticsV2/modules/DailyTrendChart.vue b/Web/src/views/statisticsV2/modules/DailyTrendChart.vue index c0579e8..f05fc1d 100644 --- a/Web/src/views/statisticsV2/modules/DailyTrendChart.vue +++ b/Web/src/views/statisticsV2/modules/DailyTrendChart.vue @@ -134,7 +134,7 @@ const chartData = computed(() => { label: '支出', data: expenseData, borderColor: '#ff6b6b', - yAxisID: 'yExpense', + yAxisID: 'y', order: 2, backgroundColor: (context) => { const chart = context.chart @@ -152,7 +152,7 @@ const chartData = computed(() => { label: '收入', data: incomeData, borderColor: '#4ade80', - yAxisID: 'yIncome', + yAxisID: 'y', order: 1, backgroundColor: (context) => { const chart = context.chart @@ -175,8 +175,14 @@ const chartOptions = computed(() => { const { chartData: rawData, expenseData, incomeData } = prepareChartData() const maxExpense = Math.max(...expenseData, 0) const maxIncome = Math.max(...incomeData, 0) + const maxValue = Math.max(maxExpense, maxIncome, 0) return getChartOptions({ + layout: { + padding: { + bottom: 6 + } + }, scales: { x: { display: false, @@ -188,23 +194,10 @@ const chartOptions = computed(() => { display: false, grid: { display: false, drawBorder: false }, ticks: { display: false }, - border: { display: false } - }, - yIncome: { - display: false, + border: { display: false }, beginAtZero: true, - suggestedMax: maxIncome ? maxIncome * 1.1 : undefined, - grid: { display: false, drawBorder: false }, - ticks: { display: false }, - border: { display: false } - }, - yExpense: { - display: false, - beginAtZero: true, - suggestedMax: maxExpense ? maxExpense * 1.1 : undefined, - grid: { display: false, drawBorder: false }, - ticks: { display: false }, - border: { display: false } + suggestedMax: maxValue ? maxValue * 1.1 : undefined, + grace: '6%' } }, plugins: { @@ -274,6 +267,6 @@ const chartOptions = computed(() => { .trend-chart { width: 100%; - height: 180px; + height: 190px; } diff --git a/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue b/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue index d7f484a..827d31a 100644 --- a/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue +++ b/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue @@ -241,7 +241,7 @@ const chartData = computed(() => { label: '支出', data: expenseData, borderColor: expenseColor.value, - yAxisID: 'yExpense', + yAxisID: 'y', order: 2, backgroundColor: (context) => { const chart = context.chart @@ -262,7 +262,7 @@ const chartData = computed(() => { label: '收入', data: incomeData, borderColor: incomeColor.value, - yAxisID: 'yIncome', + yAxisID: 'y', order: 1, backgroundColor: (context) => { const chart = context.chart @@ -288,8 +288,14 @@ const chartOptions = computed(() => { const { chartData: rawData, expenseData, incomeData } = prepareChartData() const maxExpense = Math.max(...expenseData, 0) const maxIncome = Math.max(...incomeData, 0) + const maxValue = Math.max(maxExpense, maxIncome, 0) return getChartOptions({ + layout: { + padding: { + bottom: 6 + } + }, scales: { x: { display: false, @@ -301,23 +307,10 @@ const chartOptions = computed(() => { display: false, grid: { display: false, drawBorder: false }, ticks: { display: false }, - border: { display: false } - }, - yIncome: { - display: false, + border: { display: false }, beginAtZero: true, - suggestedMax: maxIncome ? maxIncome * 1.1 : undefined, - grid: { display: false, drawBorder: false }, - ticks: { display: false }, - border: { display: false } - }, - yExpense: { - display: false, - beginAtZero: true, - suggestedMax: maxExpense ? maxExpense * 1.1 : undefined, - grid: { display: false, drawBorder: false }, - ticks: { display: false }, - border: { display: false } + suggestedMax: maxValue ? maxValue * 1.1 : undefined, + grace: '6%' } }, plugins: { @@ -462,7 +455,7 @@ const chartOptions = computed(() => { .trend-chart { width: 100%; - height: 140px; + height: 200px; overflow: hidden; position: relative; }