From 8b8ff3b48bdb958994aaaeabe8f9cec8c074cdb7 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 30 Apr 2024 13:52:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=97=A5=E6=9C=9F=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_coal/report.vue | 12 +++--------- src/views/enm_coalbase/report.vue | 11 +++-------- src/views/enm_cogeneration/report.vue | 9 +++------ src/views/enm_kiln/report.vue | 9 +++------ src/views/enm_kilnbase/report.vue | 6 +++--- src/views/enm_limestone/report.vue | 6 +++--- src/views/enm_mill/report.vue | 11 +++-------- src/views/enm_pack/report.vue | 4 ++-- src/views/enm_rm/report.vue | 6 +++--- src/views/enm_rmbase/report.vue | 6 +++--- src/views/enm_slag/report.vue | 4 ++-- 11 files changed, 31 insertions(+), 53 deletions(-) diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue index 438b08b0..18b874fd 100644 --- a/src/views/enm_coal/report.vue +++ b/src/views/enm_coal/report.vue @@ -602,14 +602,13 @@ export default { query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { - // debugger; let seriesData0 = [], seriesData1 = [], seriesData2 = [], seriesData3 = []; let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; //总产量 seriesData1[ind] = item.production_hour; //台时产量 seriesData2[ind] = item.run_rate; //运转率 @@ -643,12 +642,9 @@ export default { seriesData1 = [], seriesData2 = [], seriesData3 = []; - // debugger; - console.log(response); let data = response; data.forEach((item) => { - // debugger; - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -677,15 +673,13 @@ export default { query2.type = "month_s"; query2.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query2).then((response) => { - // debugger; let seriesData0 = [], seriesData1 = [], seriesData2 = [], seriesData3 = []; - console.log(response); let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; diff --git a/src/views/enm_coalbase/report.vue b/src/views/enm_coalbase/report.vue index 127e3102..2dcc4546 100644 --- a/src/views/enm_coalbase/report.vue +++ b/src/views/enm_coalbase/report.vue @@ -602,14 +602,13 @@ export default { query.type = "hour_s"; query.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query).then((response) => { - // debugger; let seriesData0 = [], seriesData1 = [], seriesData2 = [], seriesData3 = []; let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; //总产量 seriesData1[ind] = item.production_hour; //台时产量 seriesData2[ind] = item.run_rate; //运转率 @@ -643,12 +642,9 @@ export default { seriesData1 = [], seriesData2 = [], seriesData3 = []; - // debugger; - console.log(response); let data = response; data.forEach((item) => { - // debugger; - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -677,7 +673,6 @@ export default { query2.type = "month_s"; query2.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query2).then((response) => { - // debugger; let seriesData0 = [], seriesData1 = [], seriesData2 = [], @@ -685,7 +680,7 @@ export default { console.log(response); let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; diff --git a/src/views/enm_cogeneration/report.vue b/src/views/enm_cogeneration/report.vue index d64e69e8..b5e3ba47 100644 --- a/src/views/enm_cogeneration/report.vue +++ b/src/views/enm_cogeneration/report.vue @@ -738,7 +738,7 @@ export default { seriesData4 = []; let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -775,12 +775,9 @@ export default { seriesData2 = [], seriesData3 = [], seriesData4 = []; - // debugger; - console.log(response); let data = response; data.forEach((item) => { - // debugger; - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -818,7 +815,7 @@ export default { seriesData4 = []; let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue index 4d69b8f7..da86d4e6 100644 --- a/src/views/enm_kiln/report.vue +++ b/src/views/enm_kiln/report.vue @@ -874,7 +874,7 @@ export default { seriesData5 = []; let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -914,12 +914,9 @@ export default { seriesData3 = [], seriesData4 = [], seriesData5 = []; - // debugger; - console.log(response); let data = response; data.forEach((item) => { - // debugger; - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -960,7 +957,7 @@ export default { seriesData5 = []; let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; diff --git a/src/views/enm_kilnbase/report.vue b/src/views/enm_kilnbase/report.vue index 7bf79f6b..d55d9f04 100644 --- a/src/views/enm_kilnbase/report.vue +++ b/src/views/enm_kilnbase/report.vue @@ -803,7 +803,7 @@ export default { seriesData4 = []; let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -845,7 +845,7 @@ export default { let data = response; data.forEach((item) => { // debugger; - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -883,7 +883,7 @@ export default { seriesData4 = []; let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; diff --git a/src/views/enm_limestone/report.vue b/src/views/enm_limestone/report.vue index d4c2aba7..e4690c1a 100644 --- a/src/views/enm_limestone/report.vue +++ b/src/views/enm_limestone/report.vue @@ -635,7 +635,7 @@ export default { console.log("获取小时数据", response); let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.elec_consume_unit; }); @@ -666,7 +666,7 @@ export default { console.log(response); let data = response; data.forEach((item) => { - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.elec_consume_unit; }); @@ -696,7 +696,7 @@ export default { console.log(response); let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.elec_consume_unit; }); diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue index f7554adf..aa13a9b9 100644 --- a/src/views/enm_mill/report.vue +++ b/src/views/enm_mill/report.vue @@ -786,7 +786,7 @@ export default { console.log(response); let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -823,12 +823,9 @@ export default { seriesData2 = [], seriesData3 = [], seriesData4 = []; - // debugger; - console.log(response); let data = response; data.forEach((item) => { - // debugger; - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; @@ -859,16 +856,14 @@ export default { query2.type = "month_s"; query2.mgroup = that.query.mgroup; this.$API.enm.enstat.req(query2).then((response) => { - // debugger; let seriesData0 = [], seriesData1 = [], seriesData2 = [], seriesData3 = [], seriesData4 = []; - console.log(response); let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_hour; seriesData2[ind] = item.run_rate; diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue index 7fc701c8..ff76392b 100644 --- a/src/views/enm_pack/report.vue +++ b/src/views/enm_pack/report.vue @@ -532,7 +532,7 @@ export default { let data = response; data.forEach((item) => { - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.elec_consume_unit; }); @@ -561,7 +561,7 @@ export default { seriesData1 = []; let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.elec_consume_unit; }); diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue index 1c2ef0b7..d20a7b1c 100644 --- a/src/views/enm_rm/report.vue +++ b/src/views/enm_rm/report.vue @@ -982,7 +982,7 @@ export default { console.log("获取小时数据", response); let data = response; data.forEach((item) => { - let ind = item.hour; + let ind = item.hour - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData2[ind] = item.run_rate; @@ -1024,7 +1024,7 @@ export default { let data = response; data.forEach((item) => { // debugger; - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData2[ind] = item.run_rate; @@ -1063,7 +1063,7 @@ export default { seriesData4 = []; let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData2[ind] = item.run_rate; diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue index ade9dfac..ab2b32c6 100644 --- a/src/views/enm_rmbase/report.vue +++ b/src/views/enm_rmbase/report.vue @@ -927,7 +927,7 @@ export default { seriesData0[ind] = item.total_production; seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData2[ind] = item.run_rate; - seriesData3[ind] = item.production_cost_unit; + seriesData3[ind] = item.elec_consume_unit; }); let options = { ...that.option1 }; options.series[0].data = seriesData0; @@ -963,7 +963,7 @@ export default { seriesData0[ind] = item.total_production; seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData2[ind] = item.run_rate; - seriesData3[ind] = item.production_cost_unit; + seriesData3[ind] = item.elec_consume_unit; }); let options = { ...that.option2 }; options.series[0].data = seriesData0; @@ -998,7 +998,7 @@ export default { seriesData0[ind] = item.total_production; seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData2[ind] = item.run_rate; - seriesData3[ind] = item.production_cost_unit; + seriesData3[ind] = item.elec_consume_unit; }); let options = { ...that.option3 }; options.series[0].data = seriesData0; diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue index 6c04d6da..2ab5eb10 100644 --- a/src/views/enm_slag/report.vue +++ b/src/views/enm_slag/report.vue @@ -549,7 +549,7 @@ export default { seriesData2 = []; let data = response; data.forEach((item) => { - let ind = item.day_s; + let ind = item.day_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_cost_unit; seriesData2[ind] = item.elec_consume_unit; @@ -581,7 +581,7 @@ export default { seriesData2 = []; let data = response; data.forEach((item) => { - let ind = item.month_s; + let ind = item.month_s - 1; seriesData0[ind] = item.total_production; seriesData1[ind] = item.production_cost_unit; seriesData2[ind] = item.elec_consume_unit;