This commit is contained in:
zhangdingyu
2019-09-24 14:37:03 +08:00
parent c42c2ef297
commit f7a4975c0a
11 changed files with 25 additions and 23 deletions

View File

@@ -48,7 +48,9 @@
type="date"
placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出所选机床的加工进度" placement="top">
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -392,9 +394,9 @@ export default {
}
}
},
// created() {
// this.getMachine()
// },
created() {
this.getMachine()
},
methods: {
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {