From 5d8b95b69c1bf800f2a2ebee62c6f7181c0bd7c8 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 27 十一月 2024 16:35:46 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/02-scale/HydroSingleLossScaleDlg.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/02-scale/HydroSingleLossScaleDlg.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/02-scale/HydroSingleLossScaleDlg.cs
index 8794155..3e1f50c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/02-scale/HydroSingleLossScaleDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/02-scale/HydroSingleLossScaleDlg.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI
+锘縰sing DevExpress.Xpo.Helpers;
+
+namespace Yw.WinFrmUI
{
public partial class HydroSingleLossScaleDlg : DevExpress.XtraBars.Ribbon.RibbonForm
{
@@ -6,22 +8,26 @@
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
+ this.layoutControl1.SetupLayoutControl();
}
/// <summary>
///
/// </summary>
- public void SetBindingData()
+ public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, List<Yw.EPAnet.EnergyPoint> allEnergyList)
{
- var allList = new List<HydroCatalogLossScaleViewModel>()
+ if (hydroInfo == null)
{
- new HydroCatalogLossScaleViewModel(){ Catalog="寮ご",Loss=13},
- new HydroCatalogLossScaleViewModel(){Catalog="闃�闂�",Loss=39},
- new HydroCatalogLossScaleViewModel(){Catalog="绠￠亾",Loss=123}
- };
- this.hydroSingleLossScaleCtrl1.SetBindingData(allList);
+ return;
+ }
+ var allLossList = hydroInfo.GetAllCatalogLossScaleList(allEnergyList);
+ this.hydroSingleLossScaleCtrl1.SetBindingData(allLossList);
+ var allStatisticsList = allEnergyList.GetStatisticsList();
+ this.hydroEnergyStatisticsBarCtrl1.SetBindingData(allStatisticsList);
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3