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/09-energy/SimulationSingleWorkingEnergyCtrl.cs | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs
index 0c4cdaa..42f5bf3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/09-energy/SimulationSingleWorkingEnergyCtrl.cs
@@ -1,19 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using NPOI.OpenXmlFormats.Dml;
-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;
-using Yw.EPAnet;
-using Yw.Geometry;
-using Yw.Pump;
-using Yw.Vmo;
-using Yw.WinFrmUI.Phart;
+锘縰sing Yw.Vmo;
namespace HStation.WinFrmUI
{
@@ -76,8 +61,13 @@
this.simulationSingleWorkingPumpCtrl1.SetBindingData(_working, _hydroInfo, _allMonitorList, _allCalcuResultVisualDict);
}
-
-
+ //鏄庣粏鍒楄〃
+ private void btnEnergyList_Click(object sender, EventArgs e)
+ {
+ var dlg = new HydroPumpGroupEnergyListDlg();
+ dlg.SetBindingData(_hydroInfo, _allCalcuResultVisualDict);
+ dlg.ShowDialog();
+ }
}
--
Gitblit v1.9.3