diff --git a/.env.development b/.env.development index 0f8b0cf5..83d707b6 100644 --- a/.env.development +++ b/.env.development @@ -18,7 +18,7 @@ VUE_APP_PJ = '' #测试环境 VUE_APP_API_BASEURL = http://10.50.211.228:2250/api #VUE_APP_API_BASEURL = http://127.0.0.1:2226/api - VUE_APP_BASEURL = http://10.50.211.228:2250 + VUE_APP_BASEURL = http://10.50.211.228:2250/ #VUE_APP_BASEURL = http://127.0.0.1:2226 # #光子 diff --git a/src/config/route.js b/src/config/route.js index 6f9ba82c..5705acd6 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1088,6 +1088,15 @@ const routes = [ perms: ["enm_report"], }, component: "enm_report/reportMonth", + },{ + name: "exception", + path: "/enm_report/exception", + meta: { + title: "异常动态表", + // icon: "el-icon-grid", + perms: ["enm_report"], + }, + component: "enm_report/exception", }, ], }, diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue index 88edf3e3..bf7527ae 100644 --- a/src/views/enm_coal/handoverLog.vue +++ b/src/views/enm_coal/handoverLog.vue @@ -246,7 +246,7 @@ 处置人 - {{ item.happen_time }} + {{ item.stlog_.start_time }} {{ item.stlog_.cate }} {{ item.stlog_.reason }} {{ item.stlog_.measure }} diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue index 25947250..7529f30e 100644 --- a/src/views/enm_coal/teamAnalysis.vue +++ b/src/views/enm_coal/teamAnalysis.vue @@ -89,6 +89,7 @@ export default { mgroup: "", }, tableDatas: [], + goalDatas: [], }; }, mounted() { @@ -108,12 +109,11 @@ export default { params.year = year; params.mgroup = that.query.mgroup; this.$API.mtm.goal.list.req(params).then((res) => { - let data = []; + // let data = []; if (res.length > 0) { - data = res[0]; + this.goalDatas = res[0]; } - console.log(data); - that.getData(data); + that.getData(this.goalDatas); }); }); }, @@ -127,43 +127,32 @@ export default { query0.mgroup = that.query.mgroup; let wrapArr = [], wrapArr0 = [], + compareArr0 = [], wrapArrs = []; this.$API.enm.enstat.req(query0).then((res0) => { let data0 = res0; if (data0.length > 0) { data0.forEach((item0) => { //先按月份排序，再按班组排序 - let n0 = item0.month_s; - let ind0 = 0; - if (team_name0.indexOf("甲") > -1) { - ind0 = (n0 - 1) * 3; - } else if (team_name0.indexOf("乙") > -1) { - ind0 = (n0 - 1) * 3 + 1; - } else if (team_name0.indexOf("丙") > -1) { - ind0 = (n0 - 1) * 3 + 2; - } wrapArr0[ind0] = item0; }); - console.log(wrapArr0); } else { } this.$API.enm.enstat.req(that.query).then((res) => { //今年的值 let data = res; if (data.length > 0) { + data.forEach((item) => { + //先按月份排序，再按班组排序 + let compareArr = []; + compareArr.push(item.month_s); + compareArr.push(item.team_name); + compareArr.push(item.elec_consume_unit); + compareArr0.push(compareArr); + }); data.forEach((item) => { //先按月份排序，再按班组排序 let n = item.month_s; - let team_name = item.team_name; - let ind = 0; - if (team_name.indexOf("甲") > -1) { - ind = (n - 1) * 3; - } else if (team_name.indexOf("乙") > -1) { - ind = (n - 1) * 3 + 1; - } else if (team_name.indexOf("丙") > -1) { - ind = (n - 1) * 3 + 2; - } - wrapArrs[ind] = item; let arr = []; let time = "" + item.year_s + "." + item.month_s; arr.push(time); @@ -201,12 +190,12 @@ export default { ? wrapArr0[ind_pre].elec_consume_unit : "/"; } else { - ind_pre = n - 1; - huanqi = wrapArr[ind_pre] - ? wrapArr[ind_pre].elec_consume_unit>=0 - ? wrapArr[ind_pre].elec_consume_unit - : "/" - : "/"; + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + compareArr0.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanqi = item0[2]; + } + }) } arr[11] = huanqi; //环期值（KW·h/t）上个月的值 if (huanqi !== "/") { @@ -215,22 +204,16 @@ export default { huanqicha = item.celec_consume_unit; } arr[12] = huanqicha; //当期与环期差值（KW·h/t） - arr[13] = - huanqi != "/" ? (huanqicha / huanqi) * 100 : 0; //环比增长率（%） - if (wrapArr0[n]) { - tongqicha = - item.celec_consume_unit - - wrapArr0[n].celec_consume_unit; - tongqi = tongqicha / tongqi; - } else { - tongqicha = item.celec_consume_unit; - tongqi = 0; + // arr[13] = + if (arr[11] !=="/" && arr[11]!==0 && arr[11] !==0 && arr[12] !== "undefined"){ + arr[13] = ((arr[11]/arr[12])*100).toFixed(2); + }else{ + arr[13] = "/"; //环比增长率（%）= 当期与环期差值（KW·h/t）/环期值（KW·h/t）*100% } arr[14] = tongqi; //同比增长率（%） arr[15] = 0.0; //得分 - wrapArr[ind] = arr; + wrapArr.push(arr); }); - console.log(wrapArr); that.tableDatas = wrapArr; } else { } @@ -239,7 +222,7 @@ export default { }, handleQuery() { this.tableDatas = []; - this.getData(); + this.getData(this.goalDatas); }, itemClick(type, item) { this.type = type; diff --git a/src/views/enm_energy/energy.vue b/src/views/enm_energy/energy.vue index 01844483..61781362 100644 --- a/src/views/enm_energy/energy.vue +++ b/src/views/enm_energy/energy.vue @@ -93,7 +93,7 @@ 车间用水（t） - 回转窑 + 回转窑 煤磨 压缩空气（m3） 车间用水（t） @@ -110,7 +110,7 @@ 煤粉（t） 煤粉折标煤（tce） - + 柴油（t） 柴油折标煤（tce） 余热锅炉外送蒸汽（t） 余热锅炉外送蒸汽折标煤（tce） @@ -282,8 +282,15 @@ itemArr.push( item1[0].pcoal_consume)//煤粉（t） itemArr.push( item1[0].pcoal_coal_consume)//煤粉折标煤（tce) // itemArr.push( item1[0].water_consume)//水（t） - // itemArr.push( item1[0].pcoal_consume)//柴油（t） - itemArr.push( item1[0].pcoal_coal_consume)//柴油折标煤（tce) + // console.log(item1[0].imaterial_data_dict) + if (item1[0].imaterial_data_dict.length>0 || item1[0].imaterial_data_dict.柴油){ + // console.log(item1[0].imaterial_data_dict.柴油.amount_consume) + itemArr.push( item1[0].imaterial_data_dict.柴油.amount_consume)//柴油（t） + itemArr.push( (item1[0].imaterial_data_dict.柴油.amount_consume*1.4571).toFixed(2))//柴油折标煤（tce) + }else{ + itemArr.push(0)//柴油（t） + itemArr.push(0)//柴油折标煤（tce) + } itemArr.push( item1[0].out_steam)//余热锅炉外送蒸汽（t） itemArr.push( item1[0].out_steam_coal)//余热锅炉外送蒸汽折标煤（tce) } diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue index 055de72e..d01bb63e 100644 --- a/src/views/enm_kiln/handoverLog.vue +++ b/src/views/enm_kiln/handoverLog.vue @@ -203,7 +203,7 @@ {{ reportItem.run_rate }} - 停机时长（h） + 停机时长（s） {{ reportItem.shut_sec }} diff --git a/src/views/enm_kiln/teamAnalysis.vue b/src/views/enm_kiln/teamAnalysis.vue index 9048bf11..2a801ce9 100644 --- a/src/views/enm_kiln/teamAnalysis.vue +++ b/src/views/enm_kiln/teamAnalysis.vue @@ -152,7 +152,9 @@ export default { query0.mgroup = that.query.mgroup; let wrapArr = [], wrapArr0 = [], - wrapArrs = []; + wrapArrs = [], + comparEarr = [], //班组对比 + compareArr0 = []; this.$API.enm.enstat.req(query0).then((res0) => { let data0 = res0; debugger; @@ -168,35 +170,30 @@ export default { arr0[2] = item0.total_output_unit; arr0[3] = item0.total_output_unit; arr0[4] = item0.run_rate_unit; - if (team_name0.indexOf("甲") > -1) { - ind0 = (n0 - 1) * 3; - } else if (team_name0.indexOf("乙") > -1) { - ind0 = (n0 - 1) * 3 + 1; - } else if (team_name0.indexOf("丙") > -1) { - ind0 = (n0 - 1) * 3 + 2; - } wrapArr0[ind0] = item0; }); - debugger; - console.log(wrapArr0); } else { } this.$API.enm.enstat.req(that.query).then((res) => { let data = res; if (data.length > 0) { + data.forEach((item) => { + //先按月份排序，再按班组排序 + let compareArr = []; + let elecArr = []; + compareArr.push(item.month_s); + elecArr.push(item.month_s); + compareArr.push(item.team_name); + elecArr.push(item.team_name); + compareArr.push(item.coal_consume_unit); + elecArr.push(item.elec_consume_unit); + compareArr0.push(compareArr); + comparEarr.push(elecArr); + }); data.forEach((item) => { //先按月份排序，再按班组排序 let n = item.month_s; - let team_name = item.team_name; let ind = 0; - if (team_name.indexOf("甲") > -1) { - ind = (n - 1) * 3; - } else if (team_name.indexOf("乙") > -1) { - ind = (n - 1) * 3 + 1; - } else if (team_name.indexOf("丙") > -1) { - ind = (n - 1) * 3 + 2; - } - wrapArrs[ind] = item; let arr = []; let time = "" + item.year_s + "." + item.month_s; arr.push(time); @@ -245,7 +242,7 @@ export default { }; let dq = 0 if (arr[13] !== null && arr[13] !== undefined){ - dq = arr[12] - arr[13]; //当期与目标差值（KW·h/t） + dq = (arr[12] - arr[13]).toFixed(2); //当期与目标差值（KW·h/t） }else{ dq == "/" }; @@ -258,21 +255,21 @@ export default { ? wrapArr0[ind_pre].coal_consume_unit : "/"; } else { - ind_pre = ind - 1; - huanbi = wrapArr[ind_pre] - ? wrapArr[ind_pre].coal_consume_unit - ? wrapArr[ind_pre].coal_consume_unit - : "/" - : "/"; + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + compareArr0.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanbi = item0[2]; + } + }) } arr[15] = huanbi; //环期值（KW·h/t）上个月的值 if(huanbi !=="/"){ - arr[16] = arr[12] - huanbi; //当期与环期差值（KW·h/t） + arr[16] = (arr[12] - arr[15]).toFixed(2); //当期与环期差值（KW·h/t） }else{ arr[16] = "/" }; if (arr[15] !== "/"&& arr[15]!== 0 && arr[16]!=="/") { - arr[17] = (arr[16] / arr[15]) * 100; //环比增长率（%） + arr[17] = ((arr[16] / arr[15]) * 100).toFixed(2); //环比增长率（%） } else{ arr[17] = "/" }; @@ -315,35 +312,34 @@ export default { arr[24] = item.elec_consume_unit; //当期值（KW·h/t） // arr[25] = item.celec_consume_unit; //目标值（KW·h/t）//需要接口获取 if (item.elec_consume_unit != null &&item.elec_consume_unit !== "/"){ - arr[26] = arr[24]-arr[25] //当期与目标差值（KW·h/t） + arr[26] = (arr[24]-arr[25]).toFixed(2); //当期与目标差值（KW·h/t） } - let ind_pre1 = 0, - huanbi1 = 0; + let huanbiec = 0; if (item.month_s == 1) { ind_pre1 = 12; - huanbi1 = wrapArr0[ind_pre] + huanbiec = wrapArr0[ind_pre] ? wrapArr0[ind_pre].elec_consume_unit : "/"; } else { - ind_pre1 = ind - 1; - huanbi1 = wrapArr[ind_pre] - ? wrapArr[ind_pre].elec_consume_unit - ? wrapArr[ind_pre].elec_consume_unit - : "/" - : "/"; + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + comparEarr.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanbiec = item0[2]; + } + }) } - arr[27] = huanbi; //环期值（KW·h/t）上个月的值 - if(arr[27]!=="/" && huanbi1!=="/"){ - arr[28] = arr[24] - huanbi1; //当期与环期差值（KW·h/t） + arr[27] = huanbiec; //环期值（KW·h/t）上个月的值 + if(arr[27]!=="/" && huanbiec!=="/"){ + arr[28] = (arr[24] - huanbiec).toFixed(2); //当期与环期差值（KW·h/t） }else{ arr[28] = "/" } - if(arr[28]!=="/" && huanbi1!=="/"){ - arr[29] = (arr[28] / huanbi1) * 100; //环比增长率（%） + if(arr[28]!=="/" && huanbiec!=="/"&&huanbiec!==0){ + arr[29] = ((arr[28] / huanbiec) * 100).toFixed(2); //环比增长率（%） }else{ - arr[29] = "/"}; //环比增长率（%） + arr[29] = 0}; //环比增长率（%） arr[30] = item.celec_consume_unit; //同比增长率（%） - wrapArr[ind] = arr; + wrapArr.push(arr); }); that.tableDatas = wrapArr; } else { diff --git a/src/views/enm_kilnbase/handoverLog.vue b/src/views/enm_kilnbase/handoverLog.vue index 99db6a2f..15ecb5eb 100644 --- a/src/views/enm_kilnbase/handoverLog.vue +++ b/src/views/enm_kilnbase/handoverLog.vue @@ -191,7 +191,7 @@ {{ reportItem.run_rate }} - 停机时长（h） + 停机时长（s） {{ reportItem.shut_hour }} @@ -239,7 +239,7 @@ 处置人 - {{ item.happen_time }} + {{ item.create_time }} {{ item.cate }} {{ item.reason }} {{ item.measure }} diff --git a/src/views/enm_limestone/handoverLog.vue b/src/views/enm_limestone/handoverLog.vue index fa7f4bd9..15ad9a11 100644 --- a/src/views/enm_limestone/handoverLog.vue +++ b/src/views/enm_limestone/handoverLog.vue @@ -193,7 +193,7 @@ 处置人 - {{ item.happen_time }} + {{ item.stlog_.start_time }} {{ item.cate }} {{ item.reason }} {{ item.measure }} diff --git a/src/views/enm_mill/handoverLog.vue b/src/views/enm_mill/handoverLog.vue index 86b3ab49..3e47949f 100644 --- a/src/views/enm_mill/handoverLog.vue +++ b/src/views/enm_mill/handoverLog.vue @@ -204,7 +204,7 @@ {{ reportItem.run_rate }} - 停机时长（h） + 停机时长（s） {{ reportItem.shut_sec }} @@ -263,7 +263,7 @@ 处置人 - {{ item.happen_time }} + {{ item.stlog_.start_time }} {{ item.stlog_.cate }} {{ item.stlog_.reason }} {{ item.stlog_.measure }} diff --git a/src/views/enm_mill/teamAnalysis.vue b/src/views/enm_mill/teamAnalysis.vue index d70d641e..606c7122 100644 --- a/src/views/enm_mill/teamAnalysis.vue +++ b/src/views/enm_mill/teamAnalysis.vue @@ -143,6 +143,7 @@ export default { query0.mgroup = that.query.mgroup; let wrapArr = [], wrapArr0 = [], + compareArr0 = [], wrapArrs = []; this.$API.enm.enstat.req(query0).then((res0) => { let data0 = []; //去年的值 @@ -150,38 +151,27 @@ export default { if (data0.length > 0) { data0.forEach((item0) => { //先按月份排序，再按班组排序 - let n0 = item0.month_s; let ind0 = 0; - let team_name0 = item0.team_name; - if (team_name0.indexOf("甲") > -1) { - ind0 = (n0 - 1) * 3; - } else if (team_name0.indexOf("乙") > -1) { - ind0 = (n0 - 1) * 3 + 1; - } else if (team_name0.indexOf("丙") > -1) { - ind0 = (n0 - 1) * 3 + 2; - } wrapArr0[ind0] = item0; }); - console.log(wrapArr0); } else { } this.$API.enm.enstat.req(that.query).then((res) => { //今年的值 let data = res; if (data.length > 0) { + data.forEach((item) => { + //先按月份排序，再按班组排序 + let compareArr = []; + compareArr.push(item.month_s); + compareArr.push(item.team_name); + compareArr.push(item.elec_consume_unit); + compareArr0.push(compareArr); + }); data.forEach((item) => { //先按月份排序，再按班组排序 let n = item.month_s; - let team_name = item.team_name; let ind = 0; - if (team_name.indexOf("甲") > -1) { - ind = (n - 1) * 3; - } else if (team_name.indexOf("乙") > -1) { - ind = (n - 1) * 3 + 1; - } else if (team_name.indexOf("丙") > -1) { - ind = (n - 1) * 3 + 2; - } - wrapArrs[ind] = item; let arr = []; let time = "" + item.year_s + "." + item.month_s; arr.push(time); @@ -233,12 +223,12 @@ export default { ? wrapArr0[ind_pre].elec_consume_unit : "/"; } else { - ind_pre = n - 1; - huanqi = wrapArr[ind_pre] - ? wrapArr[ind_pre].elec_consume_unit - ? wrapArr[ind_pre].elec_consume_unit - : "/" - : "/"; + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + compareArr0.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanqi = item0[2]; + } + }) } arr[14] = huanqi; //环期值（KW·h/t）上个月的值 if (huanqi !== "/") { @@ -261,7 +251,7 @@ export default { arr[17] = tongqi; //同比增长率（%）:本月-去年本月/去年 arr[18] = 0.0; //同比增长率（%） - wrapArr[ind] = arr; + wrapArr.push(arr); }); let newArr = []; for (let i = 0; i < wrapArr.length; i++) { diff --git a/src/views/enm_monthSet/feeset.vue b/src/views/enm_monthSet/feeset.vue index 29791d32..42be3615 100644 --- a/src/views/enm_monthSet/feeset.vue +++ b/src/views/enm_monthSet/feeset.vue @@ -50,17 +50,17 @@ @click="handleQuery" > -
+ - + { + this.$API.mtm.mgroup.list.req({ page: 0, cate:"section"}).then((res) => { this.options = res; }); }, diff --git a/src/views/enm_monthSet/goalSetting.vue b/src/views/enm_monthSet/goalSetting.vue index fd287157..aa025d89 100644 --- a/src/views/enm_monthSet/goalSetting.vue +++ b/src/views/enm_monthSet/goalSetting.vue @@ -42,14 +42,14 @@ @click="handleQuery" >
-
+
-
+ diff --git a/src/views/enm_pack/handoverLog.vue b/src/views/enm_pack/handoverLog.vue index a614992f..a6ebd564 100644 --- a/src/views/enm_pack/handoverLog.vue +++ b/src/views/enm_pack/handoverLog.vue @@ -213,7 +213,7 @@ 处置人 - {{ item.happen_time }} + {{ item.stlog_.start_time }} {{ item.stlog_.cate }} {{ item.stlog_.reason }} {{ item.stlog_.measure }} diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue index 345261d0..d9fd9b88 100644 --- a/src/views/enm_pack/teamAnalysis.vue +++ b/src/views/enm_pack/teamAnalysis.vue @@ -128,7 +128,7 @@ export default { query0.year_s = that.query.year_s - 1; let wrapArr = [], wrapArr0 = [], - wrapArrs = []; + compareArr0 = []; this.$API.enm.enstat.req(query0).then((res0) => { let data0 = res0; if (data0.length > 0) { @@ -136,41 +136,36 @@ export default { //先按月份排序，再按班组排序 let n0 = item0.month_s; let ind0 = 0; - let team_name0 = item0.team_name; - if (team_name0.indexOf("甲") > -1) { - ind0 = (n0 - 1) * 3; - } else if (team_name0.indexOf("乙") > -1) { - ind0 = (n0 - 1) * 3 + 1; - } else if (team_name0.indexOf("丙") > -1) { - ind0 = (n0 - 1) * 3 + 2; - } wrapArr0[ind0] = item0; }); - // console.log(wrapArr0); - } else { - } - this.$API.enm.enstat.req(that.query).then((res) => { + } else {} + + }); + this.$API.enm.enstat.req(that.query).then((res) => { let data = res; if (data.length > 0) { + data.forEach((item) => { + //先按月份排序，再按班组排序 + let compareArr = []; + compareArr.push(item.month_s); + compareArr.push(item.team_name); + compareArr.push(item.elec_consume_unit); + compareArr0.push(compareArr); + }); + data.forEach((item) => { //先按月份排序，再按班组排序 let n = item.month_s; - let team_name = item.team_name; - let ind = 0; - if (team_name.indexOf("甲") > -1) { - ind = (n - 1) * 3; - } else if (team_name.indexOf("乙") > -1) { - ind = (n - 1) * 3 + 1; - } else if (team_name.indexOf("丙") > -1) { - ind = (n - 1) * 3 + 2; - } - wrapArrs[ind] = item; let arr = []; + let ind = 0; let time = "" + item.year_s + "." + item.month_s; arr.push(time); + arr.push(item.team_name); + arr.push(item.total_production); arr[3] = item.elec_consume_unit; //当期值（KW·h/t） + let keyVale = "goal_val_" + n; arr[4] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 arr[5] = (arr[3] - arr[4]).toFixed(2); //当期与目标差值（KW·h/t） @@ -182,12 +177,12 @@ export default { ? wrapArr0[ind_pre].elec_consume_unit : "/"; } else { - ind_pre = ind - 1; - huanbi = wrapArr[ind_pre] - ? wrapArr[ind_pre].elec_consume_unit - ? wrapArr[ind_pre].elec_consume_unit - : "/" - : "/"; + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + compareArr0.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanbi = item0[2]; + } + }) } arr[6] = huanbi; //环期值（KW·h/t）上个月的值\ if (arr[6] !== "/"){ @@ -195,7 +190,7 @@ export default { }else{ arr[7] = "/"; //当期与环期差值（KW·h/t） } - console.log(arr[7], arr[6]) + // console.log(arr[7], arr[6]) if (arr[7] !=="/" && arr[6] !==0 && arr[7] !== "undefined"){ arr[8] = ((arr[7]/arr[6])*100).toFixed(2); }else{ @@ -216,13 +211,13 @@ export default { } arr[9] = sameRate; ///同比增长率（%）需要当前值/ 上一年同一个月的值即wrapArr0[ind].elec_consume_unit // arr[10] = item.celec_consume_unit; //同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit - wrapArr[ind] = arr; + wrapArr.push(arr); + // console.log(wrapArr); }); that.tableDatas = wrapArr; } else { } }); - }); }, handleQuery() { this.tableDatas = []; diff --git a/src/views/enm_report/exception.vue b/src/views/enm_report/exception.vue new file mode 100644 index 00000000..396c1351 --- /dev/null +++ b/src/views/enm_report/exception.vue @@ -0,0 +1,224 @@ + + + + \ No newline at end of file diff --git a/src/views/enm_report/quality.vue b/src/views/enm_report/quality.vue index ba3adaaa..3cfa68fb 100644 --- a/src/views/enm_report/quality.vue +++ b/src/views/enm_report/quality.vue @@ -291,17 +291,17 @@ if(indexObj>0&&index3==0){ let inde = indexObj-1; let ind =header2Objtem[inde].lengths*4+1; - itemArr[ind] = item3.val_avg.toFixed(2); + itemArr[ind] = (item3.val_avg).toFixed(2); itemArr.push(item3.num_test) itemArr.push(item3.num_ok) 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(Number(item3.val_avg).toFixed(2)); + itemArr.push(item3.num_test); itemArr.push(item3.num_ok) - let pass = (item3.rate_pass).toFixed(2); + let pass = Number(item3.rate_pass).toFixed(2); pass= pass+'%'; itemArr.push(pass) } diff --git a/src/views/enm_report/reportDay.vue b/src/views/enm_report/reportDay.vue index c8fb5edd..47976517 100644 --- a/src/views/enm_report/reportDay.vue +++ b/src/views/enm_report/reportDay.vue @@ -139,13 +139,6 @@ [37,'耗电量','日水泥包装耗电量（kw.h）'], [38,'耗电量','日生活区耗电量（kw.h）'], - - ['生产异常动态','工段','类别','原因','处置措施','处置人'], - ['生产异常动态','电石渣'], - ['生产异常动态','原料磨'], - ['生产异常动态','回转窑'], - ['生产异常动态','煤磨'], - ['生产异常动态','水泥磨'], ], year:'', month:'', diff --git a/src/views/enm_report/reportMonth.vue b/src/views/enm_report/reportMonth.vue index 7a76b79d..9dcad74c 100644 --- a/src/views/enm_report/reportMonth.vue +++ b/src/views/enm_report/reportMonth.vue @@ -103,27 +103,19 @@ - [29,'成本','日电石渣成本(元/吨)'], - [30,'成本','日生料成本(元/吨)'], - [31,'成本','日熟料成本(元/吨)'], - [32,'成本','日水泥粉磨成本(元/吨)'], - [33,'成本','日水泥包装成本(元/吨)'], + [29,'成本','月电石渣成本(元/吨)'], + [30,'成本','月生料成本(元/吨)'], + [31,'成本','月熟料成本(元/吨)'], + [32,'成本','月水泥粉磨成本(元/吨)'], + [33,'成本','月水泥包装成本(元/吨)'], - [34,'耗电量','日电石渣耗电量（kw.h）'], - [35,'耗电量','日生料耗电量（kw.h）'], - [36,'耗电量','日熟料耗电量（kw.h）'], - [37,'耗电量','日水泥粉磨耗电量（kw.h）'], - [38,'耗电量','日水泥包装耗电量（kw.h）'], - [39,'耗电量','日生活区耗电量（kw.h）'], - - - ['生产异常动态','工段','类别','原因','处置措施','处置人'], - ['生产异常动态','电石渣'], - ['生产异常动态','原料磨'], - ['生产异常动态','回转窑'], - ['生产异常动态','煤磨'], - ['生产异常动态','水泥磨'], + [34,'耗电量','月电石渣耗电量（kw.h）'], + [35,'耗电量','月生料耗电量（kw.h）'], + [36,'耗电量','月熟料耗电量（kw.h）'], + [37,'耗电量','月水泥粉磨耗电量（kw.h）'], + [38,'耗电量','月水泥包装耗电量（kw.h）'], + [39,'耗电量','月生活区耗电量（kw.h）'], ], year:'', month:'', @@ -233,13 +225,14 @@ that.tableDatas[34][3] = dataList.原料磨.elec_consume; that.nowData[35] = dataList.回转窑.elec_consume; that.tableDatas[35][3] = dataList.回转窑.elec_consume; - that.nowData[36] = dataList.煤磨.elec_consume; - that.tableDatas[36][3] = dataList.煤磨.elec_consume; - that.nowData[37] = dataList.水泥磨.elec_consume; - that.tableDatas[37][3] = dataList.水泥磨.elec_consume; - that.nowData[38] = dataList.水泥包装.elec_consume; - that.tableDatas[38][3] = dataList.水泥包装.elec_consume; - // that.nowData[39] = dataList.生活区.elec_consume; + // that.nowData[36] = dataList.煤磨.elec_consume; + // that.tableDatas[36][3] = dataList.煤磨.elec_consume; + that.nowData[36] = dataList.水泥磨.elec_consume; + that.tableDatas[36][3] = dataList.水泥磨.elec_consume; + that.nowData[37] = dataList.水泥包装.elec_consume; + that.tableDatas[37][3] = dataList.水泥包装.elec_consume; + that.nowData[38] = dataList.生活区.elec_consume; + that.tableDatas[38][3] = dataList.生活区.elec_consume; }).then(res=>{ //获取月和年目标 let params1 = {}; @@ -369,7 +362,7 @@ let label = item1.mgroup_name; dataList1[label] = item1; }); - that.tableDatas[15][4] = dataList1.电石渣&&dataList1.电石渣.goal_val!==0&&dataList1.电石渣.goal_val!==''&&that.tableDatas[14][4]!==''?(that.tableDatas[14][4] /dataList1.电石渣.goal_val)*100:'/'; + that.tableDatas[15][4] = dataList1.电石渣&&dataList1.电石渣.goal_val!==0&&dataList1.电石渣.goal_val!==''&&that.tableDatas[14][4]!==''?((that.tableDatas[14][4] /dataList1.电石渣.goal_val)*100).toFixed(2):'/'; that.tableDatas[17][4] = dataList1.原料磨&&dataList1.原料磨.goal_val!==0&&dataList1.原料磨.goal_val!==''&&that.tableDatas[14][4]!==''?((that.tableDatas[16][4] /dataList1.原料磨.goal_val)*100).toFixed(5):'/'; that.tableDatas[19][4] = dataList1.回转窑&&dataList1.回转窑.goal_val!==0&&dataList1.回转窑.goal_val!==''&&that.tableDatas[14][4]!==''?((that.tableDatas[18][4] /dataList1.回转窑.goal_val)*100).toFixed(2):'/'; that.tableDatas[21][4] = dataList1.水泥磨&&dataList1.水泥磨.goal_val!==0&&dataList1.水泥磨.goal_val!==''&&that.tableDatas[14][4]!==''?((that.tableDatas[20][4] /dataList1.水泥磨.goal_val)*100).toFixed(2):'/'; diff --git a/src/views/enm_rm/handoverLog.vue b/src/views/enm_rm/handoverLog.vue index 625d9fee..9d1b68fc 100644 --- a/src/views/enm_rm/handoverLog.vue +++ b/src/views/enm_rm/handoverLog.vue @@ -202,7 +202,7 @@ {{ reportItem.run_rate }} - 停机时长（h） + 停机时长（s） {{ reportItem.shut_sec }} @@ -306,7 +306,7 @@ 处置人 - {{ item.happen_time }} + {{ item.stlog_.start_time }} {{ item.stlog_.cate }} {{ item.stlog_.reason }} {{ item.stlog_.measure }} @@ -415,6 +415,7 @@ export default { that.$API.wpm.sflogexp.list .req({ page: 0, sflog: id }) .then((res) => { + console.log("sflogexp", res); that.sflogexpList = res; }); }, diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue index 9095d9e6..8d88ef81 100644 --- a/src/views/enm_rm/teamAnalysis.vue +++ b/src/views/enm_rm/teamAnalysis.vue @@ -101,6 +101,7 @@ export default { mgroup: "", }, tableDatas: [], + goalDatas: [], exportLoading: false, }; }, @@ -119,11 +120,10 @@ export default { params.year = year; params.mgroup = that.query.mgroup; this.$API.mtm.goal.list.req(params).then((res) => { - let data = []; if (res.length > 0) { - data = res[0]; + that.goalDatas = res[0]; } - that.getData(data); + that.getData(that.goalDatas); }); }); }, @@ -137,23 +137,13 @@ export default { query0.mgroup = that.query.mgroup; let wrapArr = [], wrapArr0 = [], - wrapArrs = []; + wrapArrs = [], + compareArr0 = []; this.$API.enm.enstat.req(query0).then((res0) => { let data0 = res0; - debugger; if (data0.length > 0) { data0.forEach((item0) => { //先按月份排序，再按班组排序 - let n0 = item0.month_s; - let ind0 = 0; - let team_name0 = item0.team_name; - if (team_name0.indexOf("甲") > -1) { - ind0 = (n0 - 1) * 3; - } else if (team_name0.indexOf("乙") > -1) { - ind0 = (n0 - 1) * 3 + 1; - } else if (team_name0.indexOf("丙") > -1) { - ind0 = (n0 - 1) * 3 + 2; - } wrapArr0[ind0] = item0; }); } else { @@ -161,19 +151,18 @@ export default { this.$API.enm.enstat.req(that.query).then((res) => { let data = res; if (data.length > 0) { + data.forEach((item) => { + //先按月份排序，再按班组排序 + let compareArr = []; + compareArr.push(item.month_s); + compareArr.push(item.team_name); + compareArr.push(item.elec_consume_unit); + compareArr0.push(compareArr); + }); data.forEach((item) => { //先按月份排序，再按班组排序 let n = item.month_s; - let team_name = item.team_name; let ind = 0; - if (team_name.indexOf("甲") > -1) { - ind = (n - 1) * 3; - } else if (team_name.indexOf("乙") > -1) { - ind = (n - 1) * 3 + 1; - } else if (team_name.indexOf("丙") > -1) { - ind = (n - 1) * 3 + 2; - } - wrapArrs[ind] = item; let arr = []; let time = "" + item.year_s + "." + item.month_s; arr.push(time); @@ -237,21 +226,30 @@ export default { ? wrapArr0[ind_pre].elec_consume_unit : "/"; } else { - ind_pre = ind - 1; - huanbi = wrapArr[ind_pre] - ? wrapArr[ind_pre].elec_consume_unit - ? wrapArr[ind_pre].elec_consume_unit - : "/" - : "/"; + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + compareArr0.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanbi = item0[2]; + } + }) } arr[19] = huanbi; //环期值（KW·h/t）上个月的值 - arr[20] = item.celec_consume_unit; //当期与环期差值（KW·h/t） + //当期与环期差值（KW·h/t） + if (arr[19] !== "/"){ + arr[20] = (arr[16] - arr[19]).toFixed(2); //当期与环期差值（KW·h/t） + }else{ + arr[20] = "/"; //当期与环期差值（KW·h/t） + } arr[21] = item.celec_consume_unit; //环比增长率（%） + if (arr[19] !=="/" && arr[20] !==0 && arr[20] !== "undefined"){ + arr[21] = ((arr[19]/arr[20])*100).toFixed(2); + }else{ + arr[21] = "/"; //环比增长率（%）= 当期与环期差值（KW·h/t）/环期值（KW·h/t）*100% + } arr[22] = item.celec_consume_unit; //同比增长率（%） arr[23] = item.celec_consume_unit; //同比增长率（%） - wrapArr[ind] = arr; + wrapArr.push(arr); }); - console.log(wrapArr); that.tableDatas = wrapArr; } else { } @@ -260,7 +258,7 @@ export default { }, handleQuery() { this.tableDatas = []; - this.getData(); + this.getData(this.goalDatas); }, itemClick(type, item) { this.type = type; diff --git a/src/views/enm_rmbase/handoverLog.vue b/src/views/enm_rmbase/handoverLog.vue index 8394f8e9..064d7510 100644 --- a/src/views/enm_rmbase/handoverLog.vue +++ b/src/views/enm_rmbase/handoverLog.vue @@ -231,7 +231,7 @@ 处置人 - {{ item.happen_time }} + {{ item.stlog_.start_time }} {{ item.cate }} {{ item.reason }} {{ item.measure }} diff --git a/src/views/enm_slag/handoverLog.vue b/src/views/enm_slag/handoverLog.vue index 009fb214..14dbf2e8 100644 --- a/src/views/enm_slag/handoverLog.vue +++ b/src/views/enm_slag/handoverLog.vue @@ -211,7 +211,7 @@ 处置人 - {{ item.happen_time }} + {{ item.stlog_.start_time }} {{ item.stlog_.cate }} {{ item.stlog_.reason }} {{ item.stlog_.measure }} diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue index c2fc46cf..eb6fcf6e 100644 --- a/src/views/enm_slag/teamAnalysis.vue +++ b/src/views/enm_slag/teamAnalysis.vue @@ -85,6 +85,7 @@ export default { timeStamp: null, exportLoading: false, tableDatas: [], + goalDatas: [], }; }, mounted() { @@ -105,9 +106,9 @@ export default { this.$API.mtm.goal.list.req(params).then((res) => { let data = []; if (res.length > 0) { - data = res[0]; + this.goalDatas = res[0]; } - that.getData(data); + that.getData(this.goalDatas); }); }); }, @@ -121,42 +122,31 @@ export default { query0.mgroup = that.query.mgroup; let wrapArr = [], wrapArr0 = [], + compareArr0 = [], wrapArrs = []; this.$API.enm.enstat.req(query0).then((res0) => { let data0 = res0; if (data0.length > 0) { data0.forEach((item0) => { //先按月份排序，再按班组排序 - let n0 = item0.month_s; - let ind0 = 0; - if (item0.team_name.indexOf("甲") > -1) { - ind0 = (n0 - 1) * 3; - } else if (item0.team_name.indexOf("乙") > -1) { - ind0 = (n0 - 1) * 3 + 1; - } else if (item0.team_name.indexOf("丙") > -1) { - ind0 = (n0 - 1) * 3 + 2; - } wrapArr0[ind0] = item0; }); - console.log(wrapArr0); } else { } this.$API.enm.enstat.req(that.query).then((res) => { let data = res; if (data.length > 0) { + data.forEach((item) => { + //先按月份排序，再按班组排序 + let compareArr = []; + compareArr.push(item.month_s); + compareArr.push(item.team_name); + compareArr.push(item.elec_consume_unit); + compareArr0.push(compareArr); + }); data.forEach((item) => { //先按月份排序，再按班组排序 let n = item.month_s; - let team_name = item.team_name; - let ind = 0; - if (team_name.indexOf("甲") > -1) { - ind = (n - 1) * 3; - } else if (team_name.indexOf("乙") > -1) { - ind = (n - 1) * 3 + 1; - } else if (team_name.indexOf("丙") > -1) { - ind = (n - 1) * 3 + 2; - } - wrapArrs[ind] = item; let arr = []; let time = "" + item.year_s + "." + item.month_s; arr.push(time); @@ -179,22 +169,21 @@ export default { ? wrapArr0[ind_pre].elec_consume_unit : "/"; } else { - ind_pre = n - 1; - huanqi = wrapArr[ind_pre] - ? wrapArr[ind_pre].elec_consume_unit - ? wrapArr[ind_pre].elec_consume_unit - : "/" - : "/"; + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + compareArr0.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanqi = item0[2]; + } + }) } arr[7] = huanqi; //环期值（KW·h/t）上个月的值 - if (huanqi !== "/") { - huanqicha = item.celec_consume_unit - huanqi; - } else { - huanqicha = item.celec_consume_unit; + if (arr[6] !== "/"){ + arr[8] = (arr[4] - arr[7]).toFixed(2); //当期与环期差值（KW·h/t） + }else{ + arr[8] = "/"; //当期与环期差值（KW·h/t） } - arr[8] = huanqicha; //当期与环期差值（KW·h/t） - arr[9] = - huanqi != "/" ? (huanqicha / huanqi) * 100 : 0; //环比增长率（%） + // arr[8] = huanqicha; //当期与环期差值（KW·h/t） + arr[9] = arr[8] != "/" ? ((arr[7] / arr[8]) * 100).toFixed(2) : 0; //环比增长率（%） if (wrapArr0[n]) { tongqicha = item.celec_consume_unit - @@ -206,8 +195,10 @@ export default { } arr[10] = tongqi; //同比增长率（%） arr[11] = 0; //得分 - wrapArr[ind] = arr; + wrapArr.push(arr); + }); + console.log(wrapArr); that.tableDatas = wrapArr; } else { } @@ -216,7 +207,7 @@ export default { }, handleQuery() { this.tableDatas = []; - this.getData(); + this.getData(this.goalDatas); }, itemClick(type, item) { this.type = type; diff --git a/src/views/fac_cal/caltask.vue b/src/views/fac_cal/caltask.vue deleted file mode 100644 index 371934de..00000000 --- a/src/views/fac_cal/caltask.vue +++ /dev/null @@ -1,40 +0,0 @@ - - \ No newline at end of file diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue deleted file mode 100644 index 6f658343..00000000 --- a/src/views/fac_cal/mpointstat.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue deleted file mode 100644 index d63d2f62..00000000 --- a/src/views/fac_cal/taskresult.vue +++ /dev/null @@ -1,75 +0,0 @@ - - \ No newline at end of file diff --git a/src/views/fac_cal/xscript.vue b/src/views/fac_cal/xscript.vue deleted file mode 100644 index 80fc545e..00000000 --- a/src/views/fac_cal/xscript.vue +++ /dev/null @@ -1,224 +0,0 @@ - -