diff --git a/src/styles/index.scss b/src/styles/index.scss index 9cce3129..ef44d2f7 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -340,3 +340,13 @@ h3 { color: white; } } +//统一标准全局class 张丁予20200213 +.machineTool { // 机床Select + .el-input{ + width:180px; + } +} +.el-select{ + width:150px; + margin-right: 10px; +} diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue index debedd5e..4d1cb98c 100644 --- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue +++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue @@ -184,11 +184,11 @@ export default { // 导出 exportTable() { import('./Export2Excel').then(excel => { - const filterVal1 = ['姓名', '理论加工时间段', '实际加工时间段', '比例'] + const filterVal1 = ['姓名', '理论加工时间段', '设备工时', '比例'] const data1 = this.tableData.map(v => filterVal1.map(j => v[j])) const dataGroup = [] dataGroup.push(data1) - const headerGroup = [['操作者', '计划工时', '加工工时', '比例']] + const headerGroup = [['操作者', '计划工时', '实际工时', '比例']] const sheetGroup = ['工时统计表'] excel.export_json_to_excel({ headerGroup: headerGroup,