冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AssetsTranslationFactorMgrViewModel.cs

@@ -18,6 +18,11 @@
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.Diameter = rhs.Diameter;
            this.Material = rhs.Material;
            this.StartDiameter = rhs.StartDiameter;
            this.EndDiameter = rhs.EndDiameter;
            this.TranslationType = rhs.TranslationType;
            this.MinorLoss = rhs.MinorLoss;
            this.Description = rhs.Description;
            this.Vmo = rhs;
@@ -30,6 +35,11 @@
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.Diameter = rhs.Diameter;
            this.Material = rhs.Material;
            this.StartDiameter = rhs.StartDiameter;
            this.EndDiameter = rhs.EndDiameter;
            this.TranslationType = rhs.TranslationType;
            this.MinorLoss = rhs.MinorLoss;
            this.Description = rhs.Description;
            this.Vmo = rhs;
@@ -42,13 +52,46 @@
        public long ID { get; set; }

        /// <summary>
        /// 名称
        /// 型号
        /// </summary>
        [Display(Name = "名称")]
        [Display(Name = "型号")]
        public string Name { get; set; }

        /// <summary>
        /// 直径
        /// </summary>

        [Display(Name = "直径(mm)")]
        public double Diameter { get; set; }

        /// <summary>
        /// 上游直径
        /// </summary>

        [Display(Name = "上游直径")]
        public double StartDiameter { get; set; }

        /// <summary>
        /// 下游直径
        /// </summary>
        [Display(Name = "下游直径")]
        public double EndDiameter { get; set; }

        /// <summary>
        /// 材料
        ///</summary>
        [Display(Name = "材料")]
        public string Material { get; set; }

        /// <summary>
        /// 过渡件类型
        /// </summary>
        [Display(Name = "过渡件类型")]
        public HStation.Assets.eTranslationType TranslationType { get; set; }

        /// <summary>
        /// 局阻系数
        ///
        /// </summary>
        [Display(Name = "局阻系数")]
        public double MinorLoss { get; set; }