diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 598bc78..b07f6fe 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -58,7 +58,7 @@ const user = { return new Promise((resolve, reject) => { login(userInfo).then(response => { const result = response - storage.set(ACCESS_TOKEN, result.token, 12 * 60 * 60 * 1000) + storage.set(ACCESS_TOKEN, result.token, 14 * 24 * 60 * 60 * 1000)//14天过期 commit('SET_TOKEN', result.token) resolve(response) }).catch(error => { diff --git a/src/views/admin/RepairList.vue b/src/views/admin/RepairList.vue index e9d3b18..02c53bf 100644 --- a/src/views/admin/RepairList.vue +++ b/src/views/admin/RepairList.vue @@ -456,7 +456,21 @@ export default { } const startDate = this.dateRange[0].format('YYYY-MM-DD') const endDate = this.dateRange[1].format('YYYY-MM-DD') - exportRepair({ startDate: startDate, endDate: endDate }).then(res => { + + exportRepair({ + 'explain': this.queryParam.explain, + 'sn': this.queryParam.sn, + 'typeId': this.queryParam.typeId, + 'deviceId': this.queryParam.deviceId, + 'status': this.queryParam.status, + 'repairLevel': this.queryParam.repairLevel, + 'beginTime': startDate, + 'endTime': endDate, + 'evalService': this.queryParam.evalService, + 'timeout': this.queryParam.timeout, + 'remark': this.queryParam.remark, + 'name': this.queryParam.name + }).then(res => { this.exportExcel('工单数据', res) }) },