|
|
|
@ -311,12 +311,7 @@ export default {
|
|
|
|
|
',' +
|
|
|
|
|
yaxisExtFieldId[0] +
|
|
|
|
|
subEle[yaxisExtFieldId[0]]
|
|
|
|
|
ele[key] = subEle[fieldValueName].toFixed(2)
|
|
|
|
|
console.log(1, ele[key])
|
|
|
|
|
if (this.fields[findValueIndex].summary === 'ratio') {
|
|
|
|
|
ele[key] += '%'
|
|
|
|
|
console.log(2, ele[key])
|
|
|
|
|
}
|
|
|
|
|
ele[key] = subEle[fieldValueName]
|
|
|
|
|
rowSum += subEle[fieldValueName]
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
@ -328,11 +323,6 @@ export default {
|
|
|
|
|
) {
|
|
|
|
|
const key = yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
|
|
|
|
|
ele[key] = subEle[fieldValueName]
|
|
|
|
|
ele[key] = subEle[fieldValueName].toFixed(2)
|
|
|
|
|
if (this.fields[findValueIndex].summary === 'ratio') {
|
|
|
|
|
ele[key] += '%'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rowSum += subEle[fieldValueName]
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
@ -368,11 +358,7 @@ export default {
|
|
|
|
|
',' +
|
|
|
|
|
yaxisExtFieldId[0] +
|
|
|
|
|
subEle[yaxisExtFieldId[0]]
|
|
|
|
|
ele[key] = subEle[fieldValueName].toFixed(2)
|
|
|
|
|
if (this.fields[findValueIndex].summary === 'ratio') {
|
|
|
|
|
ele[key] += '%'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ele[key] = subEle[fieldValueName]
|
|
|
|
|
rowSum += subEle[fieldValueName]
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
@ -380,11 +366,7 @@ export default {
|
|
|
|
|
datas.forEach((subEle) => {
|
|
|
|
|
if (ele[xaxisFieldId[0]] === subEle[xaxisFieldId[0]]) {
|
|
|
|
|
const key = yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
|
|
|
|
|
ele[key] = subEle[fieldValueName].toFixed(2)
|
|
|
|
|
if (this.fields[findValueIndex].summary === 'ratio') {
|
|
|
|
|
ele[key] += '%'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ele[key] = subEle[fieldValueName]
|
|
|
|
|
rowSum += subEle[fieldValueName]
|
|
|
|
|
console.log(3, subEle)
|
|
|
|
|
}
|
|
|
|
|