diff --git a/src/views/home/productionCostAnalysis/procPackMatCost.vue b/src/views/home/productionCostAnalysis/procPackMatCost.vue index 8fd36491..523f65e0 100644 --- a/src/views/home/productionCostAnalysis/procPackMatCost.vue +++ b/src/views/home/productionCostAnalysis/procPackMatCost.vue @@ -180,12 +180,12 @@ export default { // 调用接口 getSingleMaterialCostAnalysis(requestParams).then((res) => { this.monData = res.data.currentMonthData.find(item => { - return item.name === "包材成本"; + return item.name === "加工包材成本"; }); console.log('this.monData', this.monData); this.totalData = res.data.totalMonthData.find(item => { - return item.name === "包材成本"; + return item.name === "加工包材成本"; }); this.relatedData.total =res.data.totalMonthData, this.relatedData.current= res.data.currentMonthData diff --git a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue index 78103f90..526a96ec 100644 --- a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue +++ b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue @@ -197,7 +197,7 @@ export default { getSingleMaterialAnalysis(requestParams).then((res) => { this.monData = res.data.currentMonthData.find(item => { if (this.fuelName === '电') { - return item.name === '原片' + this.fuelName + '成本'; + return item.name === '加工' + this.fuelName + '成本'; }else{ return item.name === this.fuelName + '成本'; } @@ -206,7 +206,7 @@ export default { this.totalData = res.data.totalMonthData.find(item => { if (this.fuelName === '电') { - return item.name === '原片' + this.fuelName + '成本'; + return item.name === '加工' + this.fuelName + '成本'; }else{ return item.name === this.fuelName + '成本'; } @@ -215,22 +215,19 @@ export default { this.relatedData = { relatedMon: res.data.currentMonthData.filter(item => { if (this.fuelName === '电') { - return item.name !== '原片' + this.fuelName + '成本'; + return item.name !== '加工' + this.fuelName + '成本'; }else{ return item.name !== this.fuelName + '成本'; } }), // 兜底月度数据 relatedTotal: res.data.totalMonthData.filter(item => { if (this.fuelName === '电') { - return item.name !== '原片' + this.fuelName + '成本'; + return item.name !== '加工' + this.fuelName + '成本'; }else{ return item.name !== this.fuelName + '成本'; } }) // 兜底累计数据 - } - - ; - + }; this.trend = res.data.dataTrend }); }, diff --git a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue index 92c3c2f3..88466bbd 100644 --- a/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue +++ b/src/views/home/productionCostAnalysisComponents/dataTrendProcessingLabor.vue @@ -89,9 +89,9 @@ export default { relatedData: { handler(newVal) { if (this.currentTab === 'month') { - this.activeData = newVal.relatedMon || []; + this.activeData = newVal.current || []; }else{ - this.activeData = newVal.relatedTotal || []; + this.activeData = newVal.total || []; } }, immediate: true, // 组件挂载时立即执行 diff --git a/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue b/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue index 0ee9e1a1..4cadbf1a 100644 --- a/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue +++ b/src/views/home/productionCostAnalysisComponents/relatedIndicatorsAnalysis.vue @@ -73,7 +73,7 @@ export default { { key: 'fuelCost', name: '燃料成本',label:'原片燃料成本', unit: '元/㎡', route: 'combustible/combustible'}, { key: 'electricityCost', name: '电成本',label:'原片电成本', unit: '元/㎡', route: 'osElectricityCostAnalysis'}, { key: 'laborCost', name: '人工成本',label:'人工成本', unit: '元/㎡', route: 'originalSheetLabor'}, - { key: 'manufacturingCost', name: '制造成本',label:'制造成本', unit: '元/㎡', route: 'mfgOverheadCostAnalysis/mfgOverheadCostAnalysis'}, + { key: 'manufacturingCost', name: '制造费用',label:'制造费用', unit: '元/㎡', route: 'mfgOverheadCostAnalysis/mfgOverheadCostAnalysis'}, ] }, indicators() {