From 4aaad74a6ad642f08137a05263467ba83dfb1d25 Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 16 Aug 2024 18:42:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=83=BD=E7=AE=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_kiln/power.vue | 8 ++++++-- src/views/enm_report/costing.vue | 10 +++++++--- src/views/enm_report/quality.vue | 9 +++++---- src/views/enm_rm/teamAnalysis.vue | 12 ++++++------ 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue index 93e4f780..4cf813e0 100644 --- a/src/views/enm_kiln/power.vue +++ b/src/views/enm_kiln/power.vue @@ -485,9 +485,10 @@ export default { obj.mgroup__name = "回转窑"; obj.page = 0; obj.enabled = 1; + obj.material__code__in = "elec,elec_0"; + obj.ep_monitored__isnull = 0; obj.need_display = 1; obj.ordering = "report_sortstr"; - obj.material__code__in = "elec,elec_0"; this.$API.enm.mpoint.list.req(obj).then((res) => { console.log("mpoints", res); let arr = []; @@ -730,7 +731,10 @@ export default { data.forEach((item) => { let ind = item.month_s - 1; let index = that.mpoints.indexOf(item.mpoint_name); //第几个mpoint - seriesData[index][ind] = item.elec_consume_unit; + if(index != undefined){ + seriesData[index][ind] = item.elec_consume_unit; + } + }); let options = { ...that.option3 }; for (let j = 0; j < that.mpoints.length; j++) { diff --git a/src/views/enm_report/costing.vue b/src/views/enm_report/costing.vue index 28761b07..53b7cece 100644 --- a/src/views/enm_report/costing.vue +++ b/src/views/enm_report/costing.vue @@ -125,7 +125,7 @@ export default { methods: { //获取工段列表 getMgroup() { - this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => { + this.$API.mtm.mgroup.list.req({ page: 0, cate: 'section' }).then(res => { res.forEach(item => { if (item.name !== '煤磨' && item.name !== '水泥包装') { this.mgroupOptions.push(item); @@ -133,7 +133,8 @@ export default { }) this.mgroupOptions = this.mgroupOptions.reverse(); this.query.mgroup = this.mgroupOptions[0].id; - this.tableName = '电石渣干粉核算' + this.tableName = this.mgroupOptions[0].name; + this.getTableData(); }) }, //班组列表 @@ -143,7 +144,8 @@ export default { }) }, mgroupChange(value) { - let arr = this.mgroupOptions.filter(item => { + if(value){ + let arr = this.mgroupOptions.filter(item => { return item.id == value }) let name = arr[0].name; @@ -156,6 +158,8 @@ export default { } else if (name == '水泥磨') { this.tableName = '水泥核算' } + } + }, //查询类型 diff --git a/src/views/enm_report/quality.vue b/src/views/enm_report/quality.vue index 71a2de24..cea2c191 100644 --- a/src/views/enm_report/quality.vue +++ b/src/views/enm_report/quality.vue @@ -216,8 +216,9 @@ that.header3 = ['比表面积','SO3','掺量'];//检测项 that.header4 = ['平均值','检次','合次','及格率','平均值','检次','合次','及格率','平均值','检次','合次','及格率'];//检测项 } - let params = {}; + let params = {page: 0}; let arr = []; + if(that.query.type==0){//日 arr = that.query.month.split('-'); params.year_s = arr[0]; @@ -229,7 +230,7 @@ } params.mgroup__belong_dept = that.query.belong_dept; this.$API.enm.enstat.req(params).then((res) => { - let data = res.results; + let data = res; let wrapArr = []; let innerArr = []; let ind = 0; @@ -292,14 +293,14 @@ itemArr[ind] = item3.val_avg.toFixed(2); itemArr.push(item3.num_test) itemArr.push(item3.num_ok) - let pass = (item3.rate_pass*100).toFixed(2); + let pass = (item3.rate_pass).toFixed(2); pass= pass+'%'; itemArr.push(pass) }else{ itemArr.push(item3.val_avg.toFixed(2)) itemArr.push(item3.num_test) itemArr.push(item3.num_ok) - let pass = (item3.rate_pass*100).toFixed(2); + let pass = (item3.rate_pass).toFixed(2); pass= pass+'%'; itemArr.push(pass) } diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue index 2a3eeaa3..9095d9e6 100644 --- a/src/views/enm_rm/teamAnalysis.vue +++ b/src/views/enm_rm/teamAnalysis.vue @@ -63,7 +63,7 @@ CaO（%） 循环风机（KW·h/t） 尾排风机（KW·h/t） - 废气风机（KW·h/t） + 立磨主电机（KW·h/t） 当期值（KW·h/t） 目标值（KW·h/t） @@ -216,18 +216,18 @@ export default { item.循环风机_consume_unit != null ? item.循环风机_consume_unit : "/"; - arr[13] = + arr[14] = item.尾排风机_consume_unit != null ? item.尾排风机_consume_unit : "/"; - arr[13] = - item.废气风机_consume_unit != null - ? item.废气风机_consume_unit + arr[15] = + item.立磨主电机_consume_unit != null + ? item.立磨主电机_consume_unit : "/"; // arr[16] = item.elec_consume_unit; //当期值（KW·h/t） let keyVale = "goal_val_" + n; - arr[17] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 + arr[17] = goalData[keyVale]?goalData[keyVale]:0; //目标值（KW·h/t）//需要接口获取 arr[18] = item.celec_consume_unit - arr[16]; //当期与目标差值（KW·h/t） let ind_pre = 0, huanbi = 0;