diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js
index 5bab3b71..b274b8bd 100644
--- a/src/api/ManufacturingCenter/machiningHoursStatistics.js
+++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js
@@ -26,6 +26,18 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
}
})
}
+// 查询人员具体工序
+export function searchtable22(num1, num2, num3, num4) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_工时统计按人员查询_查询数据2',
+ param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4
+ }
+ })
+}
// 初始化机床项目
export function initProject() {
return request({
@@ -63,3 +75,15 @@ export function searchtable5(num1, pageCurrent, pageSize) {
}
})
}
+// 车间生产管理工艺_工时统计_组号查询_查询数据
+export function searchtable55(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_工时统计_组号查询_查询数据',
+ param: '机床流水号=' + num1
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/Export2Excel.js b/src/views/ManufacturingCenter/machiningHoursStatistics/Export2Excel.js
new file mode 100644
index 00000000..a4a80fd7
--- /dev/null
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/Export2Excel.js
@@ -0,0 +1,224 @@
+/* eslint-disable */
+require('script-loader!file-saver');
+// import XLSX from 'xlsx'
+import XLSX from 'xlsx-style'
+function generateArray(table) {
+ var out = [];
+ var rows = table.querySelectorAll('tr');
+ var ranges = [];
+ for (var R = 0; R < rows.length; ++R) {
+ var outRow = [];
+ var row = rows[R];
+ var columns = row.querySelectorAll('td');
+ for (var C = 0; C < columns.length; ++C) {
+ var cell = columns[C];
+ var colspan = cell.getAttribute('colspan');
+ var rowspan = cell.getAttribute('rowspan');
+ var cellValue = cell.innerText;
+ if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+
+ //Skip ranges
+ ranges.forEach(function (range) {
+ if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+ for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+ }
+ });
+
+ //Handle Row Span
+ if (rowspan || colspan) {
+ rowspan = rowspan || 1;
+ colspan = colspan || 1;
+ ranges.push({
+ s: {
+ r: R,
+ c: outRow.length
+ },
+ e: {
+ r: R + rowspan - 1,
+ c: outRow.length + colspan - 1
+ }
+ });
+ };
+
+ //Handle Value
+ outRow.push(cellValue !== "" ? cellValue : null);
+
+ //Handle Colspan
+ if (colspan)
+ for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
+ }
+ out.push(outRow);
+ }
+ return [out, ranges];
+};
+
+function datenum(v, date1904) {
+ if (date1904) v += 1462;
+ var epoch = Date.parse(v);
+ return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+}
+
+function sheet_from_array_of_arrays(data, opts) {
+ var ws = {};
+ var range = {
+ s: {
+ c: 10000000,
+ r: 10000000
+ },
+ e: {
+ c: 0,
+ r: 0
+ }
+ };
+ for (var R = 0; R != data.length; ++R) {
+ for (var C = 0; C != data[R].length; ++C) {
+ if (range.s.r > R) range.s.r = R;
+ if (range.s.c > C) range.s.c = C;
+ if (range.e.r < R) range.e.r = R;
+ if (range.e.c < C) range.e.c = C;
+ var cell = {
+ v: data[R][C]
+ };
+ if (cell.v == null) continue;
+ var cell_ref = XLSX.utils.encode_cell({
+ c: C,
+ r: R
+ });
+
+ if (typeof cell.v === 'number') cell.t = 'n';
+ else if (typeof cell.v === 'boolean') cell.t = 'b';
+ else if (cell.v instanceof Date) {
+ cell.t = 'n';
+ cell.z = XLSX.SSF._table[14];
+ cell.v = datenum(cell.v);
+ } else cell.t = 's';
+
+ ws[cell_ref] = cell;
+ }
+ }
+ if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+ return ws;
+}
+
+function Workbook() {
+ if (!(this instanceof Workbook)) return new Workbook();
+ this.SheetNames = [];
+ this.Sheets = {};
+}
+
+function s2ab(s) {
+ var buf = new ArrayBuffer(s.length);
+ var view = new Uint8Array(buf);
+ for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+ return buf;
+}
+
+export function export_table_to_excel(id) {
+ var theTable = document.getElementById(id);
+ var oo = generateArray(theTable);
+ var ranges = oo[1];
+
+ /* original data */
+ var data = oo[0];
+ var ws_name = "SheetJS";
+
+ var wb = new Workbook(),
+ ws = sheet_from_array_of_arrays(data);
+
+ /* add ranges to worksheet */
+ // ws['!cols'] = ['apple', 'banan'];
+ ws['!merges'] = ranges;
+
+ /* add worksheet to workbook */
+ wb.SheetNames.push(ws_name);
+ wb.Sheets[ws_name] = ws;
+
+ var wbout = XLSX.write(wb, {
+ bookType: 'xlsx',
+ bookSST: false,
+ type: 'binary'
+ });
+
+ saveAs(new Blob([s2ab(wbout)], {
+ type: "application/octet-stream"
+ }), "test.xlsx")
+}
+
+export function export_json_to_excel({
+ headerGroup,
+ dataGroup,
+ sheetGroup,
+ filename,
+ autoWidth = true,
+ bookType= 'xlsx'
+} = {}) {
+ var wb = new Workbook()
+ for (let i = 0; i < dataGroup.length; i++) {
+ /* original data */
+ let data = dataGroup[i]
+ filename = filename || 'excel-list'
+ data = [...data]
+ data.unshift(headerGroup[i]);
+ var ws_name = sheetGroup[i];
+ var ws = sheet_from_array_of_arrays(data);
+
+ if (autoWidth) {
+ /*设置worksheet每列的最大宽度*/
+ const colWidth = data.map(row => row.map(val => {
+ /*先判断是否为null/undefined*/
+ if (val == null) {
+ return {
+ 'wch': 10
+ };
+ }
+ /*再判断是否为中文*/
+ else if (val.toString().charCodeAt(0) > 255) {
+ return {
+ 'wch': val.toString().length * 2
+ };
+ } else {
+ return {
+ 'wch': val.toString().length
+ };
+ }
+ }))
+ /*以第一行为初始值*/
+ let result = colWidth[0];
+ for (let i = 1; i < colWidth.length; i++) {
+ for (let j = 0; j < colWidth[i].length; j++) {
+ if (result[j]['wch'] < colWidth[i][j]['wch']) {
+ result[j]['wch'] = colWidth[i][j]['wch'];
+ }
+ }
+ }
+ ws['!cols'] = result;
+ }
+ let R = 0;
+ data.map(item => {
+ let C = 0;
+ item.map(itm => {
+ var cell_ref = XLSX.utils.encode_cell({c:C,r:R});
+ var cell = {v: itm }
+ cell.s= {
+ alignment: {
+ horizontal: "center"
+ }
+ }
+ ws[cell_ref] = cell;
+ C++;
+ })
+ R++;
+ })
+ /* add worksheet to workbook */
+ wb.SheetNames.push(ws_name);
+ wb.Sheets[ws_name] = ws;
+ }
+ var wbout = XLSX.write(wb, {
+ bookType: bookType,
+ bookSST: false,
+ type: 'binary'
+ });
+ saveAs(new Blob([s2ab(wbout)], {
+ type: "application/octet-stream"
+ }), `${filename}.${bookType}`);
+}
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/exportExcel.js b/src/views/ManufacturingCenter/machiningHoursStatistics/exportExcel.js
new file mode 100644
index 00000000..c5075de7
--- /dev/null
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/exportExcel.js
@@ -0,0 +1,24 @@
+// 导出Excel方法（表格id，不加扩展名的文件名，sheet名）
+export function exportExcelMethod(tableId, fileName, sheetName) {
+ tableToExcel(tableId, fileName, sheetName)
+}
+const tableToExcel = (function() {
+ const uri = 'data:application/vnd.ms-excel;base64,'
+ // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定
+ const template = `{worksheet}`
+ const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) }
+ const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) }
+ return function(table, filename, sheetname) {
+ if (!table.nodeType) table = document.getElementById(table)
+ const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML }
+ const blob = new Blob([format(template, ctx)])
+ if ('msSaveOrOpenBlob' in navigator) {
+ window.navigator.msSaveOrOpenBlob(blob, filename + '.xls')
+ return
+ }
+ const aTag = document.createElement('a')
+ aTag.href = uri + base64(format(template, ctx))
+ aTag.download = filename
+ aTag.click()
+ }
+})()
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index fe3a562a..30cdc97f 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -22,6 +22,7 @@
type="date"
placeholder="选择日期"/>
查询
+ 导出
@@ -116,6 +117,7 @@
{{ item.name }}
+ 导出
@@ -185,7 +187,7 @@