diff --git a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj index 0c41213b..9b3889b7 100644 --- a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj +++ b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj @@ -9,7 +9,11 @@ - + + + + + diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs index f3133814..3355ff89 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs @@ -92,7 +92,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService public Stream GetExcelTemplateStream() { var stream = System.Reflection.Assembly.GetExecutingAssembly() - .GetManifestResourceStream("AsbCloudInfrastructure.Services.WellOperationService.WellOperationImportTemplate.xltx"); + .GetManifestResourceStream("AsbCloudInfrastructure.Services.WellOperationService.WellOperationImportTemplate.xlsx"); return stream; } @@ -104,7 +104,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService AddOperationsToWorkbook(workbook, operations); MemoryStream memoryStream = new MemoryStream(); - workbook.SaveAs(memoryStream); + workbook.SaveAs(memoryStream, new SaveOptions { }); memoryStream.Seek(0, SeekOrigin.Begin); return memoryStream; } diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx new file mode 100644 index 00000000..1798d7d8 Binary files /dev/null and b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx differ diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xltx b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xltx deleted file mode 100644 index 0197218c..00000000 Binary files a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xltx and /dev/null differ diff --git a/AsbCloudWebApi/wwwroot/asset-manifest.json b/AsbCloudWebApi/wwwroot/asset-manifest.json index dd67d6f5..ae1c9c68 100644 --- a/AsbCloudWebApi/wwwroot/asset-manifest.json +++ b/AsbCloudWebApi/wwwroot/asset-manifest.json @@ -1,23 +1,23 @@ { "files": { - "main.css": "/static/css/main.1a531ce4.chunk.css", - "main.js": "/static/js/main.d3cf7fb0.chunk.js", - "main.js.map": "/static/js/main.d3cf7fb0.chunk.js.map", - "runtime-main.js": "/static/js/runtime-main.b402d8a8.js", - "runtime-main.js.map": "/static/js/runtime-main.b402d8a8.js.map", - "static/js/2.f3289dc7.chunk.js": "/static/js/2.f3289dc7.chunk.js", - "static/js/2.f3289dc7.chunk.js.map": "/static/js/2.f3289dc7.chunk.js.map", - "static/js/3.a064d157.chunk.js": "/static/js/3.a064d157.chunk.js", - "static/js/3.a064d157.chunk.js.map": "/static/js/3.a064d157.chunk.js.map", + "main.css": "/static/css/main.e92a8ff6.chunk.css", + "main.js": "/static/js/main.edfb453f.chunk.js", + "main.js.map": "/static/js/main.edfb453f.chunk.js.map", + "runtime-main.js": "/static/js/runtime-main.9eaada4e.js", + "runtime-main.js.map": "/static/js/runtime-main.9eaada4e.js.map", + "static/js/2.d92842c3.chunk.js": "/static/js/2.d92842c3.chunk.js", + "static/js/2.d92842c3.chunk.js.map": "/static/js/2.d92842c3.chunk.js.map", + "static/js/3.5f51fb69.chunk.js": "/static/js/3.5f51fb69.chunk.js", + "static/js/3.5f51fb69.chunk.js.map": "/static/js/3.5f51fb69.chunk.js.map", "index.html": "/index.html", - "static/css/main.1a531ce4.chunk.css.map": "/static/css/main.1a531ce4.chunk.css.map", - "static/js/2.f3289dc7.chunk.js.LICENSE.txt": "/static/js/2.f3289dc7.chunk.js.LICENSE.txt", + "static/css/main.e92a8ff6.chunk.css.map": "/static/css/main.e92a8ff6.chunk.css.map", + "static/js/2.d92842c3.chunk.js.LICENSE.txt": "/static/js/2.d92842c3.chunk.js.LICENSE.txt", "static/media/pointer.e8df778c.svg": "/static/media/pointer.e8df778c.svg" }, "entrypoints": [ - "static/js/runtime-main.b402d8a8.js", - "static/js/2.f3289dc7.chunk.js", - "static/css/main.1a531ce4.chunk.css", - "static/js/main.d3cf7fb0.chunk.js" + "static/js/runtime-main.9eaada4e.js", + "static/js/2.d92842c3.chunk.js", + "static/css/main.e92a8ff6.chunk.css", + "static/js/main.edfb453f.chunk.js" ] } \ No newline at end of file diff --git a/AsbCloudWebApi/wwwroot/index.html b/AsbCloudWebApi/wwwroot/index.html index 22d65a14..7896c513 100644 --- a/AsbCloudWebApi/wwwroot/index.html +++ b/AsbCloudWebApi/wwwroot/index.html @@ -1 +1 @@ -АСБ Vision
\ No newline at end of file +АСБ Vision
\ No newline at end of file