From edfb5be5dc9037152975bd4354e95d5eff78ce2d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 29 十月 2024 18:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/03-control/SetHydroMarkCtrl.cs | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkPureCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/03-control/SetHydroMarkCtrl.cs
similarity index 94%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkPureCtrl.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/03-control/SetHydroMarkCtrl.cs
index cc295dc..e2f377f 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkPureCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/03-control/SetHydroMarkCtrl.cs
@@ -3,9 +3,9 @@
namespace Yw.WinFrmUI
{
- public partial class SetHydroMarkPureCtrl : DevExpress.XtraEditors.XtraUserControl
+ public partial class SetHydroMarkCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public SetHydroMarkPureCtrl()
+ public SetHydroMarkCtrl()
{
InitializeComponent();
this.gridView1.SetNormalEditView();
@@ -13,7 +13,9 @@
this.gridView1.CustomRowCellEdit += GridView1_CustomRowCellEdit;
}
- private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc;//鑾峰彇姘村姏淇℃伅鏂规硶
+ //鑾峰彇姘村姏淇℃伅鏂规硶
+ private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc;
+ //鎵�鏈夌粦瀹氬垪琛�
private BindingList<HydroMarkSetViewModel> _allBindingList = null;
/// <summary>
@@ -72,7 +74,7 @@
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"姹犲簳鏍囬珮:{t.PoolElev}m"
+ Text = $"姹犲簳鏍囬珮:{Math.Round(t.PoolElev, 4)}m"
});
});
}
@@ -84,7 +86,7 @@
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"鍒濆姘翠綅:{t.InitLevel}m"
+ Text = $"鍒濆姘翠綅:{Math.Round(t.InitLevel, 4)}m"
});
});
}
@@ -96,7 +98,7 @@
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"鏈�灏忔按浣�:{t.MinLevel}m"
+ Text = $"鏈�灏忔按浣�:{Math.Round(t.MinLevel, 4)}m"
});
});
}
@@ -108,19 +110,19 @@
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"鏈�楂樻按浣�:{t.MaxLevel}m"
+ Text = $"鏈�楂樻按浣�:{Math.Round(t.MaxLevel, 4)}m"
});
});
}
break;
- case eWaterboxMarkType.Diameter:
+ case eWaterboxMarkType.DN:
{
hydroInfo.Waterboxs.ForEach(t =>
{
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"鐩村緞:{t.MaxLevel}m"
+ Text = $"鐩村緞:{Math.Round(t.DN, 4)}m"
});
});
}
@@ -132,7 +134,7 @@
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"鏈�灏忓绉�:{t.MinVol}m"
+ Text = $"鏈�灏忓绉�:{Math.Round(t.MinVol, 1)}m"
});
});
}
@@ -229,11 +231,14 @@
{
hydroInfo.Pumps.ForEach(t =>
{
- resultList.Add(new HydroMarkResultViewModel()
+ if (t.RatedN.HasValue)
{
- Code = t.Code,
- Text = $"璁惧畾杞��:{t.RatedN * t.SpeedRatio}r/min"
- });
+ resultList.Add(new HydroMarkResultViewModel()
+ {
+ Code = t.Code,
+ Text = $"璁惧畾杞��:{Math.Round(t.RatedN.Value * t.SpeedRatio, 1)}r/min"
+ });
+ }
});
}
break;
@@ -244,7 +249,7 @@
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"璁惧畾棰戠巼:{t.RatedHz * t.SpeedRatio}"
+ Text = $"璁惧畾棰戠巼:{Math.Round(t.RatedHz * t.SpeedRatio, 1)}hz"
});
});
}
@@ -412,7 +417,7 @@
resultList.Add(new HydroMarkResultViewModel()
{
Code = t.Code,
- Text = $"鏍囬珮:{t.Elev}m"
+ Text = $"鏍囬珮:{Math.Round(t.Elev, 4)}m"
});
});
}
--
Gitblit v1.9.3