diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 32b2e41c..946fafdc 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -259,7 +259,7 @@
水泥包装工序电耗
- {{(Number(hotData.bz_elec_consume_unit) + Number(dicData.b_snbz_elec)).toFixed(2) }}
+ {{(Number(hotData.dz_elec_consume_unit)).toFixed(2) }}
kW·h/t
@@ -452,6 +452,7 @@ export default {
sn_cen_consume_unit: 0, //水泥综合能耗
sn_elec_consume_unit: 0,//水泥分布电耗
bz_elec_consume_unit: 0,//水泥包装分布电耗
+ dz_elec_consume_unit: 0,//袋装水泥分布电耗
},
dicData:{
b_sl_elec:0,
@@ -1179,9 +1180,6 @@ export default {
that.hotData.celec_consume_unit =Number(ress[0].celec_consume_unit).toFixed(2);
that.hotData.coal_consume_unit =Number(ress[0].coal_consume_unit).toFixed(2);
that.hotData.cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
- console.log(that.hotData.celec_consume_unit);
- console.log(that.hotData.coal_consume_unit);
- console.log(that.hotData.cen_consume_unit);
});
});
this.$API.mtm.mgroup.list
@@ -1197,8 +1195,6 @@ export default {
this.$API.enm.enstat.req(params).then((ress) => {
that.hotData.sn_elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
that.hotData.sn_cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
- console.log(that.hotData.sn_elec_consume_unit);
- console.log(that.hotData.sn_cen_consume_unit);
});
});
this.$API.mtm.mgroup.list
@@ -1211,9 +1207,23 @@ export default {
params.month_s = that.currentMonth;
params.type = "month_s";
params.mgroup = that.yurefadianId;
- this.$API.enm.enstat.req(params).then((ress) => {
- that.hotData.bz_elec_consume_unit =Number(ress[0].elec_consume_unit).toFixed(2);
- console.log(that.hotData.bz_elec_consume_unit);
+ this.$API.enm.mpointstat.list.req(params).then((res) => {
+ if (res.length > 0){
+ let dz_sum = 0;
+ let dz_elec = 0;
+ res.forEach((item) =>{
+ if (item.mpoint_nickname == "袋装水泥总和"){
+ dz_sum = item.val || 0;
+ }else if( item.mpoint_nickname == "水泥包装用电合计"){
+ dz_elec = Number(item.val) || 0;
+ }
+ if (dz_sum > 0){
+ that.hotData.dz_elec_consume_unit = Number(dz_elec/dz_sum).toFixed(2);
+ }else{
+ that.hotData.dz_elec_consume_unit = 0;
+ }
+ })
+ }
});
});
},
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 71b0f220..1455292d 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -633,7 +633,7 @@ export default {
}else if (item.mpoint_nickname == "出厂熟料"){
that.tableDatas[11][5] = item.val;
}else if (item.mpoint_nickname == "水泥包装用电合计") {
- that.tableDatas[12][5] = item.elec_consume_unit;
+ that.tableDatas[12][5] = (item.val/that.tableDatas[9][5]).toFixed(2)
that.tableDatas[13][5] = item.val;
}
}
@@ -676,7 +676,7 @@ export default {
}else if (item.mpoint_nickname == "出厂熟料"){
that.tableDatas[11][4] = item.val;
}else if (item.mpoint_nickname == "水泥包装用电合计") {
- that.tableDatas[12][4] = item.elec_consume_unit;
+ that.tableDatas[12][4] = (item.val/that.tableDatas[9][4]).toFixed(2)
that.tableDatas[13][4] = item.val;
}
}
@@ -720,7 +720,7 @@ export default {
}else if (item.mpoint_nickname == "出厂熟料"){
that.tableDatas[11][2] = item.val;
}else if (item.mpoint_nickname == "水泥包装用电合计") {
- that.tableDatas[12][2] = item.elec_consume_unit;
+ that.tableDatas[12][2] = (item.val/that.tableDatas[9][2]).toFixed(2)
that.tableDatas[13][2] = item.val;
}
}
@@ -765,9 +765,15 @@ export default {
}else if (item.mpoint_nickname == "出厂熟料"){
that.tableDatas[11][3] = item.val;
}else if (item.mpoint_nickname == "水泥包装用电合计") {
- that.tableDatas[12][3] = item.elec_consume_unit;
- that.tableDatas[13][3] = item.val;
- }
+ const demon = Number(that.tableDatas[9][3]) || 0;
+ const numer = Number(item.val) || 0;
+ if (demon !== 0){
+ that.tableDatas[12][3] = (item.val/that.tableDatas[9][3]).toFixed(2)
+ }else{
+ that.tableDatas[12][3] = 0;
+ }
+ that.tableDatas[13][3] = numer;
+ }
}
)}
});
@@ -834,8 +840,14 @@ export default {
}else if (item.mpoint_nickname == "出厂熟料"){
that.tableDatas[11][5] = item.val;
}else if (item.mpoint_nickname == "水泥包装用电合计") {
- that.tableDatas[12][5] = item.elec_consume_unit;
- that.tableDatas[13][5] = item.val;
+ const demon = Number(that.tableDatas[9][5]) || 0;
+ const numer = Number(item.val) || 0;
+ if (demon !== 0){
+ that.tableDatas[12][5] = (item.val/that.tableDatas[9][5]).toFixed(2)
+ }else{
+ that.tableDatas[12][5] = 0;
+ }
+ that.tableDatas[13][5] = numer;
}
})}
})
@@ -878,7 +890,7 @@ export default {
}else if (item.mpoint_nickname == "出厂熟料"){
that.tableDatas[11][4] = item.val;
}else if (item.mpoint_nickname == "水泥包装用电合计") {
- that.tableDatas[12][4] = item.elec_consume_unit;
+ that.tableDatas[12][4] = (item.val/that.tableDatas[9][4]).toFixed(2)
that.tableDatas[13][4] = item.val;
}
})