继续优化报表

duheng

2025-02-19 ad8f813f5eddd66740b4e09801e4ea02ddf70a4a

 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,19 +15,19 @@
            {
                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 = string.Join(",", rhs.KeyWords);
            this.ValveSetting = rhs.ValveSetting;
        }

        public void Reset(Vmo.AssetsValveMainVmo rhs)
@@ -37,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 = "默认";
@@ -46,19 +44,19 @@
            {
                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 = string.Join(",", rhs.KeyWords);
            this.ValveSetting = rhs.ValveSetting;
        }

        [DisplayName("ID")]
@@ -94,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; }
        public string Description { get; set; }

        /// <summary>
        /// 排序码
@@ -132,14 +116,28 @@
        /// 创建人
        /// </summary>
        [DisplayName("创建人")]
        [Browsable(true)]
        [Browsable(false)]
        public string CreateName { get; set; }

        /// <summary>
        /// 创建时间
        /// </summary>
        [DisplayName("创建时间")]
        [Browsable(true)]
        [Browsable(false)]
        public string CreateTime { get; set; }

        /// <summary>
        /// 识别关键字
        /// </summary>
        [DisplayName("关键字")]
        [Browsable(true)]
        public string KeyWord { get; set; }

        /// <summary>
        /// 阀门设置
        /// </summary>
        [DisplayName("阀门设置")]
        [Browsable(true)]
        public string ValveSetting { get; set; }
    }
}