From 4ebc46d4ae176be30f15806309d010285f9a3477 Mon Sep 17 00:00:00 2001 From: liyh Date: Fri, 10 May 2024 18:24:57 +0800 Subject: [PATCH 1/2] 1112 --- .../WeldingManage/JointInfo.aspx.cs | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs index 41cc615..34d63eb 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs @@ -1232,18 +1232,31 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 8, rowIndex + 8, style, 0, 14, false, false, true); rowIndex += 9; + ws.SetRowBreak(rowIndex - 1); } + ws.PrintSetup.FitWidth = 1; ws.PrintSetup.FitHeight = 0; - ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; - ws.FitToPage = true; ws.SetMargin(MarginType.LeftMargin, 0.3); ws.SetMargin(MarginType.RightMargin, 0.2); ws.PrintSetup.Landscape = true; - ws.PrintSetup.Scale = 75; - ws.PrintSetup.PaperSize = 9; + ws.PrintSetup.Scale = 69; ws.ForceFormulaRecalculation = true; + ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; + + + //ws.PrintSetup.FitWidth = 1; + //ws.PrintSetup.FitHeight = 0; + //ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; + + //ws.FitToPage = true; + //ws.SetMargin(MarginType.LeftMargin, 0.3); + //ws.SetMargin(MarginType.RightMargin, 0.2); + //ws.PrintSetup.Landscape = true; + //ws.PrintSetup.Scale = 75; + //ws.PrintSetup.PaperSize = 9; + //ws.ForceFormulaRecalculation = true; using (FileStream filess = System.IO.File.OpenWrite(ReportFileName)) { From 6838e2bbf9811dc85282f7d7e20ff76f301cf86b Mon Sep 17 00:00:00 2001 From: liyh Date: Fri, 10 May 2024 18:51:49 +0800 Subject: [PATCH 2/2] 123 --- .../WeldingProcess/WeldingManage/JointInfo.aspx.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs index 34d63eb..4d86810 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx.cs @@ -979,18 +979,18 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage XSSFWorkbook hssfworkbook = new XSSFWorkbook(); XSSFSheet ws = (XSSFSheet)hssfworkbook.CreateSheet("管道焊接工作记录"); - #region 列宽 + #region 列宽 ws.SetColumnWidth(0, 18 * 256); ws.SetColumnWidth(1, 9 * 256); ws.SetColumnWidth(2, 6 * 256); ws.SetColumnWidth(3, 12 * 256); ws.SetColumnWidth(4, 18 * 256); - ws.SetColumnWidth(5, 19 * 256); - ws.SetColumnWidth(6, 16 * 256); + ws.SetColumnWidth(5, 15 * 256); + ws.SetColumnWidth(6, 15 * 256); ws.SetColumnWidth(7, 13 * 256); - ws.SetColumnWidth(8, 14 * 256); - ws.SetColumnWidth(9, 13 * 256); + ws.SetColumnWidth(8, 10 * 256); + ws.SetColumnWidth(9, 10 * 256); ws.SetColumnWidth(10, 13 * 256); ws.SetColumnWidth(11, 10 * 256); ws.SetColumnWidth(12, 16 * 256); @@ -1241,7 +1241,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage ws.SetMargin(MarginType.LeftMargin, 0.3); ws.SetMargin(MarginType.RightMargin, 0.2); ws.PrintSetup.Landscape = true; - ws.PrintSetup.Scale = 69; + ws.PrintSetup.Scale = 70; ws.ForceFormulaRecalculation = true; ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small;