Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2024-10-29 edfb5be5dc9037152975bd4354e95d5eff78ce2d

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/03-control/SetHydroMarkCtrl.cs

ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkPureCtrl.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"
                                                });
                                            });
                                        }