From 0a7989934b6d561e32ae61d3af16cbf773074da2 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 十二月 2024 10:55:17 +0800
Subject: [PATCH] 修复报错
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWordReport.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWordReport.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWordReport.cs
index 810c383..0f87d22 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWordReport.cs
+++ b/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 璁惧埆鍩烘湰閰嶇疆琛�
@@ -597,15 +599,13 @@
Text_left_12_black.structureLeft20Text("3.1.3 閫氳繃姘存车鎬ц兘鏇茬嚎妯℃嫙锛屾按娉佃繍琛屽湪涓�瀹氱殑宸ュ喌涓嬶紝鍏舵祦閲廞銆佹壃绋婬銆佸姛鐜嘝銆佹晥鐜囄风浉瀵瑰簲锛涘疄闄呮�ц兘涓庢爣鍑嗘�ц兘涓�鑸樊寮傦紙涓昏涓烘晥鐜囄锋寚鏍囷級");
Text_left_12_black.structureLeft20Text("3.1.4 绠¤矾绯荤粺鍘嬪姏闄嶆崲绠楀熀鏈叕寮忥紙i浠ｈ〃鍗曚綅绫抽暱搴︾閬撲笂娌跨▼闃诲姏绯绘暟锛�");
- // 鎻掑叆鍥剧墖
- // builder.Write(" ");
+ Text_left_12_black.structureTextAndImage(Xhs.Core.Properties.Resources.Pressure_conversion_formula_big1_2, 30, 150);
- Text_left_12_black.structureTextAndImage("00-core\\Pressure_conversion_formula_big1.2.png", 30, 150);
// builder.Write(" ");
- Text_left_12_black.structureTextAndImage("00-core\\Pressure_conversion_formula_small1.2.png", 35, 220);
+ Text_left_12_black.structureTextAndImage(Xhs.Core.Properties.Resources.Pressure_conversion_formula_small1_2, 35, 220);
Text_left_12_black.structureLeft20Text("3.1.5 灞�閮ㄩ樆鍔涜绠楀叕寮�");
// builder.Write(" ");
- Text_left_12_black.structureTextAndImage("00-core\\Local_resistance.png", 35, 60);
+ Text_left_12_black.structureTextAndImage(Xhs.Core.Properties.Resources.Local_resistance, 35, 60);
Text_left_12_black.structureLeft20Text("3.1.6 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯伙紙鍙傝�冿級");
#region 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯昏〃
--
Gitblit v1.9.3