Commit bda9c83a authored by youjie's avatar youjie

no message

parent f3e9a400
......@@ -73,7 +73,7 @@
<div v-for="(item,index) in commissionratioList.CommissionRateList" :key="index"
class="relative-position">
<el-progress :text-inside="true" :stroke-width="20"
:percentage="setItemProgress(item)"
:percentage="setItemProgress(item,index)"
:status="setItemStatus(item)"
:format="setItemText(item)"
:text-color="(commissionratioList.type==2&&commissionratioList.CommissionProfit>=item.StartValue)||
......@@ -162,15 +162,17 @@
},
methods: {
// 设置进度
setItemProgress(data) {
setItemProgress(data,index) {
let oEndValue
if(index>0) oEndValue = this.commissionratioList.CommissionRateList[index-1].EndValue
//let length = this.commissionratioList.CommissionRateList.length
//let EndValue = this.commissionratioList.CommissionRateList[length-2].EndValue
//let Rate = this.commissionratioList.CommissionRateList[length-1].Rate
if(this.commissionratioList.type==2){
if(this.commissionratioList.CommissionProfit
&&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){
if(data.EndValue==9999) return 100
else return this.commissionratioList.CommissionProfit>25000?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
if(this.commissionratioList.CommissionProfit>oEndValue) return 100
else return this.commissionratioList.CommissionProfit>oEndValue?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
}else{
if(this.commissionratioList.CommissionProfit!=0){
return 100
......@@ -180,11 +182,10 @@
if(this.commissionratioList.type==1
&&this.commissionratioList.AvgLureNum>=data.StartValue
&&this.commissionratioList.AvgLureNum<=data.EndValue){
if(data.EndValue==9999) return 100
if(this.commissionratioList.AvgLureNum>oEndValue) return 100
else return (this.commissionratioList.AvgLureNum/data.EndValue)*100
}else if(this.commissionratioList.type==3&&this.commissionratioList.AvfOrderNum){
if(data.EndValue==9999) return 100
else return (this.commissionratioList.AvfOrderNum/data.StartValue)*100
return (this.commissionratioList.AvfOrderNum/data.StartValue)*100
}else{
if(this.commissionratioList.AvgLureNum>=data.StartValue){
return 100
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment