From 81fa3e53992712371665c6de58a4487beb7ffc17 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期六, 16 十一月 2024 17:49:38 +0800 Subject: [PATCH] 完善标注,之后应该不会再更新标注相关信息 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs | 886 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 443 insertions(+), 443 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs index cc18e11..3559e3e 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs @@ -1050,7 +1050,7 @@ //鏄剧ず宸ュ喌璁$畻绐椾綋 private void ShowWorkingCalcuDlg() { - var dlg = new SetHydroWorkingInfoDlg(); + var dlg = new SetHydroWorkingDlg(); dlg.HydroViewEvent += async (parter) => { _selectedVisual = parter as Yw.Model.HydroVisualInfo; @@ -1446,51 +1446,51 @@ if (_allMarkSetList == null) { _allMarkSetList = new List<HydroMarkSetViewModel>(); - if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0) - { - _allMarkSetList.Add(new HydroMarkSetViewModel() - { - Code = Yw.Hydro.ParterCatalog.Waterbox, - Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Waterbox), - MarkType = (int)eWaterboxMarkType.None - }); - } - if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0) - { - _allMarkSetList.Add(new HydroMarkSetViewModel() - { - Code = Yw.Hydro.ParterCatalog.Pump, - Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump), - MarkType = (int)eWaterboxMarkType.None - }); - } - if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0) - { - _allMarkSetList.Add(new HydroMarkSetViewModel() - { - Code = Yw.Hydro.ParterCatalog.Valve, - Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve), - MarkType = (int)eWaterboxMarkType.None - }); - } - if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0) - { - _allMarkSetList.Add(new HydroMarkSetViewModel() - { - Code = Yw.Hydro.ParterCatalog.Pipe, - Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe), - MarkType = (int)eWaterboxMarkType.None - }); - } - if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0) - { - _allMarkSetList.Add(new HydroMarkSetViewModel() - { - Code = Yw.Hydro.ParterCatalog.Nozzle, - Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Nozzle), - MarkType = (int)eWaterboxMarkType.None - }); - } + //if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0) + //{ + // _allMarkSetList.Add(new HydroMarkSetViewModel() + // { + // Code = Yw.Hydro.ParterCatalog.Waterbox, + // Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Waterbox), + // MarkType = (int)eWaterboxMarkType.None + // }); + //} + //if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0) + //{ + // _allMarkSetList.Add(new HydroMarkSetViewModel() + // { + // Code = Yw.Hydro.ParterCatalog.Pump, + // Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump), + // MarkType = (int)eWaterboxMarkType.None + // }); + //} + //if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0) + //{ + // _allMarkSetList.Add(new HydroMarkSetViewModel() + // { + // Code = Yw.Hydro.ParterCatalog.Valve, + // Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve), + // MarkType = (int)eWaterboxMarkType.None + // }); + //} + //if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0) + //{ + // _allMarkSetList.Add(new HydroMarkSetViewModel() + // { + // Code = Yw.Hydro.ParterCatalog.Pipe, + // Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe), + // MarkType = (int)eWaterboxMarkType.None + // }); + //} + //if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0) + //{ + // _allMarkSetList.Add(new HydroMarkSetViewModel() + // { + // Code = Yw.Hydro.ParterCatalog.Nozzle, + // Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Nozzle), + // MarkType = (int)eWaterboxMarkType.None + // }); + //} } return _allMarkSetList; } @@ -1507,408 +1507,408 @@ } _allMarkResultList = new List<HydroMarkResultViewModel>(); var allMarkSetList = GetMarkSetList(); - foreach (var markSet in allMarkSetList) - { - switch (markSet.Code) - { - case Yw.Hydro.ParterCatalog.Waterbox: - { - if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0) - { - switch ((eWaterboxMarkType)markSet.MarkType) - { - case eWaterboxMarkType.None: - { + //foreach (var markSet in allMarkSetList) + //{ + // switch (markSet.Code) + // { + // case Yw.Hydro.ParterCatalog.Waterbox: + // { + // if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0) + // { + // switch ((eWaterboxMarkType)markSet.MarkType) + // { + // case eWaterboxMarkType.None: + // { - } - break; - case eWaterboxMarkType.PoolElev: - { - _hydroInfo.Waterboxs.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"姹犲簳鏍囬珮:{Math.Round(t.PoolElev, 4)}m" - }); - }); - } - break; - case eWaterboxMarkType.InitLevel: - { - _hydroInfo.Waterboxs.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鍒濆姘翠綅:{Math.Round(t.InitLevel, 4)}m" - }); - }); - } - break; - case eWaterboxMarkType.MinLevel: - { - _hydroInfo.Waterboxs.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鏈�灏忔按浣�:{Math.Round(t.MinLevel, 4)}m" - }); - }); - } - break; - case eWaterboxMarkType.MaxLevel: - { - _hydroInfo.Waterboxs.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鏈�楂樻按浣�:{Math.Round(t.MaxLevel, 4)}m" - }); - }); - } - break; - case eWaterboxMarkType.DN: - { - _hydroInfo.Waterboxs.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鐩村緞:{Math.Round(t.DN, 4)}m" - }); - }); - } - break; - case eWaterboxMarkType.MinVol: - { - _hydroInfo.Waterboxs.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鏈�灏忓绉�:{Math.Round(t.MinVol, 1)}m" - }); - }); - } - break; - default: break; - } - } - } - break; - case Yw.Hydro.ParterCatalog.Pump: - { - if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0) - { - switch ((ePumpMarkType)markSet.MarkType) - { - case ePumpMarkType.None: - { + // } + // break; + // case eWaterboxMarkType.PoolElev: + // { + // _hydroInfo.Waterboxs.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"姹犲簳鏍囬珮:{Math.Round(t.PoolElev, 4)}m" + // }); + // }); + // } + // break; + // case eWaterboxMarkType.InitLevel: + // { + // _hydroInfo.Waterboxs.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鍒濆姘翠綅:{Math.Round(t.InitLevel, 4)}m" + // }); + // }); + // } + // break; + // case eWaterboxMarkType.MinLevel: + // { + // _hydroInfo.Waterboxs.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鏈�灏忔按浣�:{Math.Round(t.MinLevel, 4)}m" + // }); + // }); + // } + // break; + // case eWaterboxMarkType.MaxLevel: + // { + // _hydroInfo.Waterboxs.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鏈�楂樻按浣�:{Math.Round(t.MaxLevel, 4)}m" + // }); + // }); + // } + // break; + // case eWaterboxMarkType.DN: + // { + // _hydroInfo.Waterboxs.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鐩村緞:{Math.Round(t.DN, 4)}m" + // }); + // }); + // } + // break; + // case eWaterboxMarkType.MinVol: + // { + // _hydroInfo.Waterboxs.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鏈�灏忓绉�:{Math.Round(t.MinVol, 1)}m" + // }); + // }); + // } + // break; + // default: break; + // } + // } + // } + // break; + // case Yw.Hydro.ParterCatalog.Pump: + // { + // if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0) + // { + // switch ((ePumpMarkType)markSet.MarkType) + // { + // case ePumpMarkType.None: + // { - } - break; - case ePumpMarkType.PumpStatus: - { - _hydroInfo.Pumps.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"寮�鏈虹姸鎬�:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}" - }); - }); - } - break; - case ePumpMarkType.RatedP: - { - _hydroInfo.Pumps.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"棰濆畾鍔熺巼:{t.RatedP}kW" - }); - }); - } - break; - case ePumpMarkType.RatedQ: - { - _hydroInfo.Pumps.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"棰濆畾娴侀噺:{t.RatedQ}m鲁/h" - }); - }); - } - break; - case ePumpMarkType.RatedH: - { - _hydroInfo.Pumps.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"棰濆畾鎵▼:{t.RatedH}m" - }); - }); - } - break; - case ePumpMarkType.RatedN: - { - _hydroInfo.Pumps.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"棰濆畾杞��:{t.RatedN}r/min" - }); - }); - } - break; - case ePumpMarkType.RatedHz: - { - _hydroInfo.Pumps.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"棰濆畾棰戠巼:{t.RatedHz}" - }); - }); - } - break; - case ePumpMarkType.CurrentN: - { - _hydroInfo.Pumps.ForEach(t => - { - if (t.RatedN.HasValue) - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"璁惧畾杞��:{Math.Round(t.RatedN.Value * t.SpeedRatio, 1)}r/min" - }); - } - }); - } - break; - case ePumpMarkType.CurrentHz: - { - _hydroInfo.Pumps.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"璁惧畾棰戠巼:{Math.Round(t.RatedHz * t.SpeedRatio, 1)}hz" - }); - }); - } - break; - default: break; - } - } - } - break; - case Yw.Hydro.ParterCatalog.Valve: - { - if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0) - { - switch ((eValveMarkType)markSet.MarkType) - { - case eValveMarkType.None: - { + // } + // break; + // case ePumpMarkType.PumpStatus: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"寮�鏈虹姸鎬�:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}" + // }); + // }); + // } + // break; + // case ePumpMarkType.RatedP: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"棰濆畾鍔熺巼:{t.RatedP}kW" + // }); + // }); + // } + // break; + // case ePumpMarkType.RatedQ: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"棰濆畾娴侀噺:{t.RatedQ}m鲁/h" + // }); + // }); + // } + // break; + // case ePumpMarkType.RatedH: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"棰濆畾鎵▼:{t.RatedH}m" + // }); + // }); + // } + // break; + // case ePumpMarkType.RatedN: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"棰濆畾杞��:{t.RatedN}r/min" + // }); + // }); + // } + // break; + // case ePumpMarkType.RatedHz: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"棰濆畾棰戠巼:{t.RatedHz}" + // }); + // }); + // } + // break; + // case ePumpMarkType.CurrentN: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // if (t.RatedN.HasValue) + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"璁惧畾杞��:{Math.Round(t.RatedN.Value * t.SpeedRatio, 1)}r/min" + // }); + // } + // }); + // } + // break; + // case ePumpMarkType.CurrentHz: + // { + // _hydroInfo.Pumps.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"璁惧畾棰戠巼:{Math.Round(t.RatedHz * t.SpeedRatio, 1)}hz" + // }); + // }); + // } + // break; + // default: break; + // } + // } + // } + // break; + // case Yw.Hydro.ParterCatalog.Valve: + // { + // if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0) + // { + // switch ((eValveMarkType)markSet.MarkType) + // { + // case eValveMarkType.None: + // { - } - break; - case eValveMarkType.ValveStatus: - { - _hydroInfo.Valves.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"闃�闂ㄧ姸鎬�:{HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}" - }); - }); - } - break; - case eValveMarkType.ValveType: - { - _hydroInfo.Valves.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"闃�闂ㄧ被鍨�:{HydroValveTypeHelper.GetTypeName(t.ValveType)}" - }); - }); - } - break; - case eValveMarkType.Diameter: - { - _hydroInfo.Valves.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鐩村緞:{t.Diameter}mm" - }); - }); - } - break; - case eValveMarkType.MinorLoss: - { - _hydroInfo.Valves.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"灞�闃荤郴鏁�:{t.MinorLoss}" - }); - }); - } - break; - default: break; - } - } - } - break; - case Yw.Hydro.ParterCatalog.Pipe: - { - if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0) - { - switch ((ePipeMarkType)markSet.MarkType) - { - case ePipeMarkType.None: - { + // } + // break; + // case eValveMarkType.ValveStatus: + // { + // _hydroInfo.Valves.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"闃�闂ㄧ姸鎬�:{HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}" + // }); + // }); + // } + // break; + // case eValveMarkType.ValveType: + // { + // _hydroInfo.Valves.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"闃�闂ㄧ被鍨�:{HydroValveTypeHelper.GetTypeName(t.ValveType)}" + // }); + // }); + // } + // break; + // case eValveMarkType.Diameter: + // { + // _hydroInfo.Valves.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鐩村緞:{t.Diameter}mm" + // }); + // }); + // } + // break; + // case eValveMarkType.MinorLoss: + // { + // _hydroInfo.Valves.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"灞�闃荤郴鏁�:{t.MinorLoss}" + // }); + // }); + // } + // break; + // default: break; + // } + // } + // } + // break; + // case Yw.Hydro.ParterCatalog.Pipe: + // { + // if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0) + // { + // switch ((ePipeMarkType)markSet.MarkType) + // { + // case ePipeMarkType.None: + // { - } - break; - case ePipeMarkType.PipeStatus: - { - _hydroInfo.Pipes.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鐘舵��:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}" - }); - }); - } - break; - case ePipeMarkType.Diameter: - { - _hydroInfo.Pipes.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鐩村緞:{t.Diameter}mm" - }); - }); - } - break; - case ePipeMarkType.Length: - { - _hydroInfo.Pipes.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"闀垮害:{t.Length}m" - }); - }); - } - break; - case ePipeMarkType.Roughness: - { - _hydroInfo.Pipes.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"绮楃硻绯绘暟:{t.Roughness}" - }); - }); - } - break; - case ePipeMarkType.MinorLoss: - { - _hydroInfo.Pipes.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"灞�闃荤郴鏁�:{t.MinorLoss}" - }); - }); - } - break; - default: break; - } - } - } - break; - case Yw.Hydro.ParterCatalog.Nozzle: - { - if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0) - { - switch ((eNozzleMarkType)markSet.MarkType) - { - case eNozzleMarkType.None: - { + // } + // break; + // case ePipeMarkType.PipeStatus: + // { + // _hydroInfo.Pipes.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鐘舵��:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}" + // }); + // }); + // } + // break; + // case ePipeMarkType.Diameter: + // { + // _hydroInfo.Pipes.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鐩村緞:{t.Diameter}mm" + // }); + // }); + // } + // break; + // case ePipeMarkType.Length: + // { + // _hydroInfo.Pipes.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"闀垮害:{t.Length}m" + // }); + // }); + // } + // break; + // case ePipeMarkType.Roughness: + // { + // _hydroInfo.Pipes.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"绮楃硻绯绘暟:{t.Roughness}" + // }); + // }); + // } + // break; + // case ePipeMarkType.MinorLoss: + // { + // _hydroInfo.Pipes.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"灞�闃荤郴鏁�:{t.MinorLoss}" + // }); + // }); + // } + // break; + // default: break; + // } + // } + // } + // break; + // case Yw.Hydro.ParterCatalog.Nozzle: + // { + // if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0) + // { + // switch ((eNozzleMarkType)markSet.MarkType) + // { + // case eNozzleMarkType.None: + // { - } - break; - case eNozzleMarkType.Elev: - { - _hydroInfo.Nozzles.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鏍囬珮:{Math.Round(t.Elev, 4)}m" - }); - }); - } - break; - case eNozzleMarkType.Demand: - { - _hydroInfo.Nozzles.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"闇�姘撮噺:{t.Demand}m鲁/h" - }); - }); - } - break; - case eNozzleMarkType.Coefficient: - { - _hydroInfo.Nozzles.ForEach(t => - { - _allMarkResultList.Add(new HydroMarkResultViewModel() - { - Code = t.Code, - Text = $"鍠峰皠绯绘暟:{t.Coefficient}" - }); - }); - } - break; - default: break; - } - } - } - break; - default: break; - } - } + // } + // break; + // case eNozzleMarkType.Elev: + // { + // _hydroInfo.Nozzles.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鏍囬珮:{Math.Round(t.Elev, 4)}m" + // }); + // }); + // } + // break; + // case eNozzleMarkType.Demand: + // { + // _hydroInfo.Nozzles.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"闇�姘撮噺:{t.Demand}m鲁/h" + // }); + // }); + // } + // break; + // case eNozzleMarkType.Coefficient: + // { + // _hydroInfo.Nozzles.ForEach(t => + // { + // _allMarkResultList.Add(new HydroMarkResultViewModel() + // { + // Code = t.Code, + // Text = $"鍠峰皠绯绘暟:{t.Coefficient}" + // }); + // }); + // } + // break; + // default: break; + // } + // } + // } + // break; + // default: break; + // } + //} return _allMarkResultList; } -- Gitblit v1.9.3