From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/XhsProjectSimulationPumpSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/XhsProjectSimulationPumpSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs
index 78e31d0..9d36bbf 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/XhsProjectSimulationPumpSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs
@@ -1,12 +1,10 @@
锘縰sing HStation.WinFrmUI.PhartRelation;
-using System.Windows.Input;
-using Yw.WinFrmUI.Phart;
-namespace HStation.WinFrmUI.Xhs.Core
+namespace HStation.WinFrmUI.Xhs
{
- public partial class XhsProjectSimulationPumpSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class PumpSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
{
- public XhsProjectSimulationPumpSingleMatchingForm()
+ public PumpSingleMatchingForm()
{
InitializeComponent();
this.gridView1.SetNormalView();
@@ -28,7 +26,7 @@
public Vmo.XhsPumpMainPhartMappingExtensions Curveinfo { get; set; }
}
- private List<XhsProjectSimulationPumpSingleMatchingViewModel> _allBindingList = null;
+ private List<PumpSingleMatchingViewModel> _allBindingList = null;
private BLL.PumpMain _pumpBll = null;
@@ -40,12 +38,12 @@
public async void SetBindingData(PumpMatchingViewModel pumpMatchingViewModel)
{
_pumpMatchingViewModel = pumpMatchingViewModel;
- _allBindingList = new List<XhsProjectSimulationPumpSingleMatchingViewModel>();
+ _allBindingList = new List<PumpSingleMatchingViewModel>();
_pumpBll = new BLL.PumpMain();
var allPumpMain = await _pumpBll.GetAll();
foreach (var Main in allPumpMain)
{
- _allBindingList.Add(new XhsProjectSimulationPumpSingleMatchingViewModel(Main));
+ _allBindingList.Add(new PumpSingleMatchingViewModel(Main));
}
for (int i = 0; i < _allBindingList.Count; i++)
{
--
Gitblit v1.9.3