From 5f57220a71ca839fac95978ecb4a82ff45431e60 Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Tue, 2 Dec 2025 14:48:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9tkx=20precen=20&&=20co?= =?UTF-8?q?nsume=5Fprecen=20=E5=AD=98=E5=9C=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_coal/report.vue | 80 ++++++------- src/views/enm_kiln/report.vue | 128 ++++++++++----------- src/views/enm_mill/report.vue | 97 ++++++++-------- src/views/enm_rm/report.vue | 188 +++++++++++++++---------------- src/views/enm_rm_copy/report.vue | 88 +++++++-------- src/views/enm_slag/report.vue | 168 +++++++++++++-------------- 6 files changed, 377 insertions(+), 372 deletions(-) diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue index ee900071..e1a73a3e 100644 --- a/src/views/enm_coal/report.vue +++ b/src/views/enm_coal/report.vue @@ -656,22 +656,6 @@ export default { }; }, mounted() { - function precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = (a / b)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } - function consume_precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = ((a / b)+1)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } let that = this; var myDate = new Date(); let year = (that.year = myDate.getFullYear()); @@ -809,32 +793,32 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( that.tableDatas[4][8] - that.tableDatas[4][5], that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.elec_consume; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( (that.tableDatas[5][8]-that.tableDatas[5][5]), that.tableDatas[5][8] ); @@ -852,32 +836,32 @@ export default { if (res2.length > 0) { let data2 = res2[0]; that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( (that.tableDatas[4][6]-that.tableDatas[4][4]), that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.elec_consume; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( (that.tableDatas[5][6]-that.tableDatas[5][4]), that.tableDatas[5][6] ); @@ -891,6 +875,22 @@ export default { }); }, methods: { + precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = (a / b)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, + consume_precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = ((a / b)+1)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, typeRadioChange() { this.searchDate = ""; }, @@ -970,32 +970,32 @@ export default { if (res2.length > 0) { let data2 = res2[0]; that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( (that.tableDatas[4][6]-that.tableDatas[4][4]), that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.elec_consume; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( (that.tableDatas[5][6]-that.tableDatas[5][4]), that.tableDatas[5][6] ); @@ -1013,32 +1013,32 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( that.tableDatas[4][8] - that.tableDatas[4][5], that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.elec_consume; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( (that.tableDatas[5][8]-that.tableDatas[5][5]), that.tableDatas[5][8] ); diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue index 5acf11eb..9a271636 100644 --- a/src/views/enm_kiln/report.vue +++ b/src/views/enm_kiln/report.vue @@ -896,22 +896,6 @@ export default { }; }, mounted() { - function precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = (a / b) * 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } - function consume_precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = ((a / b)+1)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } let that = this; var myDate = new Date(); let year = (that.year = myDate.getFullYear()); @@ -1096,64 +1080,64 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( (that.tableDatas[4][8]-that.tableDatas[4][5]), that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.celec_consume_unit; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( (that.tableDatas[5][8]-that.tableDatas[5][5]), that.tableDatas[5][8] ); that.tableDatas[6][5] = data1.coal_consume_unit; - that.tableDatas[6][9] = consume_precen( + that.tableDatas[6][9] = this.consume_precen( (that.tableDatas[6][8]-that.tableDatas[6][5]), that.tableDatas[6][8] ); that.tableDatas[7][5] = data1.cen_consume_unit; - that.tableDatas[7][9] = consume_precen( + that.tableDatas[7][9] = this.consume_precen( (that.tableDatas[7][8]-that.tableDatas[7][5]), that.tableDatas[7][8] ); that.tableDatas[8][5] = data1.elec_consume; - that.tableDatas[8][9] = consume_precen( + that.tableDatas[8][9] = this.consume_precen( (that.tableDatas[8][8]-that.tableDatas[8][5]), that.tableDatas[8][8] ); that.tableDatas[9][5] = data1.production_cost_unit; - that.tableDatas[9][9] = consume_precen( + that.tableDatas[9][9] = this.consume_precen( (that.tableDatas[9][8]-that.tableDatas[9][5]), that.tableDatas[9][8] ); that.tableDatas[10][5] = data1.ammonia_consume; - that.tableDatas[10][9] = consume_precen( + that.tableDatas[10][9] = this.consume_precen( that.tableDatas[10][8] - that.tableDatas[10][5], that.tableDatas[10][8] ); that.tableDatas[11][5] = (data1.ammonia_consume*1000/data1.total_production).toFixed(2); - that.tableDatas[11][9] = consume_precen( + that.tableDatas[11][9] = this.consume_precen( that.tableDatas[11][8] - that.tableDatas[11][5], that.tableDatas[11][8] ); @@ -1171,64 +1155,64 @@ export default { if (res2.length > 0) { let data2 = res2[0]; that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( that.tableDatas[4][6] - that.tableDatas[4][4], that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.celec_consume_unit; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( that.tableDatas[5][6] - that.tableDatas[5][4], that.tableDatas[5][6] ); that.tableDatas[6][4] = data2.coal_consume_unit; - that.tableDatas[6][7] = consume_precen( + that.tableDatas[6][7] = this.consume_precen( that.tableDatas[6][6]-that.tableDatas[6][4], that.tableDatas[6][6] ); that.tableDatas[7][4] = data2.cen_consume_unit; - that.tableDatas[7][7] = consume_precen( + that.tableDatas[7][7] = this.consume_precen( that.tableDatas[7][6]-that.tableDatas[7][4], that.tableDatas[7][6] ); that.tableDatas[8][4] = data2.elec_consume; - that.tableDatas[8][7] = consume_precen( + that.tableDatas[8][7] = this.consume_precen( that.tableDatas[8][6]-that.tableDatas[8][4], that.tableDatas[8][6] ); that.tableDatas[9][4] = data2.production_cost_unit; - that.tableDatas[9][7] = consume_precen( + that.tableDatas[9][7] = this.consume_precen( that.tableDatas[9][6]-that.tableDatas[9][4], that.tableDatas[9][6] ); that.tableDatas[10][4] = data2.ammonia_consume; - that.tableDatas[10][7] = consume_precen( + that.tableDatas[10][7] = this.consume_precen( that.tableDatas[10][6] - that.tableDatas[10][4], that.tableDatas[10][6] ) that.tableDatas[11][4] = (data2.ammonia_consume*1000/data2.total_production).toFixed(2); - that.tableDatas[11][7] = consume_precen( + that.tableDatas[11][7] = this.consume_precen( that.tableDatas[11][6] - that.tableDatas[11][4], that.tableDatas[11][6] ) @@ -1241,6 +1225,22 @@ export default { }); }, methods: { + precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = (a / b) * 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, + consume_precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = ((a / b)+1)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, typeRadioChange() { this.searchDate = ""; }, @@ -1327,64 +1327,64 @@ export default { if (res2.length > 0) { let data2 = res2[0]; that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( that.tableDatas[4][6] - that.tableDatas[4][4], that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.celec_consume_unit; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( that.tableDatas[5][6] - that.tableDatas[5][4], that.tableDatas[5][6] ); that.tableDatas[6][4] = data2.coal_consume_unit; - that.tableDatas[6][7] = consume_precen( + that.tableDatas[6][7] = this.consume_precen( that.tableDatas[6][6]-that.tableDatas[6][4], that.tableDatas[6][6] ); that.tableDatas[7][4] = data2.cen_consume_unit; - that.tableDatas[7][7] = consume_precen( + that.tableDatas[7][7] = this.consume_precen( that.tableDatas[7][6]-that.tableDatas[7][4], that.tableDatas[7][6] ); that.tableDatas[8][4] = data2.elec_consume; - that.tableDatas[8][7] = consume_precen( + that.tableDatas[8][7] = this.consume_precen( that.tableDatas[8][6]-that.tableDatas[8][4], that.tableDatas[8][6] ); that.tableDatas[9][4] = data2.production_cost_unit; - that.tableDatas[9][7] = consume_precen( + that.tableDatas[9][7] = this.consume_precen( that.tableDatas[9][6]-that.tableDatas[9][4], that.tableDatas[9][6] ); that.tableDatas[10][4] = data2.ammonia_consume; - that.tableDatas[10][7] = consume_precen( + that.tableDatas[10][7] = this.consume_precen( that.tableDatas[10][6] - that.tableDatas[10][4], that.tableDatas[10][6] ) that.tableDatas[11][4] = (data2.ammonia_consume*1000/data2.total_production).toFixed(2); - that.tableDatas[11][7] = consume_precen( + that.tableDatas[11][7] = this.consume_precen( that.tableDatas[11][6] - that.tableDatas[11][4], that.tableDatas[11][6] ) @@ -1402,64 +1402,64 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( (that.tableDatas[4][8]-that.tableDatas[4][5]), that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.celec_consume_unit; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( (that.tableDatas[5][8]-that.tableDatas[5][5]), that.tableDatas[5][8] ); that.tableDatas[6][5] = data1.coal_consume_unit; - that.tableDatas[6][9] = consume_precen( + that.tableDatas[6][9] = this.consume_precen( (that.tableDatas[6][8]-that.tableDatas[6][5]), that.tableDatas[6][8] ); that.tableDatas[7][5] = data1.cen_consume_unit; - that.tableDatas[7][9] = consume_precen( + that.tableDatas[7][9] = this.consume_precen( (that.tableDatas[7][8]-that.tableDatas[7][5]), that.tableDatas[7][8] ); that.tableDatas[8][5] = data1.elec_consume; - that.tableDatas[8][9] = consume_precen( + that.tableDatas[8][9] = this.consume_precen( (that.tableDatas[8][8]-that.tableDatas[8][5]), that.tableDatas[8][8] ); that.tableDatas[9][5] = data1.production_cost_unit; - that.tableDatas[9][9] = consume_precen( + that.tableDatas[9][9] = this.consume_precen( (that.tableDatas[9][8]-that.tableDatas[9][5]), that.tableDatas[9][8] ); that.tableDatas[10][5] = data1.ammonia_consume; - that.tableDatas[10][9] = consume_precen( + that.tableDatas[10][9] = this.consume_precen( that.tableDatas[10][8] - that.tableDatas[10][5], that.tableDatas[10][8] ); that.tableDatas[11][5] = (data1.ammonia_consume*1000/data1.total_production).toFixed(2); - that.tableDatas[11][9] = consume_precen( + that.tableDatas[11][9] = this.consume_precen( that.tableDatas[11][8] - that.tableDatas[11][5], that.tableDatas[11][8] ); diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue index 3f491e56..2daad1c7 100644 --- a/src/views/enm_mill/report.vue +++ b/src/views/enm_mill/report.vue @@ -807,22 +807,7 @@ export default { }; }, mounted() { - function precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = (a / b) * 100; - return precen.toFixed(2) + "%"; - } else { - return 0; - } - } - function consume_precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = ((a / b)+1)* 100; - return precen.toFixed(2) + "%"; - } else { - return 0; - } - } + let that = this; var myDate = new Date(); let year = (that.year = myDate.getFullYear()); @@ -982,43 +967,43 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( that.tableDatas[4][8]-that.tableDatas[4][5], that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.cen_consume_unit; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( that.tableDatas[5][8]-that.tableDatas[5][5], that.tableDatas[5][8] ); that.tableDatas[6][5] = data1.elec_consume; - that.tableDatas[6][9] = consume_precen( + that.tableDatas[6][9] = this.consume_precen( that.tableDatas[6][8]-that.tableDatas[6][5], that.tableDatas[6][8] ); that.tableDatas[7][5] = data1.production_cost_unit; - that.tableDatas[7][9] = consume_precen( + that.tableDatas[7][9] = this.consume_precen( that.tableDatas[7][8]-that.tableDatas[7][5], that.tableDatas[7][8] ); @@ -1036,43 +1021,43 @@ export default { if (res2.length > 0) { let data2 = res2[0]; that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( that.tableDatas[4][6]-that.tableDatas[4][4], that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.cen_consume_unit; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( that.tableDatas[5][6]-that.tableDatas[5][4], that.tableDatas[5][6] ); that.tableDatas[7][4] = data2.production_cost_unit; that.tableDatas[6][4] = data2.elec_consume; - that.tableDatas[6][7] = consume_precen( + that.tableDatas[6][7] = this.consume_precen( that.tableDatas[6][6]-that.tableDatas[6][4], that.tableDatas[6][6] ); - that.tableDatas[7][7] = consume_precen( + that.tableDatas[7][7] = this.consume_precen( that.tableDatas[7][6]-that.tableDatas[7][4], that.tableDatas[7][6] ); @@ -1085,6 +1070,22 @@ export default { }); }, methods: { + precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = (a / b) * 100; + return precen.toFixed(2) + "%"; + } else { + return 0; + } + }, + consume_precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = ((a / b)+1)* 100; + return precen.toFixed(2) + "%"; + } else { + return 0; + } + }, typeRadioChange() { this.searchDate = ""; }, @@ -1165,43 +1166,43 @@ export default { if (res2.length > 0) { let data2 = res2[0]; that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( that.tableDatas[4][6]-that.tableDatas[4][4], that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.cen_consume_unit; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( that.tableDatas[5][6]-that.tableDatas[5][4], that.tableDatas[5][6] ); that.tableDatas[7][4] = data2.production_cost_unit; that.tableDatas[6][4] = data2.elec_consume; - that.tableDatas[6][7] = consume_precen( + that.tableDatas[6][7] = this.consume_precen( that.tableDatas[6][6]-that.tableDatas[6][4], that.tableDatas[6][6] ); - that.tableDatas[7][7] = consume_precen( + that.tableDatas[7][7] = this.consume_precen( that.tableDatas[7][6]-that.tableDatas[7][4], that.tableDatas[7][6] ); @@ -1219,43 +1220,43 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( that.tableDatas[4][8]-that.tableDatas[4][5], that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.cen_consume_unit; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( that.tableDatas[5][8]-that.tableDatas[5][5], that.tableDatas[5][8] ); that.tableDatas[6][5] = data1.elec_consume; - that.tableDatas[6][9] = consume_precen( + that.tableDatas[6][9] = this.consume_precen( that.tableDatas[6][8]-that.tableDatas[6][5], that.tableDatas[6][8] ); that.tableDatas[7][5] = data1.production_cost_unit; - that.tableDatas[7][9] = consume_precen( + that.tableDatas[7][9] = this.consume_precen( that.tableDatas[7][8]-that.tableDatas[7][5], that.tableDatas[7][8] ); diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue index 1cdddfc0..f23b9b01 100644 --- a/src/views/enm_rm/report.vue +++ b/src/views/enm_rm/report.vue @@ -920,22 +920,6 @@ export default { }, mounted() { - function precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = (a / b)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } - function consume_precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = ((a / b)+1)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } let that = this; this.$nextTick(() => { var myDate = new Date(); @@ -1081,34 +1065,34 @@ export default { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( (that.tableDatas[4][8]-that.tableDatas[4][5]), that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.elec_consume; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( (that.tableDatas[5][8] - that.tableDatas[5][5]), that.tableDatas[5][8] ); @@ -1134,34 +1118,34 @@ export default { ) { that.wraning = true; } - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( (that.tableDatas[4][6]-that.tableDatas[4][4]), that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.elec_consume; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( (that.tableDatas[5][6] - that.tableDatas[5][4]), that.tableDatas[5][6] ); @@ -1176,6 +1160,22 @@ export default { }); }, methods: { + precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = (a / b)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, + consume_precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = ((a / b)+1)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, typeRadioChange() { this.searchDate = ""; }, @@ -1222,30 +1222,30 @@ export default { params4.type = "day_s"; params4.mgroup = this.query.mgroup; this.$API.enm.enstat.req(params4).then((res4) => { - if (res4.length > 0) { - let data4 = res4[0]; - that.tableDatas[0][2] = data4.total_production; - if (data4.total_production < 1) { - that.tableDatas[1][2] = 0; - that.tableDatas[2][2] = 0; - that.tableDatas[3][2] = 0; - - }else{ - that.tableDatas[1][2] = data4.elec_consume_unit; - that.tableDatas[2][2] = data4.elec_consume; - that.tableDatas[3][2] = data4.production_cost_unit;} - - 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; - } - }); + if (res4.length > 0) { + let data4 = res4[0]; + that.tableDatas[0][2] = data4.total_production; + if (data4.total_production < 1) { + that.tableDatas[1][2] = 0; + that.tableDatas[2][2] = 0; + that.tableDatas[3][2] = 0; + + }else{ + that.tableDatas[1][2] = data4.elec_consume_unit; + that.tableDatas[2][2] = data4.elec_consume; + that.tableDatas[3][2] = data4.production_cost_unit;} + + 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; } + }); } - }); + } + }); }, get_months(year, month){ let that = this; @@ -1256,44 +1256,44 @@ export default { params2.type = "month_s"; params2.mgroup = this.query.mgroup; this.$API.enm.enstat.req(params2).then((res2) => { - if (res2.length > 0) { - let data2 = res2[0]; - that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( - that.tableDatas[0][4], - that.tableDatas[0][6] - ); - that.tableDatas[1][4] = data2.elec_consume_unit; - that.tableDatas[1][7] = consume_precen( - that.tableDatas[1][4], - that.tableDatas[1][6] - ); - that.tableDatas[2][4] = data2.elec_consume; - that.tableDatas[3][4] = - data2.production_cost_unit; - that.tableDatas[3][7] = consume_precen( - that.tableDatas[3][3], - that.tableDatas[3][6] - ); - that.tableDatas[2][7] = consume_precen( - that.tableDatas[2][4], - that.tableDatas[2][6] - ); - if (data2.imaterial_data.length > 0) { - data2.imaterial_data.forEach((item) => { - if (item.material_name == "湿电石渣消耗") { - that.tableDatas[4][4] = (item.amount_consume).toFixed(2); - that.tableDatas[4][7] = precen( - that.tableDatas[4][4], - that.tableDatas[4][6] - ); - }else if(item.material_name == "湿电石渣进厂"){ - that.tableDatas[5][4] = (item.amount_consume).toFixed(2); - that.tableDatas[5][7] = precen( - that.tableDatas[5][4], - that.tableDatas[5][6] - ); - } + if (res2.length > 0) { + let data2 = res2[0]; + that.tableDatas[0][4] = data2.total_production; + that.tableDatas[0][7] = this.precen( + that.tableDatas[0][4], + that.tableDatas[0][6] + ); + that.tableDatas[1][4] = data2.elec_consume_unit; + that.tableDatas[1][7] = this.consume_precen( + that.tableDatas[1][4], + that.tableDatas[1][6] + ); + that.tableDatas[2][4] = data2.elec_consume; + that.tableDatas[3][4] = + data2.production_cost_unit; + that.tableDatas[3][7] = this.consume_precen( + that.tableDatas[3][3], + that.tableDatas[3][6] + ); + that.tableDatas[2][7] = this.consume_precen( + that.tableDatas[2][4], + that.tableDatas[2][6] + ); + if (data2.imaterial_data.length > 0) { + data2.imaterial_data.forEach((item) => { + if (item.material_name == "湿电石渣消耗") { + that.tableDatas[4][4] = (item.amount_consume).toFixed(2); + that.tableDatas[4][7] = this.precen( + that.tableDatas[4][4], + that.tableDatas[4][6] + ); + }else if(item.material_name == "湿电石渣进厂"){ + that.tableDatas[5][4] = (item.amount_consume).toFixed(2); + that.tableDatas[5][7] = this.precen( + that.tableDatas[5][4], + that.tableDatas[5][6] + ); + } }); } } @@ -1357,23 +1357,23 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.elec_consume_unit; - that.tableDatas[1][9] = consume_precen( + that.tableDatas[1][9] = this.consume_precen( that.tableDatas[1][8]-that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.elec_consume; - that.tableDatas[2][9] = consume_precen( + that.tableDatas[2][9] = this.consume_precen( that.tableDatas[2][8]-that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.production_cost_unit; - that.tableDatas[3][9] = consume_precen( + that.tableDatas[3][9] = this.consume_precen( that.tableDatas[3][8]-that.tableDatas[3][5], that.tableDatas[3][8] ); @@ -1381,13 +1381,13 @@ export default { data1.imaterial_data.forEach((item) => { if (item.material_name == "湿电石渣消耗") { that.tableDatas[4][5] = (item.amount_consume).toFixed(2); - that.tableDatas[4][9] = precen( + that.tableDatas[4][9] = this.precen( that.tableDatas[4][5], that.tableDatas[4][8] ); }else if(item.material_name == "湿电石渣进厂"){ that.tableDatas[5][5] = (item.amount_consume).toFixed(2); - that.tableDatas[5][9] = precen( + that.tableDatas[5][9] = this.precen( that.tableDatas[5][5], that.tableDatas[5][8] ); diff --git a/src/views/enm_rm_copy/report.vue b/src/views/enm_rm_copy/report.vue index ee4390c6..c1577493 100644 --- a/src/views/enm_rm_copy/report.vue +++ b/src/views/enm_rm_copy/report.vue @@ -966,22 +966,6 @@ export default { }, mounted() { - function precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = (a / b)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } - function consume_precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = ((a / b)+1)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } let that = this; this.$nextTick(() => { var myDate = new Date(); @@ -1131,40 +1115,40 @@ export default { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( (that.tableDatas[4][8] - that.tableDatas[4][5]), that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.elec_consume; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( (that.tableDatas[5][8] - that.tableDatas[5][5]), that.tableDatas[5][8] ); that.tableDatas[6][5] = data1.production_cost_unit; - that.tableDatas[6][9] = consume_precen( + that.tableDatas[6][9] = this.consume_precen( (that.tableDatas[6][8] - that.tableDatas[6][5]), that.tableDatas[6][8] ); @@ -1189,40 +1173,40 @@ export default { ) { that.wraning = true; } - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( (that.tableDatas[4][6]-that.tableDatas[4][4]), that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.elec_consume; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( (that.tableDatas[5][6]-that.tableDatas[5][4]), that.tableDatas[5][6] ); that.tableDatas[6][4] = data2.production_cost_unit; - that.tableDatas[6][7] = consume_precen( + that.tableDatas[6][7] = this.consume_precen( (that.tableDatas[6][6] - that.tableDatas[6][4]), that.tableDatas[6][6] ); @@ -1236,6 +1220,22 @@ export default { }); }, methods: { + precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = (a / b)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, + consume_precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = ((a / b)+1)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, typeRadioChange() { this.searchDate = ""; }, @@ -1318,40 +1318,40 @@ export default { ) { that.wraning = true; } - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.production_hour; - that.tableDatas[1][7] = precen( + that.tableDatas[1][7] = this.precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.run_hour; - that.tableDatas[2][7] = precen( + that.tableDatas[2][7] = this.precen( that.tableDatas[2][4], that.tableDatas[2][6] ); that.tableDatas[3][4] = data2.run_rate; - that.tableDatas[3][7] = precen( + that.tableDatas[3][7] = this.precen( that.tableDatas[3][4], that.tableDatas[3][6] ); that.tableDatas[4][4] = data2.elec_consume_unit; - that.tableDatas[4][7] = consume_precen( + that.tableDatas[4][7] = this.consume_precen( (that.tableDatas[4][6]-that.tableDatas[4][4]), that.tableDatas[4][6] ); that.tableDatas[5][4] = data2.elec_consume; - that.tableDatas[5][7] = consume_precen( + that.tableDatas[5][7] = this.consume_precen( (that.tableDatas[5][6]-that.tableDatas[5][4]), that.tableDatas[5][6] ); that.tableDatas[6][4] = data2.production_cost_unit; - that.tableDatas[6][7] = consume_precen( + that.tableDatas[6][7] = this.consume_precen( (that.tableDatas[6][6] - that.tableDatas[6][4]), that.tableDatas[6][6] ); @@ -1426,40 +1426,40 @@ export default { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.production_hour; - that.tableDatas[1][9] = precen( + that.tableDatas[1][9] = this.precen( that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.run_hour; - that.tableDatas[2][9] = precen( + that.tableDatas[2][9] = this.precen( that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.run_rate; - that.tableDatas[3][9] = precen( + that.tableDatas[3][9] = this.precen( that.tableDatas[3][5], that.tableDatas[3][8] ); that.tableDatas[4][5] = data1.elec_consume_unit; - that.tableDatas[4][9] = consume_precen( + that.tableDatas[4][9] = this.consume_precen( (that.tableDatas[4][8] - that.tableDatas[4][5]), that.tableDatas[4][8] ); that.tableDatas[5][5] = data1.elec_consume; - that.tableDatas[5][9] = consume_precen( + that.tableDatas[5][9] = this.consume_precen( (that.tableDatas[5][8] - that.tableDatas[5][5]), that.tableDatas[5][8] ); that.tableDatas[6][5] = data1.production_cost_unit; - that.tableDatas[6][9] = precen( + that.tableDatas[6][9] = this.precen( (that.tableDatas[6][8] - that.tableDatas[6][5]), that.tableDatas[6][8] ); diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue index 3a7910b6..80dbb5b2 100644 --- a/src/views/enm_slag/report.vue +++ b/src/views/enm_slag/report.vue @@ -875,22 +875,6 @@ export default { }; }, mounted() { - function precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = (a / b)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } - function consume_precen(a, b) { - if (b !== 0 && b !== null && a !== null) { - let precen = ((a / b)+1)* 100; - return precen.toFixed(2) + "%"; - } else { - return "/"; - } - } let that = this; var myDate = new Date(); let year = (that.year = myDate.getFullYear()); @@ -1032,23 +1016,23 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.elec_consume_unit; - that.tableDatas[1][9] = consume_precen( + that.tableDatas[1][9] = this.consume_precen( that.tableDatas[1][8]-that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.elec_consume; - that.tableDatas[2][9] = consume_precen( + that.tableDatas[2][9] = this.consume_precen( that.tableDatas[2][8]-that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.production_cost_unit; - that.tableDatas[3][9] = consume_precen( + that.tableDatas[3][9] = this.consume_precen( that.tableDatas[3][8]-that.tableDatas[3][5], that.tableDatas[3][8] ); @@ -1056,13 +1040,13 @@ export default { data1.imaterial_data.forEach((item) => { if (item.material_name == "湿电石渣消耗") { that.tableDatas[4][5] = (item.amount_consume).toFixed(2); - that.tableDatas[4][9] = precen( + that.tableDatas[4][9] = this.precen( that.tableDatas[4][5], that.tableDatas[4][8] ); }else if(item.material_name == "湿电石渣进厂"){ that.tableDatas[5][5] = (item.amount_consume).toFixed(2); - that.tableDatas[5][9] = precen( + that.tableDatas[5][9] = this.precen( that.tableDatas[5][5], that.tableDatas[5][8] ); @@ -1082,23 +1066,23 @@ export default { if (res2.length > 0) { let data2 = res2[0]; that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( + that.tableDatas[0][7] = this.precen( that.tableDatas[0][4], that.tableDatas[0][6] ); that.tableDatas[1][4] = data2.elec_consume_unit; - that.tableDatas[1][7] = consume_precen( + that.tableDatas[1][7] = this.consume_precen( that.tableDatas[1][4], that.tableDatas[1][6] ); that.tableDatas[2][4] = data2.elec_consume; that.tableDatas[3][4] = data2.production_cost_unit; - that.tableDatas[3][7] = consume_precen( + that.tableDatas[3][7] = this.consume_precen( that.tableDatas[3][6]-that.tableDatas[3][4], that.tableDatas[3][6] ); - that.tableDatas[2][7] = consume_precen( + that.tableDatas[2][7] = this.consume_precen( that.tableDatas[2][4], that.tableDatas[2][6] ); @@ -1106,13 +1090,13 @@ export default { data2.imaterial_data.forEach((item) => { if (item.material_name == "湿电石渣消耗") { that.tableDatas[4][4] = (item.amount_consume).toFixed(2); - that.tableDatas[4][7] = precen( + that.tableDatas[4][7] = this.precen( that.tableDatas[4][4], that.tableDatas[4][6] ); }else if(item.material_name == "湿电石渣进厂"){ that.tableDatas[5][4] = (item.amount_consume).toFixed(2); - that.tableDatas[5][7] = precen( + that.tableDatas[5][7] = this.precen( that.tableDatas[5][4], that.tableDatas[5][6] ); @@ -1128,6 +1112,22 @@ export default { }); }, methods: { + precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = (a / b)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, + consume_precen(a, b) { + if (b !== 0 && b !== null && a !== null) { + let precen = ((a / b)+1)* 100; + return precen.toFixed(2) + "%"; + } else { + return "/"; + } + }, typeRadioChange() { this.searchDate = ""; }, @@ -1177,54 +1177,58 @@ export default { get_months(year, month){ let that = this; let params2 = {}; - params2.page = 0; - params2.year_s = year; - params2.month_s = month; - params2.type = "month_s"; - params2.mgroup = this.query.mgroup; - this.$API.enm.enstat.req(params2).then((res2) => { - if (res2.length > 0) { - let data2 = res2[0]; - that.tableDatas[0][4] = data2.total_production; - that.tableDatas[0][7] = precen( - that.tableDatas[0][4], - that.tableDatas[0][6] - ); - that.tableDatas[1][4] = data2.elec_consume_unit; - that.tableDatas[1][7] = consume_precen( - that.tableDatas[1][4], - that.tableDatas[1][6] - ); - that.tableDatas[2][4] = data2.elec_consume; - that.tableDatas[3][4] = - data2.production_cost_unit; - that.tableDatas[3][7] = consume_precen( - that.tableDatas[3][3], - that.tableDatas[3][6] - ); - that.tableDatas[2][7] = consume_precen( - that.tableDatas[2][4], - that.tableDatas[2][6] - ); - if (data2.imaterial_data.length > 0) { - data2.imaterial_data.forEach((item) => { - if (item.material_name == "湿电石渣消耗") { - that.tableDatas[4][4] = (item.amount_consume).toFixed(2); - that.tableDatas[4][7] = precen( - that.tableDatas[4][4], - that.tableDatas[4][6] - ); - }else if(item.material_name == "湿电石渣进厂"){ - that.tableDatas[5][4] = (item.amount_consume).toFixed(2); - that.tableDatas[5][7] = precen( - that.tableDatas[5][4], - that.tableDatas[5][6] - ); - } - }); - } - } - }); + params2.page = 0; + params2.year_s = year; + params2.month_s = month; + params2.type = "month_s"; + params2.mgroup = this.query.mgroup; + this.$API.enm.enstat.req(params2).then((res2) => { + if (res2.length > 0) { + let data2 = res2[0]; + console.log('---data2---',data2) + that.tableDatas[0][4] = data2.total_production; + that.tableDatas[0][7] = this.precen( + that.tableDatas[0][4], + that.tableDatas[0][6] + ); + that.tableDatas[1][4] = data2.elec_consume_unit; + that.tableDatas[1][7] = this.consume_precen( + that.tableDatas[1][4], + that.tableDatas[1][6] + ); + that.tableDatas[2][4] = data2.elec_consume; + that.tableDatas[3][4] = + data2.production_cost_unit; + that.tableDatas[3][7] = this.consume_precen( + that.tableDatas[3][3], + that.tableDatas[3][6] + ); + that.tableDatas[2][7] = this.consume_precen( + that.tableDatas[2][4], + that.tableDatas[2][6] + ); + console.log('---data2---',data2) + if (data2.imaterial_data.length > 0) { + data2.imaterial_data.forEach((item) => { + if (item.material_name == "湿电石渣消耗") { + that.tableDatas[4][4] = (item.amount_consume).toFixed(2); + console.log('---4,4-----',item.amount_consume) + that.tableDatas[4][7] = this.precen( + that.tableDatas[4][4], + that.tableDatas[4][6] + ); + }else if(item.material_name == "湿电石渣进厂"){ + that.tableDatas[5][4] = (item.amount_consume).toFixed(2); + console.log('---5,4-----',item.amount_consume) + that.tableDatas[5][7] = this.precen( + that.tableDatas[5][4], + that.tableDatas[5][6] + ); + } + }); + } + } + }); }, get_month_year_goal(year, month){ let that = this; @@ -1284,23 +1288,23 @@ export default { if (res1.length > 0) { let data1 = res1[0]; that.tableDatas[0][5] = data1.total_production; - that.tableDatas[0][9] = precen( + that.tableDatas[0][9] = this.precen( that.tableDatas[0][5], that.tableDatas[0][8] ); that.tableDatas[1][5] = data1.elec_consume_unit; - that.tableDatas[1][9] = consume_precen( + that.tableDatas[1][9] = this.consume_precen( that.tableDatas[1][8]-that.tableDatas[1][5], that.tableDatas[1][8] ); that.tableDatas[2][5] = data1.elec_consume; - that.tableDatas[2][9] = consume_precen( + that.tableDatas[2][9] = this.consume_precen( that.tableDatas[2][8]-that.tableDatas[2][5], that.tableDatas[2][8] ); that.tableDatas[3][5] = data1.production_cost_unit; - that.tableDatas[3][9] = consume_precen( + that.tableDatas[3][9] = this.consume_precen( that.tableDatas[3][8]-that.tableDatas[3][5], that.tableDatas[3][8] ); @@ -1308,13 +1312,13 @@ export default { data1.imaterial_data.forEach((item) => { if (item.material_name == "湿电石渣消耗") { that.tableDatas[4][5] = (item.amount_consume).toFixed(2); - that.tableDatas[4][9] = precen( + that.tableDatas[4][9] = this.precen( that.tableDatas[4][5], that.tableDatas[4][8] ); }else if(item.material_name == "湿电石渣进厂"){ that.tableDatas[5][5] = (item.amount_consume).toFixed(2); - that.tableDatas[5][9] = precen( + that.tableDatas[5][9] = this.precen( that.tableDatas[5][5], that.tableDatas[5][8] );