zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改tkx 班组对比

This commit is contained in:
TianyangZhang 2025-12-11 09:43:08 +08:00
parent d2b0ed6f67
commit 42e1c56be4
2 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/enm_kilnbase/workshopAnalysis.vue
View File

@ -81,7 +81,7 @@
<span v-if="item1 < 0 && ind == 5" <span v-if="item1 < 0 && ind == 5"
>▲</span >▲</span
> >
<span v-if="item1 < 0 && ind == 5" <span v-if="item1 > 0 && ind == 5"
>▼</span >▼</span
> >
{{ item1 }} {{ item1 }}
@ -131,7 +131,7 @@
<span v-if="item1 < 0 && ind == 6" <span v-if="item1 < 0 && ind == 6"
>▲</span >▲</span
> >
<span v-if="item1 < 0 && ind == 6" <span v-if="item1 > 0 && ind == 6"
>▼</span >▼</span
> >
{{ item1 }} {{ item1 }}
@ -181,7 +181,7 @@
<span v-if="item1 < 0 && ind == 6" <span v-if="item1 < 0 && ind == 6"
>▲</span >▲</span
> >
<span v-if="item1 < 0 && ind == 6" <span v-if="item1 > 0 && ind == 6"
>▼</span >▼</span
> >
{{ item1 }} {{ item1 }}
@ -231,7 +231,7 @@
<span v-if="item1 < 0 && ind == 6" <span v-if="item1 < 0 && ind == 6"
>▲</span >▲</span
> >
<span v-if="item1 < 0 && ind == 6" <span v-if="item1 > 0 && ind == 6"
>▼</span >▼</span
> >
{{ item1 }} {{ item1 }}
@ -508,7 +508,7 @@ export default {
let lastDiff = 0; let lastDiff = 0;
if (arrs[1] !== "/" && arrs[4] !== "/") { if (arrs[1] !== "/" && arrs[4] !== "/") {
lastDiff = arrs[1] - arrs[4]; lastDiff = (arrs[1] - arrs[4]).toFixed(2);
} else { } else {
lastDiff = "/"; lastDiff = "/";
} }
@ -532,10 +532,10 @@ export default {
wrapArr0[index].elec_consume_unit wrapArr0[index].elec_consume_unit
) { ) {
sameRate = sameRate =
((arrs[1] - (((arrs[1] -
wrapArr0[index].elec_consume_unit) / wrapArr0[index].elec_consume_unit) /
wrapArr0[index].elec_consume_unit) * wrapArr0[index].elec_consume_unit) *
100; 100).toFixed(2);
} else { } else {
sameRate = "/"; sameRate = "/";
} }

46
src/views/enm_rm/report.vue
View File

@ -1231,19 +1231,13 @@ export default {
that.tableDatas[3][2] = 0; that.tableDatas[3][2] = 0;
}else{ }else{
that.tableDatas[1][2] = data4.elec_consume_unit; that.tableDatas[1][2] = data4.production_hour;
that.tableDatas[2][2] = data4.elec_consume; that.tableDatas[2][2] = data4.run_hour;
that.tableDatas[3][2] = data4.production_cost_unit;} that.tableDatas[3][2] = data4.run_rate;
that.tableDatas[4][2] = data4.elec_consume_unit;
that.tableDatas[5][2] = data4.elec_consume;
}
if (data4.imaterial_data.length > 0) {
data4.imaterial_data.forEach((item) => {
if (item.material_name == "湿电石渣消耗") {
that.tableDatas[4][2] = item.amount_consume;
}else if(item.material_name == "湿电石渣进厂"){
that.tableDatas[5][2] = item.amount_consume;
}
});
}
} }
}); });
}, },
@ -1263,40 +1257,32 @@ export default {
that.tableDatas[0][4], that.tableDatas[0][4],
that.tableDatas[0][6] that.tableDatas[0][6]
); );
that.tableDatas[1][4] = data2.elec_consume_unit; that.tableDatas[1][4] = data2.production_hour;
that.tableDatas[1][7] = this.consume_precen( that.tableDatas[1][7] = this.consume_precen(
that.tableDatas[1][4], that.tableDatas[1][4],
that.tableDatas[1][6] that.tableDatas[1][6]
); );
that.tableDatas[2][4] = data2.elec_consume; that.tableDatas[2][4] = data2.run_hour;
that.tableDatas[3][4] = that.tableDatas[3][4] = data2.run_rate;
data2.production_cost_unit;
that.tableDatas[3][7] = this.consume_precen( that.tableDatas[3][7] = this.consume_precen(
that.tableDatas[3][3], that.tableDatas[3][4],
that.tableDatas[3][6] that.tableDatas[3][6]
); );
that.tableDatas[2][7] = this.consume_precen( that.tableDatas[2][7] = this.consume_precen(
that.tableDatas[2][4], that.tableDatas[2][4],
that.tableDatas[2][6] that.tableDatas[2][6]
); );
if (data2.imaterial_data.length > 0) { that.tableDatas[4][4] = data2.elec_consume_unit;
data2.imaterial_data.forEach((item) => { that.tableDatas[4][7] = this.consume_precen(
if (item.material_name == "湿电石渣消耗") { (that.tableDatas[4][4]-that.tableDatas[4][6]),
that.tableDatas[4][4] = (item.amount_consume).toFixed(2);
that.tableDatas[4][7] = this.precen(
that.tableDatas[4][4],
that.tableDatas[4][6] that.tableDatas[4][6]
); );
}else if(item.material_name == "湿电石渣进厂"){ that.tableDatas[5][4] = data2.elec_consume;
that.tableDatas[5][4] = (item.amount_consume).toFixed(2); that.tableDatas[5][7] = this.consume_precen(
that.tableDatas[5][7] = this.precen( (that.tableDatas[5][4] - that.tableDatas[5][6]),
that.tableDatas[5][4],
that.tableDatas[5][6] that.tableDatas[5][6]
); );
} }
});
}
}
}); });
}, },
get_month_year_goal(year, month){ get_month_year_goal(year, month){