From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportCtrl.cs | 66 ++++++++++++--------------------
1 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportCtrl.cs
index 4469731..4af2a61 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportCtrl.cs
@@ -1,17 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraLayout;
-using DevExpress.XtraLayout.Utils;
-using DevExpress.XtraRichEdit.Model;
-using NPOI.HPSF;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+锘縰sing DevExpress.XtraLayout.Utils;
using Yw.Model;
using Yw.Vmo;
@@ -27,9 +14,8 @@
private SimulationProjectTitleCtrl _titleCtrl = null;
private SimulationPumpSingleWorkingChartCtrl _workingChart = null;
- private HydroSingleWorkingLossCurveCtrl _lossCurve = null;
- private HydroSingleWorkingLossStatisticsCtrl _lossStatistics = null;
-
+ private HydroLossCurveCtrl _lossCurve = null;
+ private HydroLossStatisticsCtrl _lossStatistics = null;
private XhsProjectVmo _project = null;
private Yw.Model.HydroModelInfo _hydroInfo = null;
@@ -76,7 +62,7 @@
projectGroup.AllowBorderColorBlending = true;
projectGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
- #endregion
+ #endregion 椤圭洰淇℃伅
#region 鑳借�楀垎鏋�
@@ -96,7 +82,7 @@
energyGroup.AllowBorderColorBlending = true;
energyGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
- #endregion
+ #endregion 鑳借�楀垎鏋�
#region 鎹熷け鏇茬嚎
@@ -106,8 +92,8 @@
lossCurveGroup.Expanded = false;
lossCurveGroup.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
lossCurveGroup.ExpandOnDoubleClick = true;
- _lossCurve = new HydroSingleWorkingLossCurveCtrl();
- _lossCurve.SetBindingData(hydroInfo, calcuResult, visual);
+ _lossCurve = new HydroLossCurveCtrl();
+ //_lossCurve.SetBindingData(hydroInfo, calcuResult, visual);
var lossCurveItem = lossCurveGroup.AddItem("鎹熷け鏇茬嚎", _lossCurve);
lossCurveItem.TextVisible = false;
lossCurveItem.Height = 250;
@@ -116,7 +102,7 @@
lossCurveGroup.AllowBorderColorBlending = true;
lossCurveGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
- #endregion
+ #endregion 鎹熷け鏇茬嚎
#region 鎹熷け缁熻
@@ -126,8 +112,8 @@
lossStatisticsGroup.Expanded = false;
lossStatisticsGroup.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
lossStatisticsGroup.ExpandOnDoubleClick = true;
- _lossStatistics = new HydroSingleWorkingLossStatisticsCtrl();
- _lossStatistics.SetBindingData(hydroInfo, calcuResult);
+ _lossStatistics = new HydroLossStatisticsCtrl();
+ _lossStatistics.SetBindingData(hydroInfo, working, calcuResult);
var lossStatisticsItem = lossStatisticsGroup.AddItem("鎹熷け缁熻", _lossStatistics);
lossStatisticsItem.TextVisible = false;
lossStatisticsItem.Height = 250;
@@ -136,9 +122,7 @@
lossStatisticsGroup.AllowBorderColorBlending = true;
lossStatisticsGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204);
- #endregion
-
-
+ #endregion 鎹熷け缁熻
}
private const string _tempFoler = "workingImageTemp";
@@ -165,27 +149,27 @@
/// <summary>
/// 鑾峰彇瑙嗗浘
/// </summary>
- public async Task<SimulationWorkingReportViewModel> GetViewModel()
+ public async Task<HStation.ReportFile.SimulationWorkingReportViewModel> GetViewModel()
{
- var vm = new SimulationWorkingReportViewModel();
+ var vm = new HStation.ReportFile.SimulationWorkingReportViewModel();
vm.ReportType = "妯℃嫙宸ュ喌杩愯鎶ュ憡";
- vm.Info = new SimulationReportInfoItemViewModel()
+ vm.Info = new HStation.ReportFile.SimulationReportInfoItemViewModel()
{
Name = _project.Name,
Description = _project.Description,
};
- vm.Pumps = new List<SimulationReportPumpItemViewModel>();
+ vm.Pumps = new List<HStation.ReportFile.SimulationReportPumpItemViewModel>();
var pumps = _hydroInfo.Pumps;
foreach (var pump in _hydroInfo.Pumps)
{
- var pumpItem = new SimulationReportPumpItemViewModel();
+ var pumpItem = new HStation.ReportFile.SimulationReportPumpItemViewModel();
pumpItem.Name = pump.Name;
pumpItem.ModelType = pumpItem.ModelType;
pumpItem.SerialNO = (_hydroInfo.Pumps.IndexOf(pump) + 1).ToString();
- pumpItem.RatedQ = $"{pump.RatedQ ?? 0}m鲁/h";
- pumpItem.RatedH = $"{pump.RatedH ?? 0}m";
+ pumpItem.RatedQ = $"{pump.RatedQ}m鲁/h";
+ pumpItem.RatedH = $"{pump.RatedH}m";
pumpItem.RatedP = $"{pump.RatedP}kW";
- pumpItem.RatedN = $"{pump.RatedN ?? 0}r/min";
+ pumpItem.RatedN = $"{pump.RatedN}r/min";
vm.Pumps.Add(pumpItem);
var pumpDb = await BLLFactory<HStation.BLL.AssetsPumpMain>.Instance.GetByIDEx(long.Parse(pump.DbId));
if (pumpDb != null)
@@ -210,7 +194,7 @@
}
}
}
- vm.Working = new SimulationReportWorkingItemViewModel();
+ vm.Working = new HStation.ReportFile.SimulationReportWorkingItemViewModel();
vm.Working.Name = _working.Name;
if (string.IsNullOrEmpty(vm.Working.Name))
{
@@ -223,13 +207,13 @@
vm.Working.EnergyInputImagePath = GetImageFilePath(_energyInputImageFileName);
_lossStatistics.ExportInputToImage(vm.Working.EnergyInputImagePath);
vm.Working.EnergyLossImagePath = GetImageFilePath(_energyLossImageFileName);
- _lossStatistics.ExportLossToImage(vm.Working.EnergyLossImagePath);
+ _lossStatistics.ExportCatalogToImage(vm.Working.EnergyLossImagePath);
vm.Working.EnergyStatisticsImagePath = GetImageFilePath(_energyStatisticsImageFileName);
- _lossStatistics.ExportStatisticsToImage(vm.Working.EnergyStatisticsImagePath);
+ _lossStatistics.ExportCategoryToImage(vm.Working.EnergyStatisticsImagePath);
+
+ vm.PumpChart = new Yw.DiagramFile.PumpChartViewModel();
return vm;
}
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3