diff --git a/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue b/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue index 21faba80..bd540d0c 100644 --- a/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue +++ b/src/views/home/productionCostAnalysis/mfgOverheadSingleCostAnalysis.vue @@ -180,7 +180,7 @@ export default { startTime: this.dateData.startTime, endTime: this.dateData.endTime, trendName: this.trendName, - analysisObject: [this.overheadName], + analysisObject: ['原片'+this.overheadName], levelId: this.factory, isOriginal:0,//0:原片 1:加工 }; diff --git a/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue b/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue index bb2c65f0..c37ecf0e 100644 --- a/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue +++ b/src/views/home/productionCostAnalysis/singleProcMfgOverheadCost.vue @@ -166,7 +166,7 @@ export default { const requestParams = { startTime: this.dateData.startTime, endTime: this.dateData.endTime, - trendName: this.overheadName+'成本', + trendName: '加工'+this.overheadName+'成本', analysisObject: ['加工制造费用成本'], levelId: this.factory, isOriginal:1,//0:原片 1:加工 diff --git a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue index 526a96ec..71525927 100644 --- a/src/views/home/productionCostAnalysis/singleProcessingFuel.vue +++ b/src/views/home/productionCostAnalysis/singleProcessingFuel.vue @@ -196,36 +196,19 @@ export default { // 调用接口 getSingleMaterialAnalysis(requestParams).then((res) => { this.monData = res.data.currentMonthData.find(item => { - if (this.fuelName === '电') { - return item.name === '加工' + this.fuelName + '成本'; - }else{ - return item.name === this.fuelName + '成本'; - } - + return item.name === '加工' + this.fuelName + '成本'; }); this.totalData = res.data.totalMonthData.find(item => { - if (this.fuelName === '电') { - return item.name === '加工' + this.fuelName + '成本'; - }else{ - return item.name === this.fuelName + '成本'; - } + return item.name === '加工' + this.fuelName + '成本'; }); // this.relatedMon = res.data.relatedMon this.relatedData = { relatedMon: res.data.currentMonthData.filter(item => { - if (this.fuelName === '电') { - return item.name !== '加工' + this.fuelName + '成本'; - }else{ - return item.name !== this.fuelName + '成本'; - } + return item.name !== '加工' + this.fuelName + '成本'; }), // 兜底月度数据 relatedTotal: res.data.totalMonthData.filter(item => { - if (this.fuelName === '电') { - return item.name !== '加工' + this.fuelName + '成本'; - }else{ - return item.name !== this.fuelName + '成本'; - } + return item.name !== '加工' + this.fuelName + '成本'; }) // 兜底累计数据 }; this.trend = res.data.dataTrend