From 8105e7412271b1e5d883900ca0839f7df513aebc Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Fri, 17 Apr 2026 14:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=A6=82=E8=A7=88=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operatingLineChart.vue | 2 +- .../operatingSingleBar.vue | 2 +- .../relatedIndicatorsAnalysis.vue | 5 ++++- .../verticalBarChart.vue | 3 +++ .../verticalBarChart.vue | 3 +++ .../verticalBarChart.vue | 3 +++ .../grossMarginComponents/verticalBarChart.vue | 3 +++ .../verticalBarChart.vue | 3 +++ .../verticalBarChart.vue | 3 +++ .../operatingComponents/verticalBarChart.vue | 16 +++------------- .../verticalBarChart.vue | 3 +++ .../verticalBarChart.vue | 3 +++ .../SIMFRMCostAnalysis.vue | 4 ++-- .../home/productionCostAnalysis/combustible.vue | 4 ++-- .../productionCostAnalysis/fuelCostAnalysis.vue | 4 ++-- .../mfgOverheadCostAnalysis.vue | 4 ++-- .../mfgOverheadSingleCostAnalysis.vue | 4 ++-- .../originalSheetCostBase.vue | 4 ++-- .../originalSheetLabor.vue | 4 ++-- .../osElectricityCostAnalysis.vue | 4 ++-- .../productionCostAnalysis/procAuxMatCost.vue | 4 ++-- .../procMfgOverheadCost.vue | 4 ++-- .../productionCostAnalysis/procPackMatCost.vue | 4 ++-- .../processingCostAnalysisBase.vue | 4 ++-- .../productionCostAnalysis/processingFuel.vue | 4 ++-- .../productionCostAnalysis/processingLabor.vue | 4 ++-- .../productionCostAnalysisBase.vue | 4 ++-- .../productionCostAnalysis/singleCombustible.vue | 15 +++++++++++++-- .../singleProcAuxMatCost.vue | 4 ++-- .../singleProcMfgOverheadCost.vue | 4 ++-- .../singleProcessingFuel.vue | 4 ++-- .../dataTrendBar.vue | 2 +- .../monthlyOverview.vue | 6 +++++- .../operatingLineBarSaleSingle.vue | 12 +++++++++++- .../totalOverview.vue | 6 +++++- .../verticalBarChart.vue | 7 +++++++ .../rawSheetYieldComponents/verticalBarChart.vue | 3 +++ .../salesVolumeAnalysis/doublePlatedBase.vue | 4 ++-- .../salesVolumeAnalysis/productionSalesBase.vue | 4 ++-- .../salesVolumeAnalysisBase.vue | 4 ++-- .../monthlyOverview.vue | 6 +++++- .../totalOverview.vue | 6 +++++- .../verticalBarChart.vue | 7 +++++++ .../totalProfitComponents/verticalBarChart.vue | 3 +++ .../monthlyRelatedMetrics.vue | 4 ++-- .../verticalBarChart.vue | 3 +++ 46 files changed, 145 insertions(+), 68 deletions(-) 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 @@