diff --git a/src/views/report/components/produceLineYieldBarTarget.vue b/src/views/report/components/produceLineYieldBarTarget.vue
index 3138e68..fcbd44d 100644
--- a/src/views/report/components/produceLineYieldBarTarget.vue
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -1,7 +1,7 @@
@@ -56,7 +56,7 @@ export default {
var res = ``;
// for (var i = 0, l = params.length; i < l; i++) {
// console.log()
- if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量') {
+ if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量' || params[0].axisValue === '芯片总功率' || params[0].axisValue === '标准组件总功率') {
res +=
`` +
`${params[0].axisValueLabel}` +
@@ -79,7 +79,7 @@ export default {
: params[1].name === "转化效率"
? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
: params[1].seriesName.search('总功率') != -1
- ? (params[i].value ? params[1].value : 0) + "MW"
+ ? (params[1].value ? params[1].value : 0) + "MW"
: (params[1].value ? params[1].value : 0) + "片"
}`;
}
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 9e76ce9..fa4abab 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -674,6 +674,18 @@ export default {
})
}
}
+ this.chartMsg.series[0].data.push({
+ name: '芯片总功率',
+ value: dataArr[0]['dayData'] === 0 ? null : dataArr[0]['dayData']
+ })
+ this.chartMsg.series[1].data.push({
+ name: '标准组件总功率',
+ value: dataArr[1]['dayData'] === 0 ? null : dataArr[1]['dayData']
+ })
+ this.chartMsg.series[2].data.push({
+ name: '转化效率',
+ value: dataArr[2]['dayData'] === 0 ? null : dataArr[2]['dayData']
+ })
} else {
this.chartMsgYearTarget.series[0].data = []
this.chartMsgYearTarget.series[1].data = []