diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 1b985db..9208d77 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -595,8 +595,10 @@ export default { const { use_money_total,paid_plan_total,money_total_2,money_total_1 } = i let curPlan_total = Math.round(Number(paid_plan_total||0)) + Math.round(Number(use_money_total||0)) return { - value:Number(money_total_2) ? ((( curPlan_total / Number(money_total_2 ||0)) * 10000) / 100).toFixed(2) : - ((( curPlan_total / Number(money_total_1 ||0)) * 10000) / 100).toFixed(2), + + value:plan_rate*100, + // value:Number(money_total_2) ? ((( curPlan_total / Number(money_total_2 ||0)) * 10000) / 100).toFixed(2) : + // ((( curPlan_total / Number(money_total_1 ||0)) * 10000) / 100).toFixed(2), money:parseFloat(curPlan_total).toFixed(2) } }); @@ -604,21 +606,24 @@ export default { let curAct = res?.map(i => { const { use_money_total,money_total_2,money_total_1 } = i return { - value:Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100).toFixed(2) : - (Math.round((Number(use_money_total||0) / Number(money_total_1||0)) * 10000) / 100).toFixed(2), + value:act_rate*100, + // value:Number(money_total_2) ? + // (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100).toFixed(2) : + // (Math.round((Number(use_money_total||0) / Number(money_total_1||0)) * 10000) / 100).toFixed(2), money:parseFloat(use_money_total).toFixed(2) } }); let nextPlan = res?.map(i => { const { use_money_total,use_money_total_next,paid_plan_total_next,money_total_2,money_total_1 } = i - if(Number(paid_plan_total_next)===0){ - return 0 - } + // if(Number(paid_plan_total_next)===0){ + // return 0 + // } let nextPlan_total = Math.round(Number(paid_plan_total_next||0)) + Math.round(Number(use_money_total||0)) return { - value:Number(money_total_2) ? (((nextPlan_total / Number(money_total_2||0)) * 10000) / 100).toFixed(2) : - (((nextPlan_total / Number(money_total_1||0)) * 10000) / 100).toFixed(2), + vaule:plan_rate_next*100, + // value:Number(money_total_2) ? (((nextPlan_total / Number(money_total_2||0)) * 10000) / 100).toFixed(2) : + // (((nextPlan_total / Number(money_total_1||0)) * 10000) / 100).toFixed(2), money:parseFloat(nextPlan_total).toFixed(2) } });