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

Shuxia Ning

2024-11-08 0cd48df8ccca96a8a0117a508c342a90dc2eacb8

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs

@@ -42,7 +42,7 @@
        [DisplayName("自由压力")]
        [Display(Name = "自由压力(m)")]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [IsHydroCalcuPro]
        [PropertyOrder(10001)]
        [ShowEditor(false)]
        [Browsable(false)]
@@ -55,7 +55,7 @@
        [DisplayName("绝对压力")]
        [PropertyOrder(10002)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [IsHydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuHead { get; set; }
@@ -67,7 +67,7 @@
        [DisplayName("需水量")]
        [PropertyOrder(10003)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro(true)]
        [IsHydroCalcuPro]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuDemand { get; set; }
@@ -79,7 +79,7 @@
        [DisplayName("计算流量")]
        [Display(Name = "计算流量(m³/h)")]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro(true)]
        [IsHydroCalcuPro]
        [PropertyOrder(11001)]
        [ShowEditor(false)]
        [Browsable(true)]
@@ -102,7 +102,12 @@
            this.UpdatePropStatus(nameof(this.CurrentFlow), this.Vmo, nameof(this.Vmo.CurrentFlow));
        }


        public override void UpdateVmoProperty()
        {
            base.UpdateVmoProperty();
            this.Vmo.CurrentFlow = this.CurrentFlow;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.CurrentFlow), this, nameof(this.CurrentFlow));
        }

        /// <summary>
        /// 更新计算属性
@@ -116,5 +121,7 @@
            }
        }



    }
}