From aee042713842127cf4f5a26739cccaee92809cae Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 29 Apr 2024 16:30:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B0=B4=E6=B3=A5=E5=8C=85=E8=A3=85mgroup?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8D=E7=A7=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_pack/handoverLog.vue | 538 ++++++----- src/views/enm_pack/report.vue | 1116 ++++++++++++----------- src/views/enm_pack/teamAnalysis.vue | 30 +- src/views/enm_pack/workshopAnalysis.vue | 588 ++++++------ 4 files changed, 1273 insertions(+), 999 deletions(-) diff --git a/src/views/enm_pack/handoverLog.vue b/src/views/enm_pack/handoverLog.vue index c00f1f46..5d28f53b 100644 --- a/src/views/enm_pack/handoverLog.vue +++ b/src/views/enm_pack/handoverLog.vue @@ -1,237 +1,361 @@ - + - \ No newline at end of file diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue index 5f1cea49..7fc701c8 100644 --- a/src/views/enm_pack/report.vue +++ b/src/views/enm_pack/report.vue @@ -1,526 +1,600 @@ +
+ +
+ 导出xlsx + + 打印 +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
水泥包装工段生产报告
参数昨日本月本年月目标值月完成度年目标值年完成度
{{ item[0] }}{{ item[1] }} + {{ item[2] }} + + {{ item[3] }} + + {{ item[4] }} + {{ item[5] }}{{ item[6] }}{{ item[7] }}{{ item[8] }}
+
+
本月生产参数统计图
+ +
+
+
本年生产参数统计图
+ +
+
+
+ + +
+ + 至 + + 查询 +
+
+ + + 查询 +
+
+ + + 查询 +
+
+ + + 查询 +
+ + + + +
+ \ No newline at end of file + diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue index fe349698..53ee4bb2 100644 --- a/src/views/enm_pack/teamAnalysis.vue +++ b/src/views/enm_pack/teamAnalysis.vue @@ -77,11 +77,13 @@ export default { data() { return { + exportLoading: false, + timeStamp: null, query: { year_s: "", page: 0, type: "month_st", - mgroup: "3347217757455728640", + mgroup: "", }, tableDatas: [], }; @@ -90,8 +92,25 @@ export default { let that = this; var myDate = new Date(); let year = myDate.getFullYear(); + this.timeStamp = myDate.getTime(); that.query.year_s = year; - that.getData(); + this.$API.mtm.mgroup.list + .req({ page: 0, search: "水泥包装" }) + .then((res) => { + console.log("水泥包装", res); + that.query.mgroup = res[0].id; + let params = {}; + params.page = 0; + 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.getData(data); + }); + }); }, methods: { getData() { @@ -111,6 +130,7 @@ 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) { @@ -144,10 +164,10 @@ export default { arr.push(time); arr.push(item.team_name); arr.push(item.total_production); - arr[3] = item.elec_consume_unit; //当期值（KW·h/t） - arr[4] = item.celec_consume_unit; //目标值（KW·h/t）//需要接口获取 - arr[5] = item.celec_consume_unit; //当期与目标差值（KW·h/t） + let keyVale = "goal_val_" + n; + arr[4] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 + arr[5] = arr[3] - item.celec_consume_unit; //当期与目标差值（KW·h/t） let ind_pre = 0, huanbi = 0; if (item.month_s == 1) { diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue index a7e0d551..5eb7c2db 100644 --- a/src/views/enm_pack/workshopAnalysis.vue +++ b/src/views/enm_pack/workshopAnalysis.vue @@ -1,270 +1,326 @@ +
+ +
+ + + 导出xlsx + + 打印 +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ 水泥包装工段车间单位产品电耗月度分析表 +
月份当期值（KW·h/t）目标值（KW·h/t）当期与目标差值（KW·h/t）环期值（KW·h/t）当期与环期差值（KW·h/t）环比增长率（%）同比增长率（%）
+
+ ↑ + ↓ + ▲ + ▼ + {{ item1 }} +
+
+
+
+ +
+ - \ No newline at end of file +