From 5d8621cac00e00a5c1909a82b1b621960d53a559 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 23 Nov 2023 16:07:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mgroup=E5=A2=9E=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E7=8F=AD=E8=A7=84=E5=88=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/mtm.js | 15 +- src/views/enm_coal/handoverLog.vue | 491 ++++++------ src/views/enm_kiln/handoverLog.vue | 552 ++++++------- src/views/enm_mill/handoverLog.vue | 540 ++++++------- src/views/enm_pack/handoverLog.vue | 502 ++++++------ src/views/enm_rm/handoverLog.vue | 731 +++++++++--------- src/views/enm_rm/handover_form.vue | 391 +++++----- src/views/enm_rm/other_form.vue | 349 ++++----- src/views/enm_slag/handoverLog.vue | 491 ++++++------ src/views/hrm/attendance_form.vue | 385 ++++------ src/views/mtm/mgroup.vue | 13 +- src/views/mtm/mgroup_form.vue | 113 +-- src/views/ungrouped/costing.vue | 468 +++++------- src/views/ungrouped/inspect.vue | 132 ++-- src/views/wpm/worktask_form.vue | 1148 ++++++++++------------------ 15 files changed, 2746 insertions(+), 3575 deletions(-) diff --git a/src/api/model/mtm.js b/src/api/model/mtm.js index 5bb99030..6c237bb1 100644 --- a/src/api/model/mtm.js +++ b/src/api/model/mtm.js @@ -205,13 +205,16 @@ export default { }, //班次 shift: { - name: "班次列表", - req: async function(data){ - return await http.get( - `${config.API_URL}/mtm/shift/`, - data - ); + list: { + name: "班次列表", + req: async function(data){ + return await http.get( + `${config.API_URL}/mtm/shift/`, + data + ); + } } + }, //班组 team: { diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue index cc8a421a..22d89b2a 100644 --- a/src/views/enm_coal/handoverLog.vue +++ b/src/views/enm_coal/handoverLog.vue @@ -3,298 +3,255 @@
交接班日志
- - - - + + + + - - + + - +
- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
- 导出xlsx - - 打印 - -
+ 导出xlsx + + 打印 + + -
-
- {{sflogItem.end_time.slice(0,10)}}{{ sflogItem.shift_name }} - {{ sflogItem.team_name }} - 交接班记录 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
日期{{sflogItem.end_time.slice(0,10)}}班次{{ sflogItem.shift_name }}班组{{ sflogItem.team_name }}
产量（t）{{reportItem.total_production}}台时（t/h）{{reportItem.production_hour}}运转时间（h）{{reportItem.run_hour}}
运转率（%）{{reportItem.run_rate*100}}停机时长（h）{{reportItem.shut_hour}}煤磨分布电耗（KW·h/t）{{reportItem.elec_consume_unit}}
煤粉细度合格率（%）{{reportItem.煤粉_细度_rate_pass*100}}0煤粉水分合格率（%）{{reportItem.煤粉_水分_rate_pass*100}}0
生产情况记录时间类别原因处置措施处置人
{{ item.happen_time}}{{ item.cate}}{{ item.reason}}{{ item.measure}}{{ item.handler}}
+
+
+ {{ sflogItem.end_time.slice(0, 10) }}{{ sflogItem.shift_name }} + {{ sflogItem.team_name }} + 交接班记录
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
日期{{ sflogItem.end_time.slice(0, 10) }}班次{{ sflogItem.shift_name }}班组{{ sflogItem.team_name }}
产量（t）{{ reportItem.total_production }}台时（t/h）{{ reportItem.production_hour }}运转时间（h）{{ reportItem.run_hour }}
运转率（%）{{ reportItem.run_rate * 100 }}停机时长（h）{{ reportItem.shut_hour }}煤磨分布电耗（KW·h/t）{{ reportItem.elec_consume_unit }}
煤粉细度合格率（%）{{ reportItem.煤粉_细度_rate_pass * 100 }}0煤粉水分合格率（%）{{ reportItem.煤粉_水分_rate_pass * 100 }}0
生产情况记录时间类别原因处置措施处置人
{{ item.happen_time }}{{ item.cate }}{{ item.reason }}{{ item.measure }}{{ item.handler }}
+
+ exportExcel() { + this.exportLoading = true; + this.$XLSX('#myTable', this.tableName) + this.exportLoading = false; + }, + }, +}; + - + \ No newline at end of file diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue index 78431011..c05840ce 100644 --- a/src/views/enm_kiln/handoverLog.vue +++ b/src/views/enm_kiln/handoverLog.vue @@ -1,324 +1,282 @@ - + exportExcel() { + this.exportLoading = true; + this.$XLSX('#myTable', this.tableName) + this.exportLoading = false; + }, + }, +}; + - + \ No newline at end of file diff --git a/src/views/enm_mill/handoverLog.vue b/src/views/enm_mill/handoverLog.vue index 92b91b92..266e25b2 100644 --- a/src/views/enm_mill/handoverLog.vue +++ b/src/views/enm_mill/handoverLog.vue @@ -1,302 +1,258 @@ - + exportExcel() { + this.exportLoading = true; + this.$XLSX('#myTable', this.tableName) + this.exportLoading = false; + }, + }, +}; + - + \ No newline at end of file diff --git a/src/views/enm_pack/handoverLog.vue b/src/views/enm_pack/handoverLog.vue index 52166f86..c00f1f46 100644 --- a/src/views/enm_pack/handoverLog.vue +++ b/src/views/enm_pack/handoverLog.vue @@ -1,281 +1,237 @@ - + exportExcel() { + this.exportLoading = true; + this.$XLSX('#myTable', this.tableName) + this.exportLoading = false; + }, + }, +}; + - + \ No newline at end of file diff --git a/src/views/enm_rm/handoverLog.vue b/src/views/enm_rm/handoverLog.vue index 13cded44..aeb808e3 100644 --- a/src/views/enm_rm/handoverLog.vue +++ b/src/views/enm_rm/handoverLog.vue @@ -1,204 +1,155 @@ - + handlePrint() { + this.$PRINT('#myReport'); + }, + exportExcel() { + this.exportLoading = true; + this.$XLSX('#myTable', this.tableName) + this.exportLoading = false; + }, + }, +}; + - + \ No newline at end of file diff --git a/src/views/enm_rm/handover_form.vue b/src/views/enm_rm/handover_form.vue index afb5eb33..0efc5054 100644 --- a/src/views/enm_rm/handover_form.vue +++ b/src/views/enm_rm/handover_form.vue @@ -1,225 +1,184 @@ - - + //表单注入数据 + setData(data) { + Object.assign(this.form, data); + }, + //设置过滤项 + setFilters(filters) { + this.selectionFilters = filters; + this.setFiltersVisible = true; + }, + }, +}; + + \ No newline at end of file diff --git a/src/views/enm_rm/other_form.vue b/src/views/enm_rm/other_form.vue index 5706486f..0388fce6 100644 --- a/src/views/enm_rm/other_form.vue +++ b/src/views/enm_rm/other_form.vue @@ -1,189 +1,174 @@ - - + //表单注入数据 + setData(data) { + Object.assign(this.form, data); + }, + //设置过滤项 + setFilters(filters) { + this.selectionFilters = filters; + this.setFiltersVisible = true; + }, + }, +}; + + \ No newline at end of file diff --git a/src/views/enm_slag/handoverLog.vue b/src/views/enm_slag/handoverLog.vue index 2d4c85e7..c9d199ed 100644 --- a/src/views/enm_slag/handoverLog.vue +++ b/src/views/enm_slag/handoverLog.vue @@ -1,277 +1,234 @@ - + exportExcel() { + this.exportLoading = true; + this.$XLSX('#myTable', this.tableName) + this.exportLoading = false; + }, + }, +}; + - + \ No newline at end of file diff --git a/src/views/hrm/attendance_form.vue b/src/views/hrm/attendance_form.vue index 241da751..0565e8e7 100644 --- a/src/views/hrm/attendance_form.vue +++ b/src/views/hrm/attendance_form.vue @@ -1,32 +1,13 @@ - + diff --git a/src/views/mtm/mgroup.vue b/src/views/mtm/mgroup.vue index e7412a39..a752acbc 100644 --- a/src/views/mtm/mgroup.vue +++ b/src/views/mtm/mgroup.vue @@ -19,6 +19,13 @@ + + + + @@ -36,11 +43,7 @@ - + \ No newline at end of file diff --git a/src/views/ungrouped/inspect.vue b/src/views/ungrouped/inspect.vue index e310a717..8323f168 100644 --- a/src/views/ungrouped/inspect.vue +++ b/src/views/ungrouped/inspect.vue @@ -4,105 +4,71 @@
质量检验
- - - - + + + + - - + + - +
- - - - - - + + + + + + - - + }, + }, +}; + \ No newline at end of file diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue index 7abca915..c5e021cb 100644 --- a/src/views/wpm/worktask_form.vue +++ b/src/views/wpm/worktask_form.vue @@ -1,157 +1,84 @@ \ No newline at end of file