项目管理整改

lixiaojun

2024-12-20 94d10185010a7476021764f5b5cb59dc7d2b68f4

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs

@@ -35,8 +35,6 @@
            this.UpdatePropStatus(nameof(this.CurveQP), rhs, nameof(rhs.CurveQP));
            this.CurveQE = rhs.CurveQE;
            this.UpdatePropStatus(nameof(this.CurveQE), rhs, nameof(rhs.CurveQE));

            this.Vmo = rhs;
        }

        /// <summary>
@@ -170,7 +168,7 @@
        [Category("数据")]
        [DisplayName("流量扬程曲线")]
        [PropertyOrder(2010)]
        [HydroCurvePro(HydroCurve.PumpQH)]
        [HydroCurvePro(HydroCurve.PumpQH, HydroCurveType.CurveQH)]
        [Browsable(false)]
        public string CurveQH { get; set; }

@@ -180,7 +178,7 @@
        [Category("数据")]
        [DisplayName("流量功率曲线")]
        [PropertyOrder(2011)]
        [HydroCurvePro(HydroCurve.PumpQP)]
        [HydroCurvePro(HydroCurve.PumpQP, HydroCurveType.CurveQP)]
        [Browsable(false)]
        public string CurveQP { get; set; }

@@ -190,10 +188,9 @@
        [Category("数据")]
        [DisplayName("流量效率曲线")]
        [PropertyOrder(2012)]
        [HydroCurvePro(HydroCurve.PumpQE)]
        [HydroCurvePro(HydroCurve.PumpQE, HydroCurveType.CurveQE)]
        [Browsable(false)]
        public string CurveQE { get; set; }


        /// <summary>
        /// 流量
@@ -231,6 +228,32 @@
        [Browsable(false)]
        public override double? CalcuHeadLoss { get; set; }

        /// <summary>
        /// 局部损失
        /// </summary>
        [Category("计算结果")]
        [DisplayName("局部损失")]
        [Display(Name = "局部损失(m)")]
        [PropertyOrder(10004)]
        [DisplayUnit("m")]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuMinorLoss { get; set; }

        /// <summary>
        /// 沿程损失
        /// </summary>
        [Category("计算结果")]
        [DisplayName("沿程损失")]
        [Display(Name = "沿程损失(m)")]
        [PropertyOrder(10005)]
        [DisplayUnit("m")]
        [HydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuFrictionLoss { get; set; }


        /// <summary>
        /// 流量
@@ -245,11 +268,37 @@
        public double? CalcuQ { get; set; }

        /// <summary>
        /// 进口压力
        /// </summary>
        [Category("计算结果")]
        [DisplayName("进口压力")]
        [Display(Name = "进口压力(m)")]
        [PropertyOrder(11002)]
        [Browsable(true)]
        [DisplayUnit("m")]
        [HydroCalcuPro]
        [ShowEditor(false)]
        public virtual double? CalcuPr1 { get; set; }

        /// <summary>
        /// 出口压力
        /// </summary>
        [Category("计算结果")]
        [DisplayName("出口压力")]
        [Display(Name = "出口压力(m)")]
        [PropertyOrder(11003)]
        [Browsable(true)]
        [DisplayUnit("m")]
        [HydroCalcuPro]
        [ShowEditor(false)]
        public virtual double? CalcuPr2 { get; set; }

        /// <summary>
        /// 扬程
        /// </summary>
        [Category("计算结果")]
        [DisplayName("扬程")]
        [PropertyOrder(11002)]
        [PropertyOrder(11004)]
        [DisplayUnit("m")]
        [HydroCalcuPro]
        [ShowEditor(false)]
@@ -261,7 +310,7 @@
        /// </summary>
        [Category("计算结果")]
        [DisplayName("功率")]
        [PropertyOrder(11003)]
        [PropertyOrder(11005)]
        [DisplayUnit("kW")]
        [HydroCalcuPro]
        [ShowEditor(false)]
@@ -273,7 +322,7 @@
        /// </summary>
        [Category("计算结果")]
        [DisplayName("效率")]
        [PropertyOrder(11004)]
        [PropertyOrder(11006)]
        [DisplayUnit("%")]
        [HydroCalcuPro]
        [ShowEditor(false)]
@@ -284,7 +333,11 @@
        /// 
        /// </summary>
        [Browsable(false)]
        public new Yw.Model.HydroPumpInfo Vmo { get; set; }
        public new Yw.Model.HydroPumpInfo Vmo
        {
            get { return _vmo as Yw.Model.HydroPumpInfo; }
            set { _vmo = value; }
        }

        /// <summary>
        /// 
@@ -349,6 +402,8 @@
            if (rhs is HydroCalcuPumpResult calcuPumpProperty)
            {
                this.CalcuQ = calcuPumpProperty.CalcuQ.HasValue ? Math.Round(calcuPumpProperty.CalcuQ.Value, 1) : null;
                this.CalcuPr1 = calcuPumpProperty.CalcuPr1.HasValue ? Math.Round(calcuPumpProperty.CalcuPr1.Value, 2) : null;
                this.CalcuPr2 = calcuPumpProperty.CalcuPr2.HasValue ? Math.Round(calcuPumpProperty.CalcuPr2.Value, 2) : null;
                this.CalcuH = calcuPumpProperty.CalcuH.HasValue ? Math.Round(calcuPumpProperty.CalcuH.Value, 2) : null;
                this.CalcuP = calcuPumpProperty.CalcuP.HasValue ? Math.Round(calcuPumpProperty.CalcuP.Value, 1) : null;
                this.CalcuE = calcuPumpProperty.CalcuE.HasValue ? Math.Round(calcuPumpProperty.CalcuE.Value, 1) : null;