From 0e33247236d4ac46f1a75802f53dd6c612301cff Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期二, 24 十二月 2024 14:52:06 +0800 Subject: [PATCH] 注册泵曲线事件 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportCtrl.cs | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 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..0282f6e 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 @@ -30,7 +30,6 @@ private HydroSingleWorkingLossCurveCtrl _lossCurve = null; private HydroSingleWorkingLossStatisticsCtrl _lossStatistics = null; - private XhsProjectVmo _project = null; private Yw.Model.HydroModelInfo _hydroInfo = null; private List<HydroMonitorVmo> _allMonitorList = null; @@ -76,7 +75,7 @@ projectGroup.AllowBorderColorBlending = true; projectGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204); - #endregion + #endregion 椤圭洰淇℃伅 #region 鑳借�楀垎鏋� @@ -96,7 +95,7 @@ energyGroup.AllowBorderColorBlending = true; energyGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204); - #endregion + #endregion 鑳借�楀垎鏋� #region 鎹熷け鏇茬嚎 @@ -116,7 +115,7 @@ lossCurveGroup.AllowBorderColorBlending = true; lossCurveGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204); - #endregion + #endregion 鎹熷け鏇茬嚎 #region 鎹熷け缁熻 @@ -136,9 +135,7 @@ lossStatisticsGroup.AllowBorderColorBlending = true; lossStatisticsGroup.AppearanceGroup.BorderColor = Color.FromArgb(0, 122, 204); - #endregion - - + #endregion 鎹熷け缁熻 } private const string _tempFoler = "workingImageTemp"; @@ -165,20 +162,20 @@ /// <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(); @@ -210,7 +207,7 @@ } } } - vm.Working = new SimulationReportWorkingItemViewModel(); + vm.Working = new HStation.ReportFile.SimulationReportWorkingItemViewModel(); vm.Working.Name = _working.Name; if (string.IsNullOrEmpty(vm.Working.Name)) { @@ -229,7 +226,5 @@ return vm; } - - } -} +} \ No newline at end of file -- Gitblit v1.9.3