From a2ad15911dcde2d45cd546d5b8d7fb791f7afafd Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 17 十二月 2024 09:04:18 +0800
Subject: [PATCH] 优化计算属性

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs |   33 ++++++---------------------------
 1 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs
index 4717591..b301adb 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/04-instrument/02-pressmeter/HydroPressmeterViewModel.cs
@@ -15,41 +15,20 @@
         /// </summary>
         public HydroPressmeterViewModel(Yw.Model.HydroPressmeterInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
         {
-            this.Vmo = rhs;
+
         }
-
-
-        /// <summary>
-        /// 璁$畻鍘嬪姏
-        /// </summary>
-        [Category("璁$畻缁撴灉")]
-        [DisplayName("璁$畻鍘嬪姏")]
-        [Display(Name = "璁$畻鍘嬪姏(m)")]
-        [DisplayUnit("m")]
-        [HydroCalcuPro]
-        [PropertyOrder(11001)]
-        [ShowEditor(false)]
-        [Browsable(true)]
-        public double? CalcuPr { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
         [Browsable(false)]
-        public new Yw.Model.HydroPressmeterInfo Vmo { get; set; }
-
-
-        /// <summary>
-        /// 鏇存柊璁$畻灞炴��
-        /// </summary>
-        public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
+        public new Yw.Model.HydroPressmeterInfo Vmo
         {
-            base.UpdateCalcuProperty(rhs);
-            if (rhs is HydroCalcuPressmeterResult calcuPressmeterProperty)
-            {
-                this.CalcuPr = calcuPressmeterProperty.CalcuPr.HasValue ? Math.Round(calcuPressmeterProperty.CalcuPr.Value, 2) : null;
-            }
+            get { return _vmo as Yw.Model.HydroPressmeterInfo; }
+            set { _vmo = value; }
         }
 
+
+
     }
 }

--
Gitblit v1.9.3