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

Shuxia Ning

2024-11-08 0cd48df8ccca96a8a0117a508c342a90dc2eacb8

 WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs

@@ -20,19 +20,18 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.MaterialName == null)
            if (rhs.Material == null)
            {
                this.MaterialName = "默认";
                this.Material = "默认";
            }
            else
            {
                this.MaterialName = rhs.MaterialName.ToString();
                this.Material = rhs.Material.ToString();
            }
            this.Name = rhs.Name;
            this.SortCode = rhs.SortCode;
            this.KeyWord = rhs.KeyWord;
            this.IsDefault = rhs.IsDefault;
            this.Coefficient = rhs.Coefficient;
            this.Coefficient = rhs.MinorLoss;
        }

        public void Reset(Vmo.AssetsFourlinkMainVmo rhs)
@@ -46,20 +45,19 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.MaterialName == null)
            if (rhs.Material == null)
            {
                this.MaterialName = "默认";
                this.Material = "默认";
            }
            else
            {
                this.MaterialName = rhs.MaterialName.ToString();
                this.Material = rhs.Material.ToString();
            }
            this.Description = rhs.Description;
            this.Name = rhs.Name;
            this.KeyWord = rhs.KeyWord;
            this.IsDefault = rhs.IsDefault;
            this.SortCode = rhs.SortCode;
            this.Coefficient = rhs.Coefficient;
            this.Coefficient = rhs.MinorLoss;
        }

        /// <summary>
@@ -86,7 +84,7 @@
        /// </summary>
        [DisplayName("材料")]
        [Browsable(true)]
        public string MaterialName { get; set; }
        public string Material { get; set; }

        /// <summary>
        /// 系数
@@ -107,14 +105,7 @@
        /// </summary>
        [DisplayName("关键字")]
        [Browsable(true)]
        public string KeyWord { get; set; }

        /// <summary>
        /// 是否默认
        /// </summary>
        [DisplayName("是否默认")]
        [Browsable(true)]
        public bool IsDefault { get; set; }
        public List<string> KeyWord { get; set; }

        /// <summary>
        /// 说明