diff --git a/src/api/canteen/canteenReport.ts b/src/api/canteen/canteenReport.ts index 65d295a2..2709e831 100644 --- a/src/api/canteen/canteenReport.ts +++ b/src/api/canteen/canteenReport.ts @@ -14,10 +14,20 @@ export function delFaceImportLog(ids?: Object) { }) } export function fetchFaceDetailPage(query?: Object) { - return request({ url: "/canteen/canteenReport/faceImport/detail/page", method: "get", params: query }) + return request({ + url: "/canteen/canteenReport/faceImport/detail/page", + method: "get", + params: query, + timeout: 120000, + }) } export function fetchFaceDetailSum(query?: Object) { - return request({ url: "/canteen/canteenReport/faceImport/detail/sum", method: "get", params: query }) + return request({ + url: "/canteen/canteenReport/faceImport/detail/sum", + method: "get", + params: query, + timeout: 120000, + }) } export function importFaceExcel(data: FormData, params: Object) { return request({ @@ -39,7 +49,12 @@ export function aggregateFaceToSwipe(params: Object) { }) } export function fetchFaceOrgLevel2(query?: Object) { - return request({ url: "/canteen/canteenReport/faceImport/orgLevel2", method: "get", params: query }) + return request({ + url: "/canteen/canteenReport/faceImport/orgLevel2", + method: "get", + params: query, + timeout: 120000, + }) } /** 结算台厂区 */ diff --git a/src/views/canteen/canteenReportFaceImport/index.vue b/src/views/canteen/canteenReportFaceImport/index.vue index 0479efe7..f6181ef0 100644 --- a/src/views/canteen/canteenReportFaceImport/index.vue +++ b/src/views/canteen/canteenReportFaceImport/index.vue @@ -17,7 +17,8 @@ - + + @@ -54,13 +55,13 @@ :closable="false" show-icon class="mb-3" - :title="`后台仍有导入任务进行中,列表约每 5 秒自动刷新…${importEtaHint ? ' ' + importEtaHint : ''}`" + :title="`后台仍有导入/删除任务进行中,列表约每 5 秒自动刷新…${importEtaHint ? ' ' + importEtaHint : ''}`" /> 成功 失败 导入中 + 删除中 {{ row.status || "-" }} @@ -107,12 +109,17 @@