duheng
2024-12-11 c57f91169c333a88aae627b99136c87786f229d3
修改概况
已修改2个文件
17 ■■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWordReport.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWordReport.cs
@@ -87,7 +87,7 @@
            return strem;
        }
        protected void SetWordHander(Aspose.Words.Document doc, string title,string reportType)
        protected void SetWordHander(Aspose.Words.Document doc, string title, string reportType)
        {
            DocumentBuilder builder = new Aspose.Words.DocumentBuilder(doc);
            builder.MoveToHeaderFooter(HeaderFooterType.HeaderPrimary);
@@ -98,7 +98,7 @@
            builder.MoveToDocumentStart();
        }
        protected void SetWordFooter(Aspose.Words.Document doc, string title,string reportType)
        protected void SetWordFooter(Aspose.Words.Document doc, string title, string reportType)
        {
            DocumentBuilder builder = new Aspose.Words.DocumentBuilder(doc);
@@ -119,8 +119,10 @@
            SimulationWordReportHelper Text_center_25_black = new SimulationWordReportHelper(builder) { fontalignment = ParagraphAlignment.Center, fontsize = 25, isblod = true };//主标题
            SimulationWordReportHelper Text_left_15_black = new SimulationWordReportHelper(builder) { fontsize = 15, isblod = true };//一级标题
            SimulationWordReportHelper Text_left_12_black = new SimulationWordReportHelper(builder) { fontsize = 12 };
            SimulationWordReportHelper Text_left_13_black = new SimulationWordReportHelper(builder) { fontsize = 13 };
            SimulationWordReportHelper Text_reight_10_black = new SimulationWordReportHelper(builder) { fontalignment = ParagraphAlignment.Right, fontsize = 12 };
            SetWordHander(src, reportViewModel.ProjectName,reportViewModel.ReportType);
            SetWordHander(src, reportViewModel.ProjectName, reportViewModel.ReportType);
            SetWordFooter(src, reportViewModel.ProjectName, reportViewModel.ReportType);
            builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Multiple;
@@ -133,11 +135,11 @@
            SimulationWordReportHelper Cell_h_merging_start = new SimulationWordReportHelper(builder) { horizontalMerge = Aspose.Words.Tables.CellMerge.First };
            SimulationWordReportHelper Cell_h_merging_end = new SimulationWordReportHelper(builder) { horizontalMerge = Aspose.Words.Tables.CellMerge.Previous };
            Text_center_25_black.structureText(string.Format("{0}{1}", reportViewModel.ProjectName, "项目节能方案报告"));
            Text_center_25_black.structureText(string.Format("{0}{1}", reportViewModel.ProjectName, reportViewModel.ReportType));
            Text_left_15_black.structureText("一、系统概述");
            Text_left_15_black.AddBlankLine();
            Text_left_15_black.AddBlankLine();
            Text_left_12_black.structureText(string.Format("{0}", reportViewModel.Description));
            //  Text_left_15_black.AddBlankLine();
            // Text_left_15_black.AddBlankLine();
            Text_left_13_black.structureText(string.Format("{0}", reportViewModel.Description));
            Text_left_12_black.structureText("1.1、设备基本配置");
            #region 设别基本配置表
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs
@@ -21,6 +21,7 @@
            }
            SimulationWordReport word = new SimulationWordReport();
            var test1 = new ReportViewModel();
            test1.Description = "制氮循环水模拟测试";
            test1.ValveOpens = new List<ValveOpen>();
            test1.ValveOpens.Add(new ValveOpen { Name = "测试1", MinorLoss = "20" });
            test1.ValveOpens.Add(new ValveOpen { Name = "测试2", MinorLoss = "20" });