diff --git a/screen-vue/src/views/desktop/screen/Erp/components/ChartV07.vue b/screen-vue/src/views/desktop/screen/Erp/components/ChartV07.vue index 46ef3ee..eae1f9a 100644 --- a/screen-vue/src/views/desktop/screen/Erp/components/ChartV07.vue +++ b/screen-vue/src/views/desktop/screen/Erp/components/ChartV07.vue @@ -283,14 +283,14 @@ function initChart() { const netProfitYuan = vList.value.map(item => (Number(item.index01 || 0) - Number(item.index02 || 0)).toFixed(2)) const incomeRingRatio = vList.value.map((item, idx) => { - const lastVal = lastMonthIncomeYuan[idx] || 1 + const lastVal = lastMonthIncomeYuan[idx] const currVal = incomeYuan[idx] || 0 - return ((currVal - lastVal) / lastVal * 100).toFixed(2) + return lastVal === 0 ? '0.00' : ((currVal - lastVal) / lastVal * 100).toFixed(2) }) const expenseRingRatio = vList.value.map((item, idx) => { - const lastVal = lastMonthExpenseYuan[idx] || 1 + const lastVal = lastMonthExpenseYuan[idx] const currVal = expenseYuan[idx] || 0 - return ((currVal - lastVal) / lastVal * 100).toFixed(2) + return lastVal === 0 ? '0.00' : ((currVal - lastVal) / lastVal * 100).toFixed(2) }) const incomeWan = incomeYuan.map(val => (val / 10000).toFixed(2)) @@ -308,22 +308,22 @@ function initChart() { 本月收入(元) 本月支出(元) - 本月占比(%) 上月收入(元) 上月支出(元) - 本月净利润(元) 收入环比(%) 支出环比(%) + 占比(%) + 净利润(元) ${incomeYuan[idx]} ${expenseYuan[idx]} - ${rate[idx]} ${lastMonthIncomeYuan[idx]} ${lastMonthExpenseYuan[idx]} - ${netProfitYuan[idx]} ${incomeRingRatio[idx]} ${expenseRingRatio[idx]} + ${rate[idx]} + ${netProfitYuan[idx]} `