diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 9927d34..fcfc1ce 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs index dbbdaf1..6913039 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs @@ -378,14 +378,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport string str= "CC7: 监理: Worley:"; str += "\n\n第 &P 页,共 &N 页"; footer.Center = str; - - + + + #endregion + + + #region + #endregion - - ws.PrintSetup.FitWidth = 1; - ws.PrintSetup.FitHeight = 0; - ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; ws.FitToPage = false; ws.SetMargin(MarginType.LeftMargin, (double)1.2 / 3); ws.SetMargin(MarginType.RightMargin, (double)1.2 / 3); @@ -395,6 +396,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport ws.PrintSetup.Scale = 70; ws.ForceFormulaRecalculation = true; + ws.PrintSetup.FitWidth = 1; + ws.PrintSetup.FitHeight = 0; + ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; using (FileStream filess = System.IO.File.OpenWrite(ReportFileName)) { hssfworkbook.Write(filess);