From 2af3ae119846a6b12cabdc28fb67329e122e39b5 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 24 十月 2024 16:19:27 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs
index 423e0de..b6963ea 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs
@@ -23,7 +23,7 @@
this.UpdatePropStatus(nameof(this.Diameter), rhs, nameof(rhs.Diameter));
this.MinorLoss = rhs.MinorLoss;
this.UpdatePropStatus(nameof(this.MinorLoss), rhs, nameof(rhs.MinorLoss));
- this.ValveType = rhs.ValveType;
+ this.ValveType = HydroValveTypeHelper.GetTypeName(rhs.ValveType);
this.UpdatePropStatus(nameof(this.ValveType), rhs, nameof(rhs.ValveType));
this.OpeningDegree = rhs.OpeningDegree;
this.UpdatePropStatus(nameof(this.OpeningDegree), rhs, nameof(rhs.OpeningDegree));
@@ -114,7 +114,7 @@
this.UpdatePropStatus(nameof(this.Diameter), hydroValveInfo, nameof(hydroValveInfo.Diameter));
this.MinorLoss = hydroValveInfo.MinorLoss;
this.UpdatePropStatus(nameof(this.MinorLoss), hydroValveInfo, nameof(hydroValveInfo.MinorLoss));
- this.ValveType = hydroValveInfo.ValveType;
+ this.ValveType = HydroValveTypeHelper.GetTypeName(hydroValveInfo.ValveType);
this.UpdatePropStatus(nameof(this.ValveType), hydroValveInfo, nameof(hydroValveInfo.ValveType));
this.OpeningDegree = hydroValveInfo.OpeningDegree;
this.UpdatePropStatus(nameof(this.OpeningDegree), hydroValveInfo, nameof(hydroValveInfo.OpeningDegree));
--
Gitblit v1.9.3