|
@@ -57,7 +57,8 @@ export default {
|
|
var data = []
|
|
var data = []
|
|
var optionList = question.optionList;
|
|
var optionList = question.optionList;
|
|
for (var j = 0; j < optionList.length; j++) {
|
|
for (var j = 0; j < optionList.length; j++) {
|
|
- data.push({ genre: optionList[j].content, sold: optionList[j].answerCount })
|
|
|
|
|
|
+ var sold = question.answerTotal == 0 ? 0 : ((optionList[j].answerCount / question.answerTotal) * 100).toFixed(0)
|
|
|
|
+ data.push({ genre: optionList[j].content, sold: parseInt(sold) })
|
|
}
|
|
}
|
|
var conditionQuestion = { data: data, ...question }
|
|
var conditionQuestion = { data: data, ...question }
|
|
this.chartData.push(conditionQuestion);
|
|
this.chartData.push(conditionQuestion);
|
|
@@ -690,10 +691,14 @@ export default {
|
|
for (var y = 0; y < top.length; y++) {
|
|
for (var y = 0; y < top.length; y++) {
|
|
var one = top[y].value;
|
|
var one = top[y].value;
|
|
console.log("one", top[y].name)
|
|
console.log("one", top[y].name)
|
|
|
|
+ var total = 0;
|
|
for (var z = 0; z < one.length; z++) {
|
|
for (var z = 0; z < one.length; z++) {
|
|
var two = one[z];
|
|
var two = one[z];
|
|
|
|
+ var p = total == 0 ? 0 : ((two / total) * 100).toFixed(0)
|
|
if (top[y].title[z] != "total") {
|
|
if (top[y].title[z] != "total") {
|
|
- data.push({ time: top[y].name, type: top[y].title[z], value: two })
|
|
|
|
|
|
+ data.push({ time: top[y].name, type: top[y].title[z], value: two, total: p })
|
|
|
|
+ } else {
|
|
|
|
+ total = two
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|