Compare commits

..

No commits in common. 'daf86f30eed753612ad39e40c791f8b076951995' and 'abbebc370f82fc0f9beddc68cc606e3b0e469164' have entirely different histories.

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

Loading…
Cancel
Save