diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index e1a4e236..e44fafe0 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -9,7 +9,6 @@
- 新疆中泰化学托克逊能化有限公司绿色建材分公司能源数据采集平台 {{ currentDay }}{{ currentWeek }}{{ currentTime }} kwhkw.h @@ -208,7 +207,7 @@ 熟料综合电耗

{{ hotData.celec_consume_unit }} - kwh + kw.h/t

@@ -217,7 +216,7 @@ 熟料综合煤耗

{{ hotData.coal_consume_unit }} - kwh + kgce/t

@@ -226,7 +225,7 @@ 熟料综合能耗

{{ hotData.cen_consume_unit }} - kwh + kgce/t

@@ -236,7 +235,7 @@ 水泥综合能耗

{{ hotData.sn_cen_consume_unit}} - kwh + kgce/t

@@ -245,7 +244,7 @@ 水泥工序电耗

{{ hotData.sn_elec_consume_unit }} - kwh + kw.h/t

@@ -520,7 +519,7 @@ export default { ], name: { textStyle: { - padding: [-20, -20], // 控制文字padding + padding: [20, 20], // 控制文字padding }, }, nameGap: 2, @@ -530,6 +529,7 @@ export default { splitNumber: 4, axisName: { color: "#2adbbc", + padding: [10, 10], }, splitLine: { lineStyle: { diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue index 74c7cf1d..dac3ebed 100644 --- a/src/views/enm_energy/day_base.vue +++ b/src/views/enm_energy/day_base.vue @@ -431,7 +431,6 @@ export default { obj.mpoint = id; obj.page = 0; this.$API.enm.mpoint.stat.req(obj).then((res) => { - console.log(res); let sum = 0; res.forEach((item) => { let ind = item.day + 2; diff --git a/src/views/enm_report/reportDay.vue b/src/views/enm_report/reportDay.vue index 8428a970..b560a364 100644 --- a/src/views/enm_report/reportDay.vue +++ b/src/views/enm_report/reportDay.vue @@ -116,8 +116,8 @@ [20,'产量','月熟料产量完成率(%)'], [21,'产量','日水泥产量(t)'], [22,'产量','月水泥产量完成率(%)'], - [23,'产量','日熟料出厂量(t)'], - [24,'产量','月熟料累计出厂量(t)'], + [23,'产量','日散装熟料出厂量(t)'], + [24,'产量','月散装熟料出厂量(t)'], [25,'产量','日散装水泥出厂量(t)'], [26,'产量','月散装水泥出厂量(t)'], [27,'产量','日袋装水泥出厂量(t)'], @@ -146,6 +146,7 @@ hours:'', timeDate:'', dataList:{}, + dataList3:{}, }; }, mounted() { @@ -240,12 +241,29 @@ that.tableDatas[36][3] = dataList.水泥包装.elec_consume; that.tableDatas[37][3] = dataList.生活区.elec_consume; }).then(res=>{ - //获取月和年目标 - let params1 = {}; - params1.page = 0; - params1.goal_cate__code = 'total_production'; - params1.year = that.year; - this.$API.mtm.goal.list.req(params1).then((res1) => { + //获取月和年目标 和 当月的数据 + let params2 = {}; + params2.page = 0; + params2.year_s = that.year; + params2.month_s = that.month; + params2.type = 'month_s'; + this.$API.enm.enstat.req(params2).then((res3) => { + ;//月目标 + let dataList3 = {}; + if (res3.length > 0){ + res3.forEach(item3 => { + let label = item3.mgroup_name; + dataList3[label] = item3; + }); + } + that.dataList3 = dataList3; + }).then(res=>{ + let params1 = {}; + let that = this; + params1.page = 0; + params1.goal_cate__code = 'total_production'; + params1.year = that.year; + this.$API.mtm.goal.list.req(params1).then((res1) => { let dataList1 = {};//目标 res1.forEach(item1 => { let label = item1.mgroup_name; @@ -255,10 +273,11 @@ if(this.type=='day'){ ind = 'goal_val_'+that.month; } - that.tableDatas[15][3] = dataList1.电石渣&&dataList1.电石渣[ind]!==0&&dataList1.电石渣[ind]!==''&&that.tableDatas[14][3]!==''?((that.tableDatas[14][3] /dataList1.电石渣[ind])*100).toFixed(2):'/'; - that.tableDatas[17][3] = dataList1.原料磨&&dataList1.原料磨[ind]!==0&&dataList1.原料磨[ind]!==''&&that.tableDatas[14][3]!==''?((that.tableDatas[16][3] /dataList1.原料磨[ind])*100).toFixed(2):'/'; - that.tableDatas[19][3] = dataList1.回转窑&&dataList1.回转窑[ind]!==0&&dataList1.回转窑[ind]!==''&&that.tableDatas[14][3]!==''?((that.tableDatas[18][3] /dataList1.回转窑[ind])*100).toFixed(2):'/'; - that.tableDatas[21][3] = dataList1.水泥磨&&dataList1.水泥磨[ind]!==0&&dataList1.水泥磨[ind]!==''&&that.tableDatas[14][3]!==''?((that.tableDatas[20][3] /dataList1.水泥磨[ind])*100).toFixed(2):'/'; + that.tableDatas[15][3] = dataList1.电石渣&&dataList1.电石渣[ind]!==0&&dataList1.电石渣[ind]!==''&&that.dataList3.电石渣.total_production!==''?((that.dataList3.电石渣.total_production /dataList1.电石渣[ind])*100).toFixed(2):'/'; + that.tableDatas[17][3] = dataList1.原料磨&&dataList1.原料磨[ind]!==0&&dataList1.原料磨[ind]!==''&&that.dataList3.原料磨.total_production!==''?((that.dataList3.原料磨.total_production /dataList1.原料磨[ind])*100).toFixed(2):'/'; + that.tableDatas[19][3] = dataList1.回转窑&&dataList1.回转窑[ind]!==0&&dataList1.回转窑[ind]!==''&&that.dataList3.回转窑.total_production!==''?((that.dataList3.回转窑.total_production /dataList1.回转窑[ind])*100).toFixed(2):'/'; + that.tableDatas[21][3] = dataList1.水泥磨&&dataList1.水泥磨[ind]!==0&&dataList1.水泥磨[ind]!==''&&that.dataList3.水泥磨.total_production!==''?((that.dataList3.水泥磨.total_production /dataList1.水泥磨[ind])*100).toFixed(2):'/'; + }) }) }).then(res=>{ let obj1 = {};