diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue index 7196654d..74c7cf1d 100644 --- a/src/views/enm_energy/day_base.vue +++ b/src/views/enm_energy/day_base.vue @@ -376,6 +376,7 @@ export default { dataLoop() { let that = this; that.tableDatas = []; + that.tableDatas2 = []; let _mgroup = [], _nameLength = [], indexList = []; @@ -414,6 +415,7 @@ export default { ? item.nickname : item.name; obj.unit = item.unit; + that.tableDatas2.push(obj); that.getData(item.id, index); }); diff --git a/src/views/enm_energy/hour_base.vue b/src/views/enm_energy/hour_base.vue index f299cdb8..1d11da19 100644 --- a/src/views/enm_energy/hour_base.vue +++ b/src/views/enm_energy/hour_base.vue @@ -404,6 +404,7 @@ export default { dataLoop() { let that = this; that.tableDatas = []; + that.tableDatas2 = []; let _mgroup = [], _nameLength = [], indexList = []; diff --git a/src/views/enm_energy/month_base.vue b/src/views/enm_energy/month_base.vue index 1cdbfdaf..7c36b9de 100644 --- a/src/views/enm_energy/month_base.vue +++ b/src/views/enm_energy/month_base.vue @@ -357,6 +357,7 @@ export default { dataLoop() { let that = this; that.tableDatas = []; + that.tableDatas2 = []; let _mgroup = [], _nameLength = [], indexList = []; diff --git a/src/views/enm_energy/value.vue b/src/views/enm_energy/value.vue index 4c5cf2ff..47fe51ea 100644 --- a/src/views/enm_energy/value.vue +++ b/src/views/enm_energy/value.vue @@ -160,9 +160,9 @@ export default { } if (tValue6 !== "/" && tValue6 !== 0 && wrapArr2[i].en_consume_unit !== 0) { tPercent6 = - ((wrapArr2[i].en_consume_unit - tValue6) / + (((wrapArr2[i].en_consume_unit - tValue6) / tValue6) * - 100; + 100).toFixed(2); } else { tPercent6 = "/"; } @@ -174,9 +174,8 @@ export default { : "/"; if (hValue6 !== "/" && hValue6 !== 0) { hPercent6 = - ((wrapArr2[i].en_consume_unit - hValue6) / - hValue6) * - 100; + (((wrapArr2[i].en_consume_unit - hValue6) / + hValue6) * 100).toFixed(2); } else { hPercent6 = "/"; } @@ -202,10 +201,10 @@ export default { }; if (tValue9 !== "/" && tValue9 !== 0) { tPercent9 = - ((wrapArr2[i].en_add_consume_unit - + (((wrapArr2[i].en_add_consume_unit - tValue9) / tValue9) * - 100; + 100).toFixed(2); } else { tPercent9 = "/"; }; @@ -217,10 +216,10 @@ export default { : "/"; if (hValue9 !== "/" && hValue9 !== 0) { hPercent9 = - ((wrapArr2[i].en_add_consume_unit - + (((wrapArr2[i].en_add_consume_unit - hValue9) / hValue9) * - 100; + 100).toFixed(2); } else { hPercent9 = "/"; }; diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue index 2f558964..6b2975c5 100644 --- a/src/views/enm_mill/workshopAnalysis.vue +++ b/src/views/enm_mill/workshopAnalysis.vue @@ -345,7 +345,7 @@ export default { : "/"; } if (arrs[1] !== "/" && lastNum !== "/") { - lastDiff = arrs[1] - lastNum; + lastDiff = (arrs[1] - lastNum).toFixed(2); } else { lastDiff = "/"; } @@ -357,7 +357,7 @@ export default { lastNum !== "/" && lastNum !== 0 ) { - lastRate = (lastDiff / lastNum) * 100; + lastRate = ((lastDiff / lastNum) * 100).toFixed(2); } else { lastRate = "/"; } @@ -419,7 +419,7 @@ export default { lastNum2 !== "/" && lastNum2 !== 0 ) { - lastRate2 = (lastDiff2 / lastNum2) * 100; + lastRate2 = ((lastDiff2 / lastNum2) * 100).toFixed(2); } else { lastRate2 = "/"; } diff --git a/src/views/enm_monthSet/feeset.vue b/src/views/enm_monthSet/feeset.vue index 26779b01..4ff98326 100644 --- a/src/views/enm_monthSet/feeset.vue +++ b/src/views/enm_monthSet/feeset.vue @@ -77,7 +77,7 @@ min-width="100" > diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue index f64d794e..89a5e098 100644 --- a/src/views/enm_pack/workshopAnalysis.vue +++ b/src/views/enm_pack/workshopAnalysis.vue @@ -256,7 +256,7 @@ export default { let lastDiff = 0; if (arrs[1] !== "/" && arrs[4] !== "/") { - lastDiff = arrs[1] - arrs[4]; + lastDiff = (arrs[1] - arrs[4]).toFixed(2); } else { lastDiff = "/"; } diff --git a/src/views/enm_report/costing.vue b/src/views/enm_report/costing.vue index 70bb133b..5a3d3553 100644 --- a/src/views/enm_report/costing.vue +++ b/src/views/enm_report/costing.vue @@ -41,22 +41,22 @@ 单位成本（元/吨） 直接材料 - 直接人工 - 制造费用 + 制造费用 原材料 辅助材料 电/水 - 车间人员工资 - 劳务工资 - 倒运费用 - 材料出库 - 维修费用 - 装卸费 - 差旅费 - 折旧 摊销 + 职工薪酬 + 其他费用 + 折旧 + 差旅费 + 装卸费 + 修理费 + 材料出库 + 倒运费用 + 直接人工 {{ item }} @@ -64,12 +64,12 @@ 单位成本（元/吨） 单位成本（元/吨） 单位成本（元/吨） - 检修单位成本（元/吨） - 外协施工费用单位成本（元/吨） 单位成本（元/吨） 单位成本（元/吨） 单位成本（元/吨） - 无形资产摊销单位成本（元/吨） + 单位成本（元/吨） + 单位成本（元/吨） + 单位成本（元/吨） @@ -209,16 +209,20 @@ export default { // Skip adding item details to arr for "湿电石渣进厂" return; } + if (item.material_name === "入磨原煤" || item.material_name === "蒸汽" ) { + return; + } if (item.material_type == 30 || item.material_type == 20) {//原材料 that.data1 = that.data1 + 4; } else if (item.material_type == 40) {//辅助材料 that.data3 = that.data3 + 4; } let materialName = item.material_name + if (materialName === "入窑生料") { materialName = "生料"; } else if (materialName === "入窑煤粉") { - materialName = "原煤"; + materialName = "入磨原煤"; } arr.push(materialName) arr.push('单价（元/吨）') @@ -267,12 +271,16 @@ export default { for (let i = 0; i < sub1data.length; i++) { if (sub1data[i].material_name === '湿电石渣进厂'|| sub1data[i].material_name === '动力电'|| sub1data[i].material_name === '工业水'){ continue; - } + } else if (sub1data[i].material_name === '入磨原煤'|| sub1data[i].material_name === '蒸汽'){ + continue; + }; + dataArr.push((sub1data[i].amount_consume).toFixed(2)) dataArr.push((sub1data[i].price_unit).toFixed(2)) dataArr.push((sub1data[i].cost).toFixed(2)) dataArr.push((sub1data[i].cost_unit).toFixed(2)) } + for (let i = 0; i < sub1data.length; i++) { if (sub1data[i].material_name == '动力电') { dataArr.push((sub1data[i].amount_consume).toFixed(2)); diff --git a/src/views/enm_report/exception.vue b/src/views/enm_report/exception.vue index 20fb9c94..75a0fbc1 100644 --- a/src/views/enm_report/exception.vue +++ b/src/views/enm_report/exception.vue @@ -68,7 +68,6 @@ >