|
|
|
@ -48,10 +48,9 @@ Component({
|
|
|
|
|
let pd=res.sex.length==1
|
|
|
|
|
// res.forEach(ele => {
|
|
|
|
|
// })
|
|
|
|
|
if(!pd){
|
|
|
|
|
for(let i=0;i<res.region.length;i++){
|
|
|
|
|
regionSum+=res.region[i].value
|
|
|
|
|
console.log(regionSum)
|
|
|
|
|
// console.log(regionSum)
|
|
|
|
|
}
|
|
|
|
|
for(let i=0;i<res.region.length/2;i++){
|
|
|
|
|
rName1.push(res.region[i].key ||'')
|
|
|
|
@ -61,28 +60,26 @@ Component({
|
|
|
|
|
rName2.push(res.region[i].key)
|
|
|
|
|
rValue2.push(res.region[i].value)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for(let i=0;i<3;i++){
|
|
|
|
|
if(!pd){
|
|
|
|
|
sexSum+=sex[i].value
|
|
|
|
|
attestationSum+=attestation[i].value
|
|
|
|
|
}
|
|
|
|
|
attestationSum+=attestation[i].value
|
|
|
|
|
}
|
|
|
|
|
for(let i=0;i<3;i++){
|
|
|
|
|
if(!pd){
|
|
|
|
|
sexAccounted.push(((sex[i].value/sexSum)*100).toFixed(2))
|
|
|
|
|
attestationAccounted.push(((attestation[i].value/attestationSum)*100).toFixed(2))
|
|
|
|
|
sexList.push({name:sex[i].key,value:sex[i].value,color:color[i],accounted:sexAccounted[i]})
|
|
|
|
|
attestationList.push({name:attestation[i].key,value:attestation[i].value,color:color[i],accounted:attestationAccounted[i]})
|
|
|
|
|
}
|
|
|
|
|
sexAccounted.push(((sex[i].value/sexSum)*100).toFixed(2))
|
|
|
|
|
attestationAccounted.push(((attestation[i].value/attestationSum)*100).toFixed(2))
|
|
|
|
|
sexList.push({name:sex[i].key,value:sex[i].value,color:color[i],accounted:sexAccounted[i]})
|
|
|
|
|
attestationList.push({name:attestation[i].key,value:attestation[i].value,color:color[i],accounted:attestationAccounted[i]})
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
console.log(rName1,rValue1,regionSum)
|
|
|
|
|
console.log(rName2,rValue2,regionSum)
|
|
|
|
|
this.setData({
|
|
|
|
|
sexList:pd?[]:sexList,
|
|
|
|
|
attestationList:pd?[]:attestationList,
|
|
|
|
|
sexOption:pd?pieOption([],'#fff'):pieOption(color,sex),
|
|
|
|
|
attestationOption:pd?pieOption():pieOption(color,attestation),
|
|
|
|
|
regionOption1:pd?pictographicOption():pictographicOption(rName1,rValue1,regionSum),
|
|
|
|
|
regionOption2:pd?pictographicOption():pictographicOption(rName2,rValue2,regionSum),
|
|
|
|
|
sexList:sexList,
|
|
|
|
|
attestationList:attestationList,
|
|
|
|
|
sexOption:pieOption(color,sex),
|
|
|
|
|
attestationOption:pieOption(color,attestation),
|
|
|
|
|
regionOption1:pictographicOption(rName1,rValue1,regionSum),
|
|
|
|
|
regionOption2:pictographicOption(rName2,rValue2,regionSum),
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
setTimeout(() =>{
|
|
|
|
|