diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index b8c8efa..9292fa5 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 6d6b55e..c5ac5e8 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 6f3d27a..8d0cdf2 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -15,9 +15,8 @@ - - - CurrentPage + Login.aspx + SpecificPage True False False diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index baa8804..9ecdad1 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs index 6c475bd..c0d8937 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs @@ -291,32 +291,32 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport ws.GetRow(rowIndex + 2).GetCell(19).SetCellValue("Remark"); ws.GetRow(rowIndex).Height = 69 * 20; - ws.GetRow(rowIndex + 1).Height = 12 * 20; - ws.GetRow(rowIndex + 2).Height = 24 * 20; + ws.GetRow(rowIndex + 1).Height = 15 * 20; + ws.GetRow(rowIndex + 2).Height = 30 * 20; ws.SetColumnWidth(0, 4 * 256); ws.SetColumnWidth(1, (int)(22.67 * 256)); ws.SetColumnWidth(2, (int)(9.78 * 256)); - ws.SetColumnWidth(3, (int)(6.78 * 256)); + ws.SetColumnWidth(3, (int)(5.33 * 256)); ws.SetColumnWidth(4, (int)(7.67 * 256)); ws.SetColumnWidth(5, (int)(8.33 * 256)); - ws.SetColumnWidth(6, (int)(6.33 * 256)); - ws.SetColumnWidth(7, (int)(9.11 * 256)); + ws.SetColumnWidth(6, (int)(4.42 * 256)); + ws.SetColumnWidth(7, (int)(10.82 * 256)); ws.SetColumnWidth(8, (int)(8.33 * 256)); ws.SetColumnWidth(9, (int)(8.40 * 256)); ws.SetColumnWidth(10, (int)(15.67 * 256)); - ws.SetColumnWidth(11, (int)(11.67 * 256)); + ws.SetColumnWidth(11, (int)(12 * 256)); ws.SetColumnWidth(12, (int)(8.22 * 256)); ws.SetColumnWidth(13, (int)(16.33 * 256)); - ws.SetColumnWidth(14, (int)(11.22 * 256)); - ws.SetColumnWidth(15, (int)(10.44 * 256)); - ws.SetColumnWidth(16, (int)(5.56 * 256)); - ws.SetColumnWidth(17, (int)(5.56 * 256)); - ws.SetColumnWidth(18, (int)(7.89 * 256)); + ws.SetColumnWidth(14, (int)(11.45 * 256)); + ws.SetColumnWidth(15, (int)(11.00 * 256)); + ws.SetColumnWidth(16, (int)(4.00 * 256)); + ws.SetColumnWidth(17, (int)(4.00 * 256)); + ws.SetColumnWidth(18, (int)(9.00 * 256)); ws.SetColumnWidth(19, (int)(9.33 * 256)); #endregion - - const int pageSize = 64; + + const int pageSize = 67; DataTable dt = GetDataTable(); var style3 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 9, false, false, "sans-serif"); @@ -370,7 +370,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport var distinctWelder = dt.AsEnumerable().GroupBy(row => row.Field("WelderCode")).Select(group => group.First()); decimal sumSize = decimal.Parse(dt.Compute("sum(Size)", "").ToString()); - ws.GetRow(dt.Rows.Count + 3).GetCell(0).SetCellValue("合计"); + ws.GetRow(dt.Rows.Count + 3).GetCell(0).SetCellValue("Total"); ws.GetRow(dt.Rows.Count + 3).GetCell(1).SetCellValue($"{distinctPipelineCode.Count().ToString()}"); ws.GetRow(dt.Rows.Count + 3).GetCell(3).SetCellValue($"{dt.Rows.Count}"); ws.GetRow(dt.Rows.Count + 3).GetCell(6).SetCellValue($"{sumSize}"); @@ -382,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport #region 页脚部分 IFooter footer = ws.Footer; - string str = "CC7: 监理: Worley:"; + string str = " CC7: 监理: Worley:"; str += "\n\n第 &P 页,共 &N 页"; footer.Center = str;