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

Shuxia Ning

2024-12-17 907a1579fecf2c160852cf99b3ea77c08eb481cc

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs

@@ -18,20 +18,6 @@

        }


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

        /// <summary>
        /// 
        /// </summary>
@@ -43,17 +29,6 @@
        }


        /// <summary>
        /// 更新计算属性
        /// </summary>
        public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
        {
            base.UpdateCalcuProperty(rhs);
            if (rhs is HydroCalcuPressmeterResult calcuPressmeterProperty)
            {
                this.CalcuPr = calcuPressmeterProperty.CalcuPr.HasValue ? Math.Round(calcuPressmeterProperty.CalcuPr.Value, 2) : null;
            }
        }

    }
}