计算优化

lixiaojun

2025-01-22 46f64905a3c309a50c0f245b3350cdeb8dd699c6

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs

@@ -1,6 +1,4 @@
using System.ComponentModel;

namespace HStation.WinFrmUI.Assets
namespace HStation.WinFrmUI.Assets
{
    public class AssetsValveMainViewModel
    {
@@ -17,20 +15,18 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.MaterialName == null)
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.Material = "默认";
            }
            else
            {
                this.Material = rhs.MaterialName.ToString();
                this.Material = rhs.Material.ToString();
            }
            this.Coefficient = rhs.Coefficient;
            this.Coefficient = rhs.MinorLoss;
            this.SeriesID = rhs.SeriesID;
            this.SeriesType = rhs.Type;
            this.ValveLift = rhs.ValveLift;
            this.SortCode = rhs.SortCode;
            this.KeyWord = rhs.KeyWord;
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.ValveSetting = rhs.ValveSetting;
        }

@@ -39,7 +35,7 @@
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.Description = rhs.Description;
            this.Material = rhs.MaterialName;
            this.Material = rhs.Material;
            if (rhs.Caliber == null)
            {
                this.Caliber = "默认";
@@ -48,20 +44,18 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.MaterialName == null)
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.Material = "默认";
            }
            else
            {
                this.Material = rhs.MaterialName.ToString();
                this.Material = rhs.Material.ToString();
            }
            this.Coefficient = rhs.Coefficient;
            this.Coefficient = rhs.MinorLoss;
            this.SeriesID = rhs.SeriesID;
            this.SeriesType = rhs.Type;
            this.SortCode = rhs.SortCode;
            this.ValveLift = rhs.ValveLift;
            this.KeyWord = rhs.KeyWord;
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.ValveSetting = rhs.ValveSetting;
        }

@@ -98,25 +92,11 @@
        public double Coefficient { get; set; }

        /// <summary>
        /// 类型
        /// </summary>
        [DisplayName("类型")]
        [Browsable(true)]
        public HStation.Assets.eAssetsValveSeriesType SeriesType { get; set; }

        /// <summary>
        /// 说明
        /// </summary>
        [DisplayName("说明")]
        [Browsable(true)]
        public string Description { get; set; }

        /// <summary>
        /// 阀门开度
        /// </summary>
        [DisplayName("阀门开度")]
        [Browsable(true)]
        public int? ValveLift { get; set; }

        /// <summary>
        /// 排序码