lixiaojun
2024-10-22 7da0da3c8d58f40c7dd8e14e64146b9577b33340
综合分析Models
已修改4个文件
已添加2个文件
146 ■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/06-analy/XhsProjectSimualtionAnalySingleResultViewModel.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/06-analy/XhsProjectSimulationAnalySinglePumpViewModel.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/00-core/HydroLinkViewModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)