bug fixed
This commit is contained in:
@@ -53,6 +53,12 @@ namespace rmutr_report.Controllers
|
|||||||
stream.Seek(0, SeekOrigin.Begin);
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
return File(stream, "application/vnd.ms-excel");
|
return File(stream, "application/vnd.ms-excel");
|
||||||
break;
|
break;
|
||||||
|
case "xlsx":
|
||||||
|
Excel2007Export excel1 = new Excel2007Export();
|
||||||
|
report.Export(excel1, stream);
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
return File(stream, "application/vnd.ms-excel");
|
||||||
|
break;
|
||||||
case "mht":
|
case "mht":
|
||||||
MHTExport mht = new MHTExport();
|
MHTExport mht = new MHTExport();
|
||||||
report.Export(mht, stream);
|
report.Export(mht, stream);
|
||||||
@@ -318,10 +324,24 @@ namespace rmutr_report.Controllers
|
|||||||
workbook.SaveAs(stream);
|
workbook.SaveAs(stream);
|
||||||
var content = stream.ToArray();
|
var content = stream.ToArray();
|
||||||
string date = DateTime.Now.ToString("yyyyMMddHHmmss");
|
string date = DateTime.Now.ToString("yyyyMMddHHmmss");
|
||||||
|
// switch (type)
|
||||||
|
// {
|
||||||
|
// case "pdf":
|
||||||
|
// //Response.Clear();
|
||||||
|
// Response.Headers.Clear();
|
||||||
|
// Response.ContentType = "application/pdf";
|
||||||
|
// Response.Headers.Add("Content-Length", content.Length.ToString());
|
||||||
|
// stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
// return File(content,
|
||||||
|
// "application/pdf",
|
||||||
|
// "equipment_" + date + ".pdf");
|
||||||
|
// case "xlsx":
|
||||||
return File(
|
return File(
|
||||||
content,
|
content,
|
||||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||||
"equipment_" + date + ".xlsx");
|
"equipment_" + date + ".xlsx");
|
||||||
|
//}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -391,6 +411,12 @@ namespace rmutr_report.Controllers
|
|||||||
stream.Seek(0, SeekOrigin.Begin);
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
return File(stream, "application/vnd.ms-excel");
|
return File(stream, "application/vnd.ms-excel");
|
||||||
break;
|
break;
|
||||||
|
case "xlsx":
|
||||||
|
Excel2007Export excel1 = new Excel2007Export();
|
||||||
|
report.Export(excel1, stream);
|
||||||
|
stream.Seek(0, SeekOrigin.Begin);
|
||||||
|
return File(stream, "application/vnd.ms-excel");
|
||||||
|
break;
|
||||||
case "mht":
|
case "mht":
|
||||||
MHTExport mht = new MHTExport();
|
MHTExport mht = new MHTExport();
|
||||||
report.Export(mht, stream);
|
report.Export(mht, stream);
|
||||||
|
|||||||
Reference in New Issue
Block a user