From 26917739c47252ecdc3b8f43eca6ebaf9cba6ac4 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 10 十二月 2024 15:17:04 +0800
Subject: [PATCH] 提交报告修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs |  568 ++++++++++++++++++++++++-------------------------------
 1 files changed, 249 insertions(+), 319 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs
index 08c9934..eb55041 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs
@@ -20,7 +20,7 @@
         private string _run_mode = "*******************************************************************";
 
         //杩愯鏃堕棿璁$畻鏂瑰紡  浜岋級杩愯鎯呭喌涓庤兘鑰楀垎鏋愪腑  鈥滃勾骞冲潎杩愯鏃堕棿鎸夛細鈥濆悗
-        private string _avg_runtime_mode = "*******************************************************************";
+        private string _avg_runtime_mode = "**************************";
 
         //鎸塤Company_1鍏徃寰幆姘寸郴缁熷钩鍧囪繍琛�***灏忔椂    鍥涳級椤圭洰鑺傜數鏁堢泭鍒嗘瀽涓�
         private string _Company_1 = "****************";
@@ -61,9 +61,9 @@
         /// </summary>
         /// <param name="strFilePath"></param> 鏂囦欢璺緞
         /// <returns></returns>
-        public bool Create(string strFilePath)
+        public bool Create(string strFilePath, ReportViewModel reportViewModel)
         {
-            MemoryStream stream = Create4Stream();
+            MemoryStream stream = Create4Stream(reportViewModel);
             if (stream != null)
             {
                 var data_bytes = stream.ToArray();
@@ -79,10 +79,10 @@
             return true;
         }
 
-        protected MemoryStream Create4Stream()
+        protected MemoryStream Create4Stream(ReportViewModel reportViewModel)
         {
             Document doc = new Document();
-            CreatePage(doc);
+            CreatePage(doc, reportViewModel);
 
             doc.RemoveChild(doc.FirstSection);//鍒犻櫎绗竴椤电┖鐧�
 
@@ -96,7 +96,6 @@
         protected void SetWordHander(Aspose.Words.Document doc)
         {
             DocumentBuilder builder = new Aspose.Words.DocumentBuilder(doc);
-
             builder.MoveToHeaderFooter(HeaderFooterType.HeaderPrimary);
             SimulationWordReportHelper Text_center_10_Gray = new SimulationWordReportHelper(builder) { fontalignment = ParagraphAlignment.Right, fontsize = 10, fontcolor = Color.Gray };
             Text_center_10_Gray.structureText(string.Format("{0}{1}", _title, "椤圭洰鑺傝兘鏂规鎶ュ憡"));
@@ -117,7 +116,8 @@
             builder.MoveToDocumentStart();
         }
 
-        private void CreatePage(Document doc)
+        //姝f枃
+        private void CreatePage(Document doc, ReportViewModel reportViewModel)
         {
             Aspose.Words.Document src = new Aspose.Words.Document();
             Aspose.Words.DocumentBuilder builder = new Aspose.Words.DocumentBuilder(src);
@@ -140,22 +140,21 @@
             SimulationWordReportHelper Cell_h_merging_end = new SimulationWordReportHelper(builder) { horizontalMerge = Aspose.Words.Tables.CellMerge.Previous };
 
             Text_center_25_black.structureText(string.Format("{0}{1}", _title, "椤圭洰鑺傝兘鏂规鎶ュ憡"));
-            Text_left_15_black.structureText("涓�锛塡t绯荤粺姒傝堪");
-            builder.Writeln("");
-            Text_left_12_black.structureText(string.Format("     {0}", _Instructions));
-            builder.Writeln("");
-
-            Text_left_12_black.structureText("    1.1銆佽澶囧熀鏈厤缃�");
+            Text_left_15_black.structureText("涓�銆佺郴缁熸杩�");
+            Text_left_15_black.AddBlankLine();
+            Text_left_15_black.AddBlankLine();
+            Text_left_12_black.structureText(string.Format("{0}", _Instructions));
+            Text_left_12_black.structureText("1.1銆佽澶囧熀鏈厤缃�");
 
             #region 璁惧埆鍩烘湰閰嶇疆琛�
 
             var basic_config_table = builder.StartTable();
             Cell.SetFont(9);
-            Cell_v_merging_start.structureCell("绯荤粺鍚嶇О");
+            Cell_v_merging_start.structureCell("璁惧鍚嶇О");
             Cell_v_merging_start.structureCell("璁惧浣嶅彿");
             Cell_v_merging_start.structureCell("璁惧鍨嬪彿");
-            Cell.structureCell("璁惧鍨嬪彿");
             Cell.structureCell("棰濆畾娴侀噺");
+            Cell.structureCell("棰濆畾鎵▼");
             Cell_v_merging_start.structureCell("椹卞姩鏂瑰紡");
             Cell.structureCell("棰濆畾鐢靛帇");
             Cell.structureCell("棰濆畾鐢垫祦");
@@ -167,8 +166,8 @@
             Cell_v_merging_end.structureCell("");
             Cell_v_merging_end.structureCell("");
             Cell_v_merging_end.structureCell("");
+            Cell.structureCell("Q(m鲁/ h)");
             Cell.structureCell("H(m)");
-            Cell.structureCell("Q(m鲁/h)");
             Cell_v_merging_end.structureCell("");
             Cell.structureCell("U(kV)");
             Cell.structureCell("I(A)");
@@ -176,61 +175,39 @@
             Cell.structureCell("cos蠁");
             Cell.structureCell("r/m  ");
             builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
+            if (reportViewModel.Equipments != null)
+            {
+                foreach (var item in reportViewModel.Equipments)
+                {
+                    Cell.structureCell(item.EquipmentName);
+                    Cell.structureCell(item.EquipmentNumber);
+                    Cell.structureCell(item.EquipmentMainName);
+                    Cell.structureCell(item.RatedFlow);
+                    Cell.structureCell(item.RatedHead);
+                    Cell.structureCell(item.TypeOfDrive);
+                    Cell.structureCell("鐢垫満椹卞姩");
+                    Cell.structureCell(item.RatedCurrent);
+                    Cell.structureCell(item.RatedPower);
+                    Cell.structureCell(item.RatedFactor);
+                    Cell.structureCell(item.Speed);
+                    builder.EndRow();
+                }
+            }
             builder.EndTable();
             basic_config_table.AllowAutoFit = false;
             Processing_pagination(src, builder, basic_config_table);
 
             #endregion 璁惧埆鍩烘湰閰嶇疆琛�
 
-            Text_left_12_black.structureText("    1.2銆佽繍琛屽疄闄呮儏鍐�");
-            Text_left_12_black.structureText("     1.2.1 寰幆姘存车绔欒繍琛岀姸鍐�");
+            Text_left_12_black.structureLeft20Text("1.2銆佽繍琛屽疄闄呮儏鍐�");
+            Text_left_12_black.structureLeft20Text("1.2.1 寰幆姘存车绔欒繍琛岀姸鍐�");
 
             #region 寰幆姘存车绔欒繍琛岀姸鍐佃〃
 
             var pumpingStation_run_table = builder.StartTable();
             Cell.SetFont(9);
-            Cell_v_merging_start.structureCell("绯荤粺鍚嶇О");
-            Cell_v_merging_start.structureCell("璁惧埆浣嶅彿");
+            Cell_v_merging_start.structureCell("璁惧鍚嶇О");
+            Cell_v_merging_start.structureCell("璁惧浣嶅彿");
             Cell_h_merging_start.structureCell("娉�");
             Cell_h_merging_end.structureCell("");
             Cell_h_merging_start.structureCell("鐢垫満");
@@ -247,8 +224,8 @@
             Cell.structureCell("杩愯鐢垫祦");
             Cell.structureCell("鍔熺巼");
             Cell.structureCell("鎬荤娴侀噺");
-            Cell.structureCell("渚涙按鍘嬪姏鏍囬珮");
-            Cell.structureCell("鍥炲姏鍘嬪姏鏍囬珮");
+            Cell.structureCell("渚涙按鍘嬪姏/鏍囬珮");
+            Cell.structureCell("鍥炴按鍘嬪姏/鏍囬珮");
             builder.EndRow();
 
             Cell_v_merging_end.structureCell("");
@@ -261,51 +238,36 @@
             Cell.structureCell("MPa/m");
             Cell.structureCell("MPa/m");
             builder.EndRow();
+            if (reportViewModel.PumpStations != null)
+            {
+                foreach (var item in reportViewModel.PumpStations)
+                {
+                    Cell.structureCell(item.EquipmentName);
+                    Cell.structureCell(item.EquipmentNumber);
+                    Cell.structureCell(item.OutletPressure);
+                    Cell.structureCell(item.OutletValveOpening);
+                    Cell.structureCell(item.RunningCurrent);
+                    Cell.structureCell(item.Power);
+                    Cell.structureCell(item.TotalFlow);
+                    Cell.structureCell(item.SuppyPressure);
+                    Cell.structureCell(item.ReturnPressure);
+                    builder.EndRow();
+                }
+            }
 
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
             builder.EndTable();
             pumpingStation_run_table.AllowAutoFit = false;
             Processing_pagination(src, builder, pumpingStation_run_table);
 
             #endregion 寰幆姘存车绔欒繍琛岀姸鍐佃〃
 
-            Text_left_12_black.structureText("     1.2.2 鍐峰嵈濉旇繍琛岀姸鍐�");
+            Text_left_12_black.structureLeft20Text("1.2.2 鍐峰嵈濉旇繍琛岀姸鍐�");
 
             #region 鍐峰嵈濉旇繍琛岀姸鍐佃〃
 
             var coolingtower_run_table = builder.StartTable();
             Cell.SetFont(9);
-            Cell_v_merging_start.structureCell("绯荤粺鍚嶇О");
+            Cell_v_merging_start.structureCell("璁惧鍚嶇О");
             Cell_v_merging_start.structureCell("璁惧浣嶅彿");
             Cell.structureCell("涓婂绠″緞");
             Cell.structureCell("涓婂闃�寮�搴�");
@@ -364,13 +326,13 @@
 
             #endregion 鍐峰嵈濉旇繍琛岀姸鍐佃〃
 
-            Text_left_12_black.structureText("     1.2.3 鏈鎹㈢儹鍣ㄨ繍琛岀姸鍐�");
+            Text_left_12_black.structureLeft20Text("1.2.3 鏈鎹㈢儹鍣ㄨ繍琛岀姸鍐�");
 
             #region 鏈鎹㈢儹鍣ㄨ繍琛岀姸鍐佃〃
 
             var end_heatExchanger_run_table = builder.StartTable();
             Cell.SetFont(9);
-            Cell_v_merging_start.structureCell("绯荤粺鍚嶇О");
+            Cell_v_merging_start.structureCell("璁惧鍚嶇О");
             Cell_v_merging_start.structureCell("璁惧浣嶅彿");
             Cell.structureCell("渚涘洖姘寸寰�");
             Cell.structureCell("渚涙按闂稿紑搴�");
@@ -473,11 +435,11 @@
             #endregion 鏈鎹㈢儹鍣ㄨ繍琛岀姸鍐佃〃
 
             Text_left_15_black.structureText("浜岋級\t杩愯鎯呭喌涓庤兘鑰楀垎鏋�");
-            Text_left_12_black.structureText("    2.1銆佽繍琛屾ā寮忓強杩愯鏃堕棿");
-            Text_left_12_black.structureText(string.Format("    鍏ㄥ勾锛歿0}", _run_mode));
-            Text_left_12_black.structureText(string.Format("    骞村钩鍧囪繍琛屾椂闂存寜锛歿0}", _avg_runtime_mode));
-            Text_left_12_black.structureText("    2.2銆佽繍琛屾儏鍐靛強鑳借�楃粺璁�");
-            Text_left_12_black.structureText("    鏍规嵁瀹炴祴鍙傛暟銆佹祦浣撹緭閫佸伐绋嬪澶嶆牳锛屾湰寰幆姘寸郴缁熺洰鍓嶅悇绉嶈繍琛屾柟寮忕殑瀹為檯鑳借�楁儏鍐靛涓嬭〃锛�");
+            Text_left_12_black.structureLeft20Text("2.1銆佽繍琛屾ā寮忓強杩愯鏃堕棿");
+            Text_left_12_black.structureLeft20Text(string.Format("鍏ㄥ勾:{0}", _run_mode));
+            Text_left_12_black.structureLeft20Text(string.Format("骞村钩鍧囪繍琛屾椂闂�:鎸墈0}", _avg_runtime_mode));
+            Text_left_12_black.structureLeft20Text("2.2銆佽繍琛屾儏鍐靛強鑳借�楃粺璁�");
+            Text_left_12_black.structureLeft20Text("鏍规嵁瀹炴祴鍙傛暟銆佹祦浣撹緭閫佸伐绋嬪澶嶆牳,鏈惊鐜按绯荤粺鐩墠鍚勭杩愯鏂瑰紡鐨勫疄闄呰兘鑰楁儏鍐靛涓嬭〃锛�");
 
             #region 瀹為檯鑳借�楁儏鍐佃〃
 
@@ -495,23 +457,17 @@
             Cell.structureCell("骞磋�楃數閲忥紙涓噆W.h)");
             builder.EndRow();
 
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
+            if (reportViewModel.PowerConsumptionInfos != null)
+            {
+                foreach (var item in reportViewModel.PowerConsumptionInfos)
+                {
+                    Cell.structureCell(item.RunMode);
+                    Cell.structureCell(item.PreTechPowerConsumption);
+                    Cell.structureCell(item.AnnualRunningHours);
+                    Cell.structureCell(item.AnnualPowerConsumption);
+                    builder.EndRow();
+                }
+            }
 
             Cell.structureCell("鍚堣");
             Cell.structureCell("");
@@ -523,87 +479,109 @@
 
             #endregion 瀹為檯鑳借�楁儏鍐佃〃
 
-            Text_left_12_black.structureText("    2.3銆侀珮鑳借�楀垎鏋�");
-            Text_left_12_black.structureText("    閫氳繃瀵圭郴缁熻繍琛屽伐鍐佃繘琛屾娴嬪垎鏋愶紝璁や负璇ョ郴缁熷瓨鍦� 鈥滀綆鏁堢巼銆侀珮鑳借�椻�濈幇璞°�備富瑕佽〃鐜板湪浠ヤ笅鏂归潰锛�");
-            Text_left_12_black.structureText("    1锛夋按娉电壒鎬т笌绠$綉鐗规�т笉鐩稿尮閰嶏紝閫犳垚姘存车鍋忕璁捐宸ュ喌杩愯锛屽叾瀹為檯杩愯鏁堢巼涓嬮檷锛岄�犳垚杈冨鐨勬棤鏁堣兘鑰楋紝澶勪簬涓嶇粡娴庤繍琛岀姸鎬侊紱鑰屽綋鍓嶅惊鐜按宸ュ喌鍙堝苟闈炴槸绯荤粺鐨勬渶浣崇姸鎬侊紝浼樺寲绠$綉闃绘姉鏁村悎杩愯鍙傛暟锛屽皢浣挎湰绯荤粺鍏锋湁杈冨ぇ鐨勮妭鑳界┖闂淬��");
-            Text_left_12_black.structureText("    2锛夋按娉垫�ц兘鏇茬嚎鍜岀缃戠壒鎬ф洸绾夸笉鐩稿尮閰嶏紝鍦ㄦ按绯荤粺鍦ㄨ緭閫佽繃绋嬩腑瀛樺湪闂榾璋冭妭闃诲姏锛屽鍔犱簡杈撻�佽繃绋嬩腑鐨勬棤鏁堣兘鑰楋紝闄嶄綆姘寸郴缁熺殑杈撻�佹晥鐜囷紱闇�瑕侀噸鏂板绯荤粺杩涜寤烘ā鍒嗘瀽锛岄檷浣庣郴缁熼樆鍔涳紝浼樺寲姘存车鎵▼銆�");
-            Text_left_12_black.structureText("    3锛夌己涔忔妧鏈墜娈靛鎹㈢儹璁惧杩涜閲忓寲璋冭妭锛屾祦閲忚繃澶у瓨鍦ㄦ氮璐广�傞�氳繃璋冭瘯骞堕厤缃紭鍖栵紝瀵规崲鐑櫒瀹氶噺鍒嗘瀽锛屽埗瀹氭崲鐑櫒杩愯鍚堢悊鏂规锛屾敼鎹㈢儹鍣ㄤ负瀹氶噺鎺у埗锛屾渶缁堟秷闄ゆ棤鏁堟祦閲忥紝浣跨郴缁熷鍦ㄤ紭鑹姸鎬佷笅杩愯銆�");
+            Text_left_12_black.structureLeft20Text("2.3銆侀珮鑳借�楀垎鏋�");
+            Text_left_12_black.structureLeft20Text("閫氳繃瀵圭郴缁熻繍琛屽伐鍐佃繘琛屾娴嬪垎鏋愶紝璁や负璇ョ郴缁熷瓨鍦� 鈥滀綆鏁堢巼銆侀珮鑳借�椻�濈幇璞°�備富瑕佽〃鐜板湪浠ヤ笅鏂归潰锛�");
+            Text_left_12_black.structureLeft20Text("1锛夋按娉电壒鎬т笌绠$綉鐗规�т笉鐩稿尮閰嶏紝閫犳垚姘存车鍋忕璁捐宸ュ喌杩愯锛屽叾瀹為檯杩愯鏁堢巼涓嬮檷锛岄�犳垚杈冨鐨勬棤鏁堣兘鑰楋紝澶勪簬涓嶇粡娴庤繍琛岀姸鎬侊紱鑰屽綋鍓嶅惊鐜按宸ュ喌鍙堝苟闈炴槸绯荤粺鐨勬渶浣崇姸鎬侊紝浼樺寲绠$綉闃绘姉鏁村悎杩愯鍙傛暟锛屽皢浣挎湰绯荤粺鍏锋湁杈冨ぇ鐨勮妭鑳界┖闂淬��");
+            Text_left_12_black.structureLeft20Text("2锛夋按娉垫�ц兘鏇茬嚎鍜岀缃戠壒鎬ф洸绾夸笉鐩稿尮閰嶏紝鍦ㄦ按绯荤粺鍦ㄨ緭閫佽繃绋嬩腑瀛樺湪闂榾璋冭妭闃诲姏锛屽鍔犱簡杈撻�佽繃绋嬩腑鐨勬棤鏁堣兘鑰楋紝闄嶄綆姘寸郴缁熺殑杈撻�佹晥鐜囷紱闇�瑕侀噸鏂板绯荤粺杩涜寤烘ā鍒嗘瀽锛岄檷浣庣郴缁熼樆鍔涳紝浼樺寲姘存车鎵▼銆�");
+            Text_left_12_black.structureLeft20Text("3锛夌己涔忔妧鏈墜娈靛鎹㈢儹璁惧杩涜閲忓寲璋冭妭锛屾祦閲忚繃澶у瓨鍦ㄦ氮璐广�傞�氳繃璋冭瘯骞堕厤缃紭鍖栵紝瀵规崲鐑櫒瀹氶噺鍒嗘瀽锛屽埗瀹氭崲鐑櫒杩愯鍚堢悊鏂规锛屾敼鎹㈢儹鍣ㄤ负瀹氶噺鎺у埗锛屾渶缁堟秷闄ゆ棤鏁堟祦閲忥紝浣跨郴缁熷鍦ㄤ紭鑹姸鎬佷笅杩愯銆�");
 
             Text_left_15_black.structureText("涓夛級\t鑺傝兘鎶�鏀规柟妗堜笌璁捐鎸囨爣");
-            Text_left_12_black.structureText("    3.1銆佽璁′緷鎹�");
-            Text_left_12_black.structureText("     3.1.1 寰幆姘存车杩愯鍔熺巼锛氭牴鎹笁鐩稿紓姝ョ數鍔ㄦ満杩愯鍔熺巼璁$畻鍏紡P=鈭�3脳U脳I脳cos蠁锛屼篃鍙互鎸夌収杩愯涓�娈垫椂闂村唴鐢靛害琛ㄦ湁鍔熷姛鐜囩粺璁″緱鍑猴紱");
-            Text_left_12_black.structureText("     3.1.2 姘存车鎬诲帇鍔涳紙鎵▼锛夎绠楀叕寮忥細");
-            Text_left_12_black.structureText("     H=锛坧鍑猴紞p杩涳級脳102锛嬶紙鍑哄彛琛ㄩ珮锛嶈繘鍙f恫浣嶉珮锛夛紝鍐嶈�冭檻杩涘嚭鍙f祦閫熷彉鍖栫殑鍔ㄨ兘鎹熻�椼��");
-            Text_left_12_black.structureText("     3.1.3 閫氳繃姘存车鎬ц兘鏇茬嚎妯℃嫙锛屾按娉佃繍琛屽湪涓�瀹氱殑宸ュ喌涓嬶紝鍏舵祦閲廞銆佹壃绋婬銆佸姛鐜嘝銆佹晥鐜囄风浉瀵瑰簲锛涘疄闄呮�ц兘涓庢爣鍑嗘�ц兘涓�鑸樊寮傦紙涓昏涓烘晥鐜囄锋寚鏍囷級");
-            Text_left_12_black.structureText("     3.1.4 绠¤矾绯荤粺鍘嬪姏闄嶆崲绠楀熀鏈叕寮忥紙i浠h〃鍗曚綅绫抽暱搴︾閬撲笂娌跨▼闃诲姏绯绘暟锛�");
+            Text_left_12_black.structureLeft20Text("3.1銆佽璁′緷鎹�");
+            Text_left_12_black.structureLeft20Text("3.1.1 寰幆姘存车杩愯鍔熺巼锛氭牴鎹笁鐩稿紓姝ョ數鍔ㄦ満杩愯鍔熺巼璁$畻鍏紡P=鈭�3脳U脳I脳cos蠁锛屼篃鍙互鎸夌収杩愯涓�娈垫椂闂村唴鐢靛害琛ㄦ湁鍔熷姛鐜囩粺璁″緱鍑猴紱");
+            Text_left_12_black.structureLeft20Text("3.1.2 姘存车鎬诲帇鍔涳紙鎵▼锛夎绠楀叕寮忥細");
+            Text_left_12_black.structureLeft20Text("H=锛坧鍑猴紞p杩涳級脳102锛嬶紙鍑哄彛琛ㄩ珮锛嶈繘鍙f恫浣嶉珮锛夛紝鍐嶈�冭檻杩涘嚭鍙f祦閫熷彉鍖栫殑鍔ㄨ兘鎹熻�椼��");
+            Text_left_12_black.structureLeft20Text("3.1.3 閫氳繃姘存车鎬ц兘鏇茬嚎妯℃嫙锛屾按娉佃繍琛屽湪涓�瀹氱殑宸ュ喌涓嬶紝鍏舵祦閲廞銆佹壃绋婬銆佸姛鐜嘝銆佹晥鐜囄风浉瀵瑰簲锛涘疄闄呮�ц兘涓庢爣鍑嗘�ц兘涓�鑸樊寮傦紙涓昏涓烘晥鐜囄锋寚鏍囷級");
+            Text_left_12_black.structureLeft20Text("3.1.4 绠¤矾绯荤粺鍘嬪姏闄嶆崲绠楀熀鏈叕寮忥紙i浠h〃鍗曚綅绫抽暱搴︾閬撲笂娌跨▼闃诲姏绯绘暟锛�");
+
             // 鎻掑叆鍥剧墖
-            builder.Write("      ");
-            Text_left_12_black.structureTextAndImage("assets\\Pressure_conversion_formula_big1.2.png", 30, 150);
-            builder.Write("      ");
-            Text_left_12_black.structureTextAndImage("assets\\Pressure_conversion_formula_small1.2.png", 35, 220);
-            Text_left_12_black.structureText("     3.1.5 灞�閮ㄩ樆鍔涜绠楀叕寮�");
-            builder.Write("      ");
-            Text_left_12_black.structureTextAndImage("assets\\Local_resistance.png", 35, 60);
-            Text_left_12_black.structureText("     3.1.6 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯伙紙鍙傝�冿級");
+            //  builder.Write("      ");
+
+            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.structureLeft20Text("3.1.5 灞�閮ㄩ樆鍔涜绠楀叕寮�");
+            //      builder.Write("      ");
+            Text_left_12_black.structureTextAndImage("00-core\\Local_resistance.png", 35, 60);
+            Text_left_12_black.structureLeft20Text("3.1.6 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯伙紙鍙傝�冿級");
 
             #region 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯昏〃
 
             var Opening_resistance_table = builder.StartTable();
             Cell.SetFont(9);
             Cell.structureCell("寮�搴ξ�");
-            Cell.structureCell("90");
-            Cell.structureCell("80");
-            Cell.structureCell("70");
-            Cell.structureCell("60");
-            Cell.structureCell("55");
-            Cell.structureCell("50");
-            Cell.structureCell("45");
-            Cell.structureCell("40");
-            Cell.structureCell("35");
-            Cell.structureCell("30");
-            Cell.structureCell("25");
-            Cell.structureCell("20");
-            Cell.structureCell("15");
-            Cell.structureCell("10");
-            builder.EndRow();
 
-            Cell.structureCell("尉");
-            Cell.structureCell("0.22");
-            Cell.structureCell("0.45");
-            Cell.structureCell("1.18");
-            Cell.structureCell("3.25");
-            Cell.structureCell("5.50");
-            Cell.structureCell("9.27");
-            Cell.structureCell("15.0");
-            Cell.structureCell("26.8");
-            Cell.structureCell("45.0");
-            Cell.structureCell("79.2");
-            Cell.structureCell("152");
-            Cell.structureCell("332");
-            Cell.structureCell("945");
-            Cell.structureCell("3620");
+            if (reportViewModel.ValveOpens != null)
+            {
+                foreach (var item in reportViewModel.ValveOpens)
+                {
+                    Cell.structureCell(item.Name);
+                }
+                builder.EndRow();
+                Cell.structureCell("尉");
+                foreach (var item in reportViewModel.ValveOpens)
+                {
+                    Cell.structureCell(item.MinorLoss);
+                }
+                builder.EndRow();
+            }
+            else
+            {
+                Cell.structureCell("寮�搴ξ�");
+                Cell.structureCell("90");
+                Cell.structureCell("80");
+                Cell.structureCell("70");
+                Cell.structureCell("60");
+                Cell.structureCell("55");
+                Cell.structureCell("50");
+                Cell.structureCell("45");
+                Cell.structureCell("40");
+                Cell.structureCell("35");
+                Cell.structureCell("30");
+                Cell.structureCell("25");
+                Cell.structureCell("20");
+                Cell.structureCell("15");
+                Cell.structureCell("10");
+                builder.EndRow();
+
+                Cell.structureCell("尉");
+                Cell.structureCell("0.22");
+                Cell.structureCell("0.45");
+                Cell.structureCell("1.18");
+                Cell.structureCell("3.25");
+                Cell.structureCell("5.50");
+                Cell.structureCell("9.27");
+                Cell.structureCell("15.0");
+                Cell.structureCell("26.8");
+                Cell.structureCell("45.0");
+                Cell.structureCell("79.2");
+                Cell.structureCell("152");
+                Cell.structureCell("332");
+                Cell.structureCell("945");
+                Cell.structureCell("3620");
+            }
             builder.EndTable();
             Opening_resistance_table.AllowAutoFit = false;
             Processing_pagination(src, builder, Opening_resistance_table);
 
             #endregion 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯昏〃
 
-            Text_left_12_black.structureText("    3.2銆佽璁¤繃绋�");
-            Text_left_12_black.structureText("     绉戠淮鍏徃閲囩敤娴佷綋杈撻�丟o.Well鎶�鏈妫�娴嬫暟鎹繘琛岀郴缁熷垎鏋愩�佺爺绌讹紝缁撳悎鐢熶骇宸ヨ壓鐗瑰緛锛岃璁℃湰寰幆姘寸郴缁熻繃绋嬭兘閲忎紭鍖栬В鍐虫柟妗堛��");
-            Text_left_12_black.structureText("     1锛夐�氳繃鍒嗘瀽绯荤粺瑁呯疆鐑礋鑽蜂互鍙婂伐鑹虹壒鐐癸紝鎸夌粡娴庝緵鍥炴按娓╁樊鍘熷垯鍙婁緵姘村帇鍔涗笌璁捐鍘嬪姏姣旇緝锛屽垽鏂祦閲忕殑鍚堢悊鎬э紝骞剁‘瀹氬悎鐞嗘祦閲忥紝鍋氬埌鈥滆缃晶鍚堢悊鐢ㄦ按銆佹车绔欎晶楂樻晥渚涙按锛岄檷浣庢按閫佽兘鑰楁寚鏍囷紱");
-            Text_left_12_black.structureText("     2锛夊鎹㈢儹鍣ㄥ強鍐峰嵈濉旂殑鐑伐鎬ц兘杩涜璇勪及锛岄拡瀵规�ч�夋嫨鎻愰珮鍐峰嵈鏁堟灉鐨勬敼閫犳柟妗堬紝浠ョ‘淇濈粡娴庝緵鍥炴按娓╁樊瀹炵幇鐨勫彲琛屾�э紱");
-            Text_left_12_black.structureText("     3锛夎繍鐢ㄨ绠楁満妯℃嫙鎶�鏈垎鏋愮缃戞按鍔涜妭鐐瑰钩琛★紝寰楀埌鍙疄鐜扮殑鏈�浼樼缃戞�ц兘鏇茬嚎锛屽嵆鐩稿簲娴侀噺涓嬫墍瀵瑰簲瀹為檯闇�瑕佺殑鏈�灏忛樆鍔涳紝闄嶄綆绯荤粺绠$綉闃绘姉锛屾彁楂樼缃戣繍琛屾晥鐜囷紱");
-            Text_left_12_black.structureText("     4锛夐�氳繃瀵规车绔欏師鏈夊悇绉嶈繍琛屾ā寮忕殑宸ュ喌鍒嗘瀽锛屽垽鏂數鏈哄強姘存车鐨勫疄闄呰繍琛屾晥鐜囨槸鍚﹂珮鏁堬紝骞剁粨鍚堣缃晶鎵�闇�鐨勬妧鏈弬鏁拌姹傦紝鎻愬嚭鏈�浼樼殑娉电粍鎼厤杩愯妯″紡鍙婅繍琛屽弬鏁帮紝纭畾楂樻晥鑺傝兘娉靛弬鏁拌璁″�硷紝鍋氬ソ娉电珯浼樺寲璁捐锛�");
-            Text_left_12_black.structureText("     5锛夊�熷姪涓夊厓娴佺悊璁猴紝閲囩敤鍥藉鏈�鍏堣繘鐨勨�淐FD鈥濅豢鐪熸ā鎷熸妧鏈紝閫氳繃绮剧‘妯℃嫙锛岃璁″嚭鏈�浼樺寲鐨勬按鍔涙ā鍨嬶紝纭繚ECOWELL楂樻晥娉垫�ц兘鍙潬銆佽繍琛岀ǔ瀹氾紝骞剁‘淇濆湪鍚勭杩愯妯″紡涓嬪潎澶勪簬楂樻晥杩愯銆�");
+            Text_left_12_black.structureLeft20Text("3.2銆佽璁¤繃绋�");
+            Text_left_12_black.structureLeft20Text("绉戠淮鍏徃閲囩敤娴佷綋杈撻�丟o.Well鎶�鏈妫�娴嬫暟鎹繘琛岀郴缁熷垎鏋愩�佺爺绌讹紝缁撳悎鐢熶骇宸ヨ壓鐗瑰緛锛岃璁℃湰寰幆姘寸郴缁熻繃绋嬭兘閲忎紭鍖栬В鍐虫柟妗堛��");
+            Text_left_12_black.structureLeft20Text("1锛夐�氳繃鍒嗘瀽绯荤粺瑁呯疆鐑礋鑽蜂互鍙婂伐鑹虹壒鐐癸紝鎸夌粡娴庝緵鍥炴按娓╁樊鍘熷垯鍙婁緵姘村帇鍔涗笌璁捐鍘嬪姏姣旇緝锛屽垽鏂祦閲忕殑鍚堢悊鎬э紝骞剁‘瀹氬悎鐞嗘祦閲忥紝鍋氬埌鈥滆缃晶鍚堢悊鐢ㄦ按銆佹车绔欎晶楂樻晥渚涙按锛岄檷浣庢按閫佽兘鑰楁寚鏍囷紱");
+            Text_left_12_black.structureLeft20Text("2锛夊鎹㈢儹鍣ㄥ強鍐峰嵈濉旂殑鐑伐鎬ц兘杩涜璇勪及锛岄拡瀵规�ч�夋嫨鎻愰珮鍐峰嵈鏁堟灉鐨勬敼閫犳柟妗堬紝浠ョ‘淇濈粡娴庝緵鍥炴按娓╁樊瀹炵幇鐨勫彲琛屾�э紱");
+            Text_left_12_black.structureLeft20Text("3锛夎繍鐢ㄨ绠楁満妯℃嫙鎶�鏈垎鏋愮缃戞按鍔涜妭鐐瑰钩琛★紝寰楀埌鍙疄鐜扮殑鏈�浼樼缃戞�ц兘鏇茬嚎锛屽嵆鐩稿簲娴侀噺涓嬫墍瀵瑰簲瀹為檯闇�瑕佺殑鏈�灏忛樆鍔涳紝闄嶄綆绯荤粺绠$綉闃绘姉锛屾彁楂樼缃戣繍琛屾晥鐜囷紱");
+            Text_left_12_black.structureLeft20Text("4锛夐�氳繃瀵规车绔欏師鏈夊悇绉嶈繍琛屾ā寮忕殑宸ュ喌鍒嗘瀽锛屽垽鏂數鏈哄強姘存车鐨勫疄闄呰繍琛屾晥鐜囨槸鍚﹂珮鏁堬紝骞剁粨鍚堣缃晶鎵�闇�鐨勬妧鏈弬鏁拌姹傦紝鎻愬嚭鏈�浼樼殑娉电粍鎼厤杩愯妯″紡鍙婅繍琛屽弬鏁帮紝纭畾楂樻晥鑺傝兘娉靛弬鏁拌璁″�硷紝鍋氬ソ娉电珯浼樺寲璁捐锛�");
+            Text_left_12_black.structureLeft20Text("5锛夊�熷姪涓夊厓娴佺悊璁猴紝閲囩敤鍥藉鏈�鍏堣繘鐨勨�淐FD鈥濅豢鐪熸ā鎷熸妧鏈紝閫氳繃绮剧‘妯℃嫙锛岃璁″嚭鏈�浼樺寲鐨勬按鍔涙ā鍨嬶紝纭繚ECOWELL楂樻晥娉垫�ц兘鍙潬銆佽繍琛岀ǔ瀹氾紝骞剁‘淇濆湪鍚勭杩愯妯″紡涓嬪潎澶勪簬楂樻晥杩愯銆�");
 
-            Text_left_12_black.structureText("    3.3銆佹车绔欓儴鍒嗚妭鑳借璁℃寚鏍囦笌鎶�鏀规柟妗�");
-            Text_left_12_black.structureText("     3.3.1 鎶�鏀瑰悗璁惧閰嶇疆鎯呭喌");
+            Text_left_12_black.structureLeft20Text("3.3銆佹车绔欓儴鍒嗚妭鑳借璁℃寚鏍囦笌鎶�鏀规柟妗�");
+            Text_left_12_black.structureLeft20Text("3.3.1 鎶�鏀瑰悗璁惧閰嶇疆鎯呭喌");
+            Text_left_12_black.AddBlankLine();
 
             #region 璁惧閰嶇疆鎯呭喌琛�
 
             var Device_configuration_table = builder.StartTable();
             Cell.SetFont(9);
-            Cell_v_merging_start.structureCell("绯荤粺鍚嶇О");
+            Cell_v_merging_start.structureCell("璁惧鍚嶇О");
             Cell_v_merging_start.structureCell("璁惧浣嶅彿");
             Cell_v_merging_start.structureCell("璁惧鍨嬪彿");
             Cell_v_merging_start.structureCell("鍙版暟");
@@ -630,61 +608,37 @@
             Cell.structureCell("cos蠁");
             Cell.structureCell("r/m");
             builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
+            if (reportViewModel.AfterEquipments != null)
+            {
+                foreach (var item in reportViewModel.AfterEquipments)
+                {
+                    Cell.structureCell(item.EquipmentName);
+                    Cell.structureCell(item.EquipmentNumber);
+                    Cell.structureCell(item.EquipmentMainName);
+                    Cell.structureCell(item.RatedFlow);
+                    Cell.structureCell(item.RatedHead);
+                    Cell.structureCell(item.TypeOfDrive);
+                    Cell.structureCell("鐢垫満椹卞姩");
+                    Cell.structureCell(item.RatedCurrent);
+                    Cell.structureCell(item.RatedPower);
+                    Cell.structureCell(item.RatedFactor);
+                    Cell.structureCell(item.Speed);
+                    builder.EndRow();
+                }
+            }
             builder.EndTable();
             Device_configuration_table.AllowAutoFit = false;
             Processing_pagination(src, builder, Device_configuration_table);
 
             #endregion 璁惧閰嶇疆鎯呭喌琛�
 
-            Text_left_12_black.structureText("     3.3.2 鎶�鏀瑰悗璁惧棰勮杩愯鐘跺喌");
+            Text_left_12_black.structureLeft20Text("3.3.2 鎶�鏀瑰悗璁惧棰勮杩愯鐘跺喌");
 
             #region 棰勮杩愯鐘跺喌琛�
 
             var estimated_running_table = builder.StartTable();
             Cell.SetFont(9);
-            Cell_v_merging_start.structureCell("绯荤粺鍚嶇О");
+            Cell_v_merging_start.structureCell("璁惧鍚嶇О");
             Cell_v_merging_start.structureCell("璁惧浣嶅彿");
             Cell_h_merging_start.structureCell("娉�");
             Cell_h_merging_end.structureCell("");
@@ -716,39 +670,22 @@
             Cell.structureCell("MPa/m");
             Cell.structureCell("MPa/m");
             builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
+            if (reportViewModel.AfterPumpStations != null)
+            {
+                foreach (var item in reportViewModel.AfterPumpStations)
+                {
+                    Cell.structureCell(item.EquipmentName);
+                    Cell.structureCell(item.EquipmentNumber);
+                    Cell.structureCell(item.OutletPressure);
+                    Cell.structureCell(item.OutletValveOpening);
+                    Cell.structureCell(item.RunningCurrent);
+                    Cell.structureCell(item.Power);
+                    Cell.structureCell(item.TotalFlow);
+                    Cell.structureCell(item.SuppyPressure);
+                    Cell.structureCell(item.ReturnPressure);
+                    builder.EndRow();
+                }
+            }
             builder.EndTable();
             //estimated_running_table.AllowAutoFit = false;
             //builder.ParagraphFormat.KeepWithNext = true;
@@ -756,13 +693,13 @@
 
             #endregion 棰勮杩愯鐘跺喌琛�
 
-            Text_left_12_black.structureText("     3.3.3 鏈鎹㈢儹鍣ㄩ璁¤繍琛岀姸鍐�");
+            Text_left_12_black.structureLeft20Text("3.3.3 鏈鎹㈢儹鍣ㄩ璁¤繍琛岀姸鍐�");
 
             #region 鏈鎹㈢儹鍣ㄩ璁¤繍琛岀姸鍐佃〃
 
             var estimatedendRun_table = builder.StartTable();
             Cell.SetFont(9);
-            Cell_v_merging_start.structureCell("绯荤粺鍚嶇О");
+            Cell_v_merging_start.structureCell("璁惧鍚嶇О");
             Cell_v_merging_start.structureCell("璁惧浣嶅彿");
             Cell.structureCell("渚涘洖姘寸寰�");
             Cell.structureCell("渚涙按闂稿紑搴�");
@@ -864,7 +801,7 @@
 
             #endregion 鏈鎹㈢儹鍣ㄩ璁¤繍琛岀姸鍐佃〃
 
-            Text_left_12_black.structureText("     3.3.2 鎶�鏀瑰悗鍚勮繍琛屾ā寮忎笅璁惧棰勮鑺傜數鎯呭喌");
+            Text_left_12_black.structureLeft20Text("3.3.2 鎶�鏀瑰悗鍚勮繍琛屾ā寮忎笅璁惧棰勮鑺傜數鎯呭喌");
 
             #region 璁惧棰勮鑺傜數鎯呭喌琛�
 
@@ -882,23 +819,17 @@
             Cell.structureCell("鏀瑰悗骞磋�楃數閲忥紙涓噆W.h)");
             builder.EndRow();
 
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
+            if (reportViewModel.AfterPowerConsumptionInfos != null)
+            {
+                foreach (var item in reportViewModel.AfterPowerConsumptionInfos)
+                {
+                    Cell.structureCell(item.RunMode);
+                    Cell.structureCell(item.PreTechPowerConsumption);
+                    Cell.structureCell(item.AnnualRunningHours);
+                    Cell.structureCell(item.AnnualPowerConsumption);
+                    builder.EndRow();
+                }
+            }
 
             Cell.structureCell("鍚堣");
             Cell.structureCell("");
@@ -910,18 +841,18 @@
 
             #endregion 璁惧棰勮鑺傜數鎯呭喌琛�
 
-            Text_left_12_black.structureText("    3.4銆佹妧鏀硅鏄�");
-            Text_left_12_black.structureText("     閽堝鍓嶈堪鐨勭郴缁熷瓨鍦ㄧ殑闂鍒嗘瀽锛岀洰鍓嶇郴缁熷湪浼樺寲杩愯鏂归潰杩樻湁杈冨ぇ鐨勬彁鍗囩┖闂达紝瀛樺湪杈冨ぇ鐨勮妭鑳芥綔鍔涳紝浠庢暣浣撲笂鎻愬嚭浠ヤ笅瑙e喅鏂规锛�");
-            Text_left_12_black.structureText("     a銆佷紭鍖栨按娉靛尮閰嶅疄鐜拌妭鑳斤紱");
-            Text_left_12_black.structureText("     b銆佹敼鍠勬按娉垫皵铓�瀹炵幇鑺傝兘锛�");
-            Text_left_12_black.structureText("     c銆佹彁楂樻按娉佃繍琛屾晥鐜囪妭鑳斤紱");
-            Text_left_12_black.structureText("     d銆佸疄鐜板悎鐞嗕緵姘达紝璋冩暣姘村姏骞宠 锛屼紭鍖栨瘝绠′緵銆佸洖姘村帇鍔涳紝闄嶄綆闃诲姏瀹炵幇鑺傝兘锛�");
+            Text_left_12_black.structureLeft20Text("3.4銆佹妧鏀硅鏄�");
+            Text_left_12_black.structureLeft20Text("閽堝鍓嶈堪鐨勭郴缁熷瓨鍦ㄧ殑闂鍒嗘瀽锛岀洰鍓嶇郴缁熷湪浼樺寲杩愯鏂归潰杩樻湁杈冨ぇ鐨勬彁鍗囩┖闂达紝瀛樺湪杈冨ぇ鐨勮妭鑳芥綔鍔涳紝浠庢暣浣撲笂鎻愬嚭浠ヤ笅瑙e喅鏂规锛�");
+            Text_left_12_black.structureLeft20Text("a銆佷紭鍖栨按娉靛尮閰嶅疄鐜拌妭鑳斤紱");
+            Text_left_12_black.structureLeft20Text("b銆佹敼鍠勬按娉垫皵铓�瀹炵幇鑺傝兘锛�");
+            Text_left_12_black.structureLeft20Text("c銆佹彁楂樻按娉佃繍琛屾晥鐜囪妭鑳斤紱");
+            Text_left_12_black.structureLeft20Text("d銆佸疄鐜板悎鐞嗕緵姘达紝璋冩暣姘村姏骞宠 锛屼紭鍖栨瘝绠′緵銆佸洖姘村帇鍔涳紝闄嶄綆闃诲姏瀹炵幇鑺傝兘锛�");
 
             Text_left_15_black.structureText("鍥涳級\t椤圭洰鑺傜數鏁堢泭鍒嗘瀽");
-            Text_left_12_black.structureText("    4.1銆佹瘡骞磋妭鐢甸噺");
-            Text_left_12_black.structureText(string.Format("     鎸墈0}鍏徃寰幆姘寸郴缁熷勾骞冲潎杩愯{1}灏忔椂璁★紝鍒欑郴缁熷勾鑺傜數閲忥細", _Company_1, _Avg_Hour));
-            Text_left_12_black.structureText(string.Format("     绯荤粺骞磋妭鐢甸噺锛漿0}锛漿1}锛堜竾搴︼級", _Electricity, _Electricity_kWh));
-            Text_left_12_black.structureText("    4.2銆佽妭鐢佃绠楁眹鎬诲涓嬭〃");
+            Text_left_12_black.structureLeft20Text("4.1銆佹瘡骞磋妭鐢甸噺");
+            Text_left_12_black.structureLeft20Text(string.Format("鎸墈0}鍏徃寰幆姘寸郴缁熷勾骞冲潎杩愯{1}灏忔椂璁★紝鍒欑郴缁熷勾鑺傜數閲忥細", _Company_1, _Avg_Hour));
+            Text_left_12_black.structureLeft20Text(string.Format("绯荤粺骞磋妭鐢甸噺锛漿0}锛漿1}锛堜竾搴︼級", _Electricity, _Electricity_kWh));
+            Text_left_12_black.structureLeft20Text("4.2銆佽妭鐢佃绠楁眹鎬诲涓嬭〃");
 
             #region 鑺傜數璁$畻姹囨�昏〃
 
@@ -943,13 +874,19 @@
             Cell.structureCell("(h)");
             builder.EndRow();
 
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
+            if (reportViewModel.PowerRelatedInfos != null)
+            {
+                foreach (var item in reportViewModel.PowerRelatedInfos)
+                {
+                    Cell.structureCell(item.RunMode);
+                    Cell.structureCell(item.PreTechPowerConsumption);
+                    Cell.structureCell(item.PostTechDesignedPower);
+                    Cell.structureCell(item.HourlyPowerSaving);
+                    Cell.structureCell(item.PowerSavingRate);
+                    Cell.structureCell(item.RunningTime);
+                    builder.EndRow();
+                }
+            }
 
             Cell_h_merging_start.structureCell("鍚堣骞磋妭鐢甸噺(涓囧害)");
             Cell_h_merging_end.structureCell("");
@@ -963,41 +900,34 @@
 
             #endregion 鑺傜數璁$畻姹囨�昏〃
 
-            Text_left_15_black.structureText("浜旓級\t缁艰堪");
-            Text_left_12_black.structureText(string.Format("     鏈鏄湪绉戠淮鍏徃鎶�鏈汉鍛樹簬{0}瀵箋1}姘寸郴缁熻繘琛岃缁嗚皟鏌ャ�佹娴嬪熀纭�涓婏紝閲囩敤娴佷綋杈撻�丟o路well鎶�鏈妫�娴嬭祫鏂欒繘琛岀郴缁熷垎鏋愩�佺爺绌讹紝骞剁粨鍚堣绯荤粺杩愯鐨勮礋鑽锋儏鍐碉紝绮惧績璁捐鐨勮妭鑳芥妧鏀规柟妗堛��", _Time, _System));
-            Text_left_12_black.structureText(string.Format("     閫氳繃鎶�鏀硅妭鐢垫晥鏋滃涓嬶紙鎸夊勾杩愯(0)灏忔椂璁★級锛�", _Hour));
+            Text_left_15_black.structureLeft20Text("浜旓級\t缁艰堪");
+            Text_left_12_black.structureLeft20Text(string.Format("鏈鏄湪绉戠淮鍏徃鎶�鏈汉鍛樹簬{0}瀵箋1}姘寸郴缁熻繘琛岃缁嗚皟鏌ャ�佹娴嬪熀纭�涓婏紝閲囩敤娴佷綋杈撻�丟o路well鎶�鏈妫�娴嬭祫鏂欒繘琛岀郴缁熷垎鏋愩�佺爺绌讹紝骞剁粨鍚堣绯荤粺杩愯鐨勮礋鑽锋儏鍐碉紝绮惧績璁捐鐨勮妭鑳芥妧鏀规柟妗堛��", _Time, _System));
+            Text_left_12_black.structureLeft20Text(string.Format("閫氳繃鎶�鏀硅妭鐢垫晥鏋滃涓嬶紙鎸夊勾杩愯(0)灏忔椂璁★級锛�", _Hour));
 
             #region 璁惧棰勮鑺傜數鎯呭喌琛�
 
             var power_saving_effect_table = builder.StartTable();
             Cell.SetFont(9);
             Cell.structureCell("搴忓彿");
-            Cell.structureCell("绯荤粺鍚嶇О");
+            Cell.structureCell("璁惧鍚嶇О");
             Cell.structureCell("鎶�鏀瑰墠骞磋�楃數閲�(涓囧害/骞�)");
             Cell.structureCell("鑺傜數鐜嘰r\n(%)");
             Cell.structureCell("鏀瑰悗骞磋妭鐢甸噺\r\n(涓囧害/骞�)");
             builder.EndRow();
 
-            Cell.structureCell("1");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("2");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
-
-            Cell.structureCell("3");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            Cell.structureCell("");
-            builder.EndRow();
+            if (reportViewModel.AfterEquipmentPowers != null)
+            {
+                int i = 0;
+                foreach (var item in reportViewModel.AfterEquipmentPowers)
+                {
+                    Cell.structureCell((i++).ToString());
+                    Cell.structureCell(item.EquipmentName);
+                    Cell.structureCell(item.PowerConsumptionBeforeTech);
+                    Cell.structureCell(item.PowerSavingRate);
+                    Cell.structureCell(item.AnnualPowerSavingAfterTech);
+                    builder.EndRow();
+                }
+            }
 
             Cell.structureCell("");
             Cell.structureCell("鍚堣");
@@ -1011,11 +941,11 @@
 
             #endregion 璁惧棰勮鑺傜數鎯呭喌琛�
 
-            Text_left_12_black.structureText("     蹇呴』閮戦噸鎸囧嚭锛屾湰妗堝睘娴佷綋杈撻�丟o路well鎶�鏈璁℃垚鏋滐紝浠呬綔涓烘湰绯荤粺鑺傝兘鎶�鏀规姇璧勫喅绛栧拰瀹炴柦鐨勪緷鎹��");
-            Text_left_12_black.structureText(string.Format("     鍦ㄦ锛岄潪甯告劅璋0}鍏徃鍚勯儴闂ㄩ瀵煎鑺傝兘宸ヤ綔鐨勯噸瑙嗗拰鏀寔锛岄潪甯告劅璋1}鍏徃鎶�鏈汉鍛樺妫�娴嬪伐浣滅殑澶у姏閰嶅悎锛屽苟鎻愪緵瀹濊吹璧勬枡鍙婄郴缁熸儏鍐点��", _Company_2, _Company_3));
+            Text_left_12_black.structureLeft20Text("蹇呴』閮戦噸鎸囧嚭锛屾湰妗堝睘娴佷綋杈撻�丟o路well鎶�鏈璁℃垚鏋滐紝浠呬綔涓烘湰绯荤粺鑺傝兘鎶�鏀规姇璧勫喅绛栧拰瀹炴柦鐨勪緷鎹��");
+            Text_left_12_black.structureLeft20Text(string.Format("鍦ㄦ锛岄潪甯告劅璋0}鍏徃鍚勯儴闂ㄩ瀵煎鑺傝兘宸ヤ綔鐨勯噸瑙嗗拰鏀寔锛岄潪甯告劅璋1}鍏徃鎶�鏈汉鍛樺妫�娴嬪伐浣滅殑澶у姏閰嶅悎锛屽苟鎻愪緵瀹濊吹璧勬枡鍙婄郴缁熸儏鍐点��", _Company_2, _Company_3));
 
             Text_reight_10_black.structureText("娴欐睙绉戠淮鑺傝兘鎶�鏈偂浠芥湁闄愬叕鍙�");
-            Text_reight_10_black.structureText(string.Format("       {0}骞磠1}鏈�", _Year, _month));
+            Text_reight_10_black.structureLeft20Text(string.Format("{0}骞磠1}鏈�", _Year, _month));
 
             doc.AppendDocument(src, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
         }

--
Gitblit v1.9.3