From 1a457fe49dfd2b7d8dc787d7e4c21c628c6d261a Mon Sep 17 00:00:00 2001 From: shijing Date: Sat, 11 May 2024 10:34:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BD=99=E7=83=AD=E5=8F=91=E7=94=B5?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=91=8A=E6=B7=BB=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0&=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=91=8A=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=8E=87=E5=B0=8F=E6=95=B0=E7=82=B9=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=B8=A4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_coalbase/report.vue | 6 +- src/views/enm_cogeneration/report.vue | 100 ++++++++++++++++---------- src/views/enm_kilnbase/report.vue | 6 +- src/views/enm_limestone/report.vue | 6 +- src/views/enm_rmbase/report.vue | 6 +- 5 files changed, 79 insertions(+), 45 deletions(-) diff --git a/src/views/enm_coalbase/report.vue b/src/views/enm_coalbase/report.vue index 920d8920..c425ba69 100644 --- a/src/views/enm_coalbase/report.vue +++ b/src/views/enm_coalbase/report.vue @@ -398,8 +398,10 @@ export default { mounted() { function precen(a, b) { if (b !== 0 && b !== null && a !== null) { - let precen = (a / b).toFixed(2); - return precen * 100 + "%"; + let precen = (a / b) * 100; + let precenNum = precen.toFixed(2); + console.log(precenNum); + return precenNum + "%"; } else { return "/"; } diff --git a/src/views/enm_cogeneration/report.vue b/src/views/enm_cogeneration/report.vue index 4d482a59..94ae3954 100644 --- a/src/views/enm_cogeneration/report.vue +++ b/src/views/enm_cogeneration/report.vue @@ -45,18 +45,21 @@ > {{ item[0] }} {{ item[0] }} + + {{ item[0] }} + {{ item[0] }} @@ -119,7 +122,7 @@ - +
0) { let data3 = res3[0]; that.tableDatas[0][3] = data3.total_production; - that.tableDatas[1][3] = data3.production_hour; - that.tableDatas[2][3] = data3.run_hour; - that.tableDatas[3][3] = data3.run_rate; - that.tableDatas[4][3] = data3.elec_coast; + that.tableDatas[1][3] = data3.production_hour; //发电功率 + that.tableDatas[2][3] = data3.production_elec_unit; //吨熟料发电量 + that.tableDatas[3][3] = data3.run_hour; + that.tableDatas[4][3] = data3.run_rate; + that.tableDatas[5][3] = data3.elec_consume; } }); //上小时 @@ -595,7 +602,11 @@ export default { if (res4.length > 0) { let data4 = res4[0]; that.tableDatas[0][2] = data4.total_production; - that.tableDatas[4][2] = data4.elec_coast; + that.tableDatas[1][2] = data4.production_hour; //发电功率 + that.tableDatas[2][2] = data4.production_elec_unit; //吨熟料发电量 + that.tableDatas[3][2] = "/"; + that.tableDatas[4][2] = "/"; + that.tableDatas[5][2] = data4.elec_consume; } }); let params5 = {}; @@ -608,32 +619,35 @@ export default { let data5 = res5; data5.forEach((item5) => { let str = "goal_val_" + that.month; - if ( - item5.goal_cate_name == "总发电量（KW·h/t）" - ) { + if (item5.goal_cate_name == "总产量（t）") { that.tableDatas[0][6] = item5[str]; that.tableDatas[0][8] = item5.goal_val; } else if ( - item5.goal_cate_name == - "单位发电量（KW·h/t）" + item5.goal_cate_name == "发电功率（KW·h）" ) { that.tableDatas[1][6] = item5[str]; that.tableDatas[1][8] = item5.goal_val; } else if ( - item5.goal_cate_name == "运转时间（h）" + item5.goal_cate_name == + "吨熟料发电量（KW·h/t）" ) { that.tableDatas[2][6] = item5[str]; that.tableDatas[2][8] = item5.goal_val; } else if ( - item5.goal_cate_name == "运转率（%）" + item5.goal_cate_name == "运转时间（h）" ) { that.tableDatas[3][6] = item5[str]; that.tableDatas[3][8] = item5.goal_val; } else if ( - item5.goal_cate_name == "用电量（KW·h）" + item5.goal_cate_name == "运转率（%）" ) { that.tableDatas[4][6] = item5[str]; that.tableDatas[4][8] = item5.goal_val; + } else if ( + item5.goal_cate_name == "用电量（KW·h）" + ) { + that.tableDatas[5][6] = item5[str]; + that.tableDatas[5][8] = item5.goal_val; } }); } @@ -658,21 +672,27 @@ export default { that.tableDatas[1][5], that.tableDatas[1][8] ); - that.tableDatas[2][5] = data1.run_hour; + that.tableDatas[2][5] = + data1.production_elec_unit; that.tableDatas[2][9] = precen( that.tableDatas[2][5], that.tableDatas[2][8] ); - that.tableDatas[3][5] = data1.run_rate; + that.tableDatas[3][5] = data1.run_hour; that.tableDatas[3][9] = precen( that.tableDatas[3][5], that.tableDatas[3][8] ); - that.tableDatas[4][5] = data1.elec_coast; + that.tableDatas[4][5] = data1.run_rate; that.tableDatas[4][9] = precen( that.tableDatas[4][5], that.tableDatas[4][8] ); + that.tableDatas[5][5] = data1.elec_consume; + that.tableDatas[5][9] = precen( + that.tableDatas[5][5], + that.tableDatas[5][8] + ); } else { } }); @@ -696,21 +716,27 @@ export default { that.tableDatas[1][4], that.tableDatas[1][6] ); - that.tableDatas[2][4] = data2.run_hour; + that.tableDatas[2][4] = + data2.production_elec_unit; that.tableDatas[2][7] = precen( that.tableDatas[2][4], that.tableDatas[2][6] ); - that.tableDatas[3][4] = data2.run_rate; + that.tableDatas[3][4] = data2.run_hour; that.tableDatas[3][7] = precen( that.tableDatas[3][4], that.tableDatas[3][6] ); - that.tableDatas[4][4] = data2.elec_coast; + that.tableDatas[4][4] = data2.run_rate; that.tableDatas[4][7] = precen( that.tableDatas[4][4], that.tableDatas[4][6] ); + that.tableDatas[5][4] = data2.elec_consume; + that.tableDatas[5][7] = precen( + that.tableDatas[5][4], + that.tableDatas[5][6] + ); } }); }); @@ -740,10 +766,10 @@ export default { data.forEach((item) => { let ind = item.hour - 1; seriesData0[ind] = item.total_production; - seriesData1[ind] = item.production_hour; - seriesData2[ind] = item.run_rate; - seriesData3[ind] = item.elec_consume_unit; - seriesData4[ind] = item.coal_consume_unit; + seriesData1[ind] = item.production_hour; //发电功率 + seriesData2[ind] = item.run_hour; + seriesData3[ind] = item.run_rate; + seriesData4[ind] = item.elec_consume; }); let options = { ...that.option1 }; options.series[0].data = seriesData0; @@ -780,9 +806,9 @@ export default { let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; - seriesData2[ind] = item.run_rate; - seriesData3[ind] = item.elec_consume_unit; - seriesData4[ind] = item.coal_consume_unit; + seriesData2[ind] = item.run_hour; + seriesData3[ind] = item.run_rate; + seriesData4[ind] = item.elec_consume; }); let options = { ...that.option2 }; options.series[0].data = seriesData0; @@ -818,9 +844,9 @@ export default { let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; - seriesData2[ind] = item.run_rate; - seriesData3[ind] = item.elec_consume_unit; - seriesData4[ind] = item.coal_consume_unit; + seriesData2[ind] = item.run_hour; + seriesData3[ind] = item.run_rate; + seriesData4[ind] = item.elec_consume; }); let options = { ...that.option3 }; options.series[0].data = seriesData0; diff --git a/src/views/enm_kilnbase/report.vue b/src/views/enm_kilnbase/report.vue index f9be6d45..69b57c22 100644 --- a/src/views/enm_kilnbase/report.vue +++ b/src/views/enm_kilnbase/report.vue @@ -537,8 +537,10 @@ export default { mounted() { function precen(a, b) { if (b !== 0 && b !== null && a !== null) { - let precen = (a / b).toFixed(2); - return precen * 100 + "%"; + let precen = (a / b)*100; + let precenNum = precen.toFixed(2); + console.log(precenNum) + return precenNum + "%"; } else { return "/"; } diff --git a/src/views/enm_limestone/report.vue b/src/views/enm_limestone/report.vue index a540ff70..54147a25 100644 --- a/src/views/enm_limestone/report.vue +++ b/src/views/enm_limestone/report.vue @@ -459,8 +459,10 @@ export default { mounted() { function precen(a, b) { if (b !== 0 && b !== null && a !== null) { - let precen = (a / b).toFixed(2); - return precen * 100 + "%"; + let precen = (a / b) * 100; + let precenNum = precen.toFixed(2); + console.log(precenNum); + return precenNum + "%"; } else { return "/"; } diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue index 932cf244..44fc20ba 100644 --- a/src/views/enm_rmbase/report.vue +++ b/src/views/enm_rmbase/report.vue @@ -515,8 +515,10 @@ export default { mounted() { function precen(a, b) { if (b !== 0 && b !== null && a !== null) { - let precen = (a / b).toFixed(2); - return precen * 100 + "%"; + let precen = (a / b) * 100; + let precenNum = precen.toFixed(2); + console.log(precenNum); + return precenNum + "%"; } else { return "/"; }