mkm/iot-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] 导出excel

Browse Source
This commit is contained in:
醉挽清风 2023-03-08 10:24:12 +08:00
parent 973d8986a8
commit 39d5c8b197
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/controller/DownloadController.php
View File

@ -33,6 +33,6 @@ class DownloadController extends BaseAdminController
//下载前删除缓存
Cache::delete($fileKey);
return download($fileInfo['src'] . $fileInfo['name'], $fileInfo['name']);
return response()->download($fileInfo['src'] . $fileInfo['name'],$fileInfo['name']);
}
}

3
app/common/lists/ListsExcelTrait.php
View File

@ -92,8 +92,7 @@ trait ListsExcelTrait
}
$writer->save($src . $this->fileName);
//设置本地excel缓存并返回下载地址
$vars = ['file' => $exportCache->setFile($this->fileName)];
return (string)(url('admin/download/export', $vars, true, true));
return 'http://'.request()->host().'/admin/download/export?file='.$exportCache->setFile($this->fileName);
}
/**
* @notes 获取导出信息