WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/06-analy/XhsProjectSimualtionAnalySingleResultViewModel.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,26 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace HStation.WinFrmUI { internal class XhsProjectSimualtionAnalySingleResultViewModel { public long ID { get; set; } public string Name { get; set; } public string Code { get; set; } public bool IsBp { get; set; } public string RunStatus { get; set; } public double CurrentHz { get; set; } } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/06-analy/XhsProjectSimulationAnalySinglePumpViewModel.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace HStation.WinFrmUI { /// <summary> /// /// </summary> public class XhsProjectSimulationAnalySinglePumpViewModel { /// <summary> /// id /// </summary> public long ID { get; set; } /// <summary> /// åç§° /// </summary> public string Name { get; set; } /// <summary> /// ç¼ç /// </summary> public string Code { get; set; } /// <summary> /// Open Closed /// </summary> public string RunStatus { get; set; } /// <summary> /// /// </summary> public bool IsBp { get; set; } /// <summary> /// 50hz 60hz /// </summary> public double RatedHz { get; set; } /// <summary> /// 设å®é¢ç /// </summary> public double CurrentHz { get; set; } /// <summary> /// æµéæ¬ç¨çº¿ /// </summary> public List<HStation.WinFrmUI.CurvePointMatchingViewModel> CurveQH { get; set; } /// <summary> /// /// </summary> public List<HStation.WinFrmUI.CurvePointMatchingViewModel> CurveQP { get; set; } /// <summary> /// /// </summary> public List<HStation.WinFrmUI.CurvePointMatchingViewModel> CurveQE { get; set; } /// <summary> /// è®¡ç®æµé /// </summary> public double? CalcuQ { get; set; } /// <summary> /// è®¡ç®æ¬ç¨ /// </summary> public double? CalcuH { get; set; } } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -13,7 +13,7 @@ this.PageTitle.Caption = "æ°´åæ¨¡æ"; this.PageTitle.HeaderSvgImage = this.svgImg32[0]; this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden; this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible; this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden; } private HStation.Vmo.XhsProjectVmo _project = null;//é¡¹ç® @@ -72,6 +72,8 @@ this.tabPageQ3d.Controls.Clear(); this.tabPageQ3d.Controls.Add(q3dCtrl); q3dCtrl.InitialData(() => _hydroInfo); ShowPropertyCtrl(); } #region Bimface @@ -682,15 +684,16 @@ { return; } if (_calcuResult == null) { return; } if (!_calcuResult.Succeed) { return; } var pumps = _hydroInfo.Pumps; //if (_calcuResult == null) //{ // return; //} //if (!_calcuResult.Succeed) //{ // return; //} var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.LinkStatus.Open).ToList(); var curve_list = _hydroInfo.Curves; if (curve_list == null || !curve_list.Any()) { @@ -721,7 +724,7 @@ var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel(); vm.Id = x.Code; vm.Name = x.Code; vm.Name = x.Name; //vm.IsBp = ; vm.RatedSpeed = rated_speed; vm.CurrentSpeed = Math.Round(rated_speed * speed_ratio); @@ -738,7 +741,7 @@ dlg.ShowDialog(); } #endregion æ§è½æ²çº¿ #endregion #region æ°´åè®¡ç® WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -81,7 +81,6 @@ </ItemGroup> <ItemGroup> <Folder Include="03-simulation\06-simulation\06-curve\" /> <Folder Include="03-simulation\06-simulation\07-bulkset\02-valve\" /> <Folder Include="map\gaode\css\" /> </ItemGroup> WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/00-core/HydroLinkViewModel.cs
@@ -18,7 +18,7 @@ { this.StartCode = rhs.StartCode; this.EndCode = rhs.EndCode; this.LinkStatus = rhs.LinkStatus; this.LinkStatus = HydroLinkStatusHelper.GetStatusName(rhs.LinkStatus); this.Vmo = rhs; } WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs
@@ -55,6 +55,12 @@ } /// <summary> /// æ°´æ³µç¶æ /// </summary> [DisplayName("æ°´æ³µç¶æ")] public override string LinkStatus { get; set; } /// <summary> /// é¢å®åç(kW) /// </summary> [DisplayName("é¢å®åç(kW)")] @@ -90,7 +96,11 @@ [DisplayName("设å®é¢ç(hz)")] public double CurrentHz { get { return this.SpeedRatio * this.RatedHz; } get { var value = this.SpeedRatio * this.RatedHz; return Math.Round(value, 1); } set { if (this.RatedHz <= 0)