diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue index 22d89b2a..7d67b639 100644 --- a/src/views/enm_coal/handoverLog.vue +++ b/src/views/enm_coal/handoverLog.vue @@ -1,257 +1,397 @@ - + - \ No newline at end of file diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue index ed48ab28..c882fcaa 100644 --- a/src/views/enm_coal/teamAnalysis.vue +++ b/src/views/enm_coal/teamAnalysis.vue @@ -86,7 +86,7 @@ export default { year_s: "", page: 0, type: "month_st", - mgroup: "3347217512021835776", + mgroup: "", }, tableDatas: [], }; @@ -96,16 +96,35 @@ export default { var myDate = new Date(); let year = myDate.getFullYear(); that.query.year_s = year; - 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]; + //月目标 + let paramsGoal = {}; + paramsGoal.page = 0; + paramsGoal.mgroup = that.query.mgroup; + that.$API.mtm.goal.list.req(paramsGoal).then((ress) => { + if (ress.length > 0) { + let monthGoal = []; + ress.forEach((goal) => { + if (goal.goal_cate_name == "单位产品分布电耗（KW·h/t）") { + monthGoal[0] = goal.goal_val; + monthGoal[1] = goal.goal_val_2; + monthGoal[2] = goal.goal_val_3; + monthGoal[3] = goal.goal_val_4; + monthGoal[4] = goal.goal_val_5; + monthGoal[5] = goal.goal_val_6; + monthGoal[6] = goal.goal_val_7; + monthGoal[7] = goal.goal_val_8; + monthGoal[8] = goal.goal_val_9; + monthGoal[9] = goal.goal_val_10; + monthGoal[10] = goal.goal_val_11; + monthGoal[11] = goal.goal_val_12; + monthGoal[12] = goal.goal_val_12; + that.monthGoal = monthGoal; + } + }); + this.getData(); + } else { + this.getData(); } - that.getData(data); }); }, methods: { diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue index 35a1bf68..4db7aff9 100644 --- a/src/views/enm_coal/workshopAnalysis.vue +++ b/src/views/enm_coal/workshopAnalysis.vue @@ -1,275 +1,313 @@ +
+ +
+ + + 导出xlsx + + 打印 +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ 煤磨工段车间单位产品电耗月度分析表 +
月份当期值（KW·h/t）目标值（KW·h/t）当期与目标差值（KW·h/t）环期值（KW·h/t）当期与环期差值（KW·h/t）环比增长率（%）同比增长率（%）
+
+ ↑ + ↓ + ▲ + ▼ + {{ item1 }} +
+
+
+
+ +
+ \ No newline at end of file +.printWrap { + width: 100%; + overflow-x: scroll; +} + diff --git a/src/views/enm_coalbase/handoverLog.vue b/src/views/enm_coalbase/handoverLog.vue index 69a4d261..1d5c517d 100644 --- a/src/views/enm_coalbase/handoverLog.vue +++ b/src/views/enm_coalbase/handoverLog.vue @@ -232,16 +232,16 @@ export default { name: "sflog", data() { return { - apiObj: this.$API.wpm.sflog.list, + apiObj: null, apiObj2: null, query: { shift: "", team: "", end_time__lt: "", start_time__gte: "", - mgroup: "3347217512021835776", + mgroup: "", }, - deptId: "3347207082608115712", + deptId: "", sflogItem: {}, options: [], optionsShift: [], @@ -251,8 +251,16 @@ export default { }; }, mounted() { - this.getTeam(); - this.getShfit(); + this.$API.mtm.mgroup.list + .req({ page: 0, search: "煤磨" }) + .then((res) => { + console.log("煤磨", res); + this.query.mgroup = res[0].id; + this.apiObj = this.$API.wpm.sflog.list; + this.deptId = res[0].belong_dept; + this.getTeam(); + this.getShfit(); + }); }, methods: { getTeam() { diff --git a/src/views/enm_coalbase/teamAnalysis.vue b/src/views/enm_coalbase/teamAnalysis.vue index b8d90739..8a0c618f 100644 --- a/src/views/enm_coalbase/teamAnalysis.vue +++ b/src/views/enm_coalbase/teamAnalysis.vue @@ -81,7 +81,7 @@ export default { year_s: "", page: 0, type: "month_st", - mgroup: "3347217512021835776", + mgroup: "", }, tableDatas: [], }; @@ -91,17 +91,23 @@ export default { var myDate = new Date(); let year = myDate.getFullYear(); that.query.year_s = year; - 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); - }); + that.$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; + that.$API.mtm.goal.list.req(params).then((res) => { + let data = []; + if (res.length > 0) { + data = res[0]; + } + that.getData(data); + }); + }); }, methods: { getData(goalData) { diff --git a/src/views/enm_coalbase/workshopAnalysis.vue b/src/views/enm_coalbase/workshopAnalysis.vue index 35a1bf68..f26edb6d 100644 --- a/src/views/enm_coalbase/workshopAnalysis.vue +++ b/src/views/enm_coalbase/workshopAnalysis.vue @@ -1,275 +1,322 @@ +
+ +
+ + + 导出xlsx + + 打印 +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ 煤磨工段车间单位产品电耗月度分析表 +
月份当期值（KW·h/t）目标值（KW·h/t）当期与目标差值（KW·h/t）环期值（KW·h/t）当期与环期差值（KW·h/t）环比增长率（%）同比增长率（%）
+
+ ↑ + ↓ + ▲ + ▼ + {{ item1 }} +
+
+
+
+ +
+ \ No newline at end of file +.printWrap { + width: 100%; + overflow-x: scroll; +} +