diff --git a/src/views/home/electricityCostAnalysisComponents/operatingLineChart.vue b/src/views/home/electricityCostAnalysisComponents/operatingLineChart.vue index f034abc7..a7bd018f 100644 --- a/src/views/home/electricityCostAnalysisComponents/operatingLineChart.vue +++ b/src/views/home/electricityCostAnalysisComponents/operatingLineChart.vue @@ -127,7 +127,7 @@ export default { validOtherData.forEach(item => { barData.locations.push(item.title); // locations=levelId对应的地名(如levelId=7→宜兴) barData.diff.push(item.diff || 0); - barData.targets.push(item.target || 0); + barData.targets.push(item.budget || 0); barData.reals.push(item.real || 0); barData.rate.push(item.rate || 0); barData.flags.push(item.rate >= 100 ? 1 : 0); diff --git a/src/views/home/electricityCostAnalysisComponents/operatingSingleBar.vue b/src/views/home/electricityCostAnalysisComponents/operatingSingleBar.vue index 2f47c197..46a68e51 100644 --- a/src/views/home/electricityCostAnalysisComponents/operatingSingleBar.vue +++ b/src/views/home/electricityCostAnalysisComponents/operatingSingleBar.vue @@ -50,7 +50,7 @@ export default { }, { value: this.detailData?.real || 0, - flag: this.detailData?.rate>=100, // 实际项:达标(绿色) + flag: this.detailData?.flag || 0, // 实际项:达标(绿色) label: { show: true, position: 'top', diff --git a/src/views/home/electricityCostAnalysisComponents/relatedIndicatorsAnalysis.vue b/src/views/home/electricityCostAnalysisComponents/relatedIndicatorsAnalysis.vue index c6c21384..0d0e43ca 100644 --- a/src/views/home/electricityCostAnalysisComponents/relatedIndicatorsAnalysis.vue +++ b/src/views/home/electricityCostAnalysisComponents/relatedIndicatorsAnalysis.vue @@ -80,7 +80,10 @@ export default { const data = list.find(item => item && item.title === def.name) || fallback return { ...def, - data, + data:{ + ...data, + flag:data.rate >= 100 ? 1 : 0 + }, sortValue: Number((data && data.real) ?? 0) } }) diff --git a/src/views/home/electricityCostAnalysisComponents/verticalBarChart.vue b/src/views/home/electricityCostAnalysisComponents/verticalBarChart.vue index 6a72b359..c8a1d6e3 100644 --- a/src/views/home/electricityCostAnalysisComponents/verticalBarChart.vue +++ b/src/views/home/electricityCostAnalysisComponents/verticalBarChart.vue @@ -1,5 +1,8 @@