From 26f45822a2a84af81e20ca543da98d3b822c5afd Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 17 二月 2025 21:25:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/02-docking/HydroMonitorDockingViewModel.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/02-docking/HydroMonitorDockingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/02-docking/HydroMonitorDockingViewModel.cs
index 9b4771a..3de3dd4 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/02-docking/HydroMonitorDockingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/02-docking/HydroMonitorDockingViewModel.cs
@@ -21,9 +21,9 @@
)
{
this.Checked = vmo.ID > 0;
- this.Relation = visual.Name;
+ this.Parter = visual.Name;
this.PropName = HydroMonitorPropHelper.GetName(vmo.PropName);
- this.PropValue = propValue;
+ this.PropValue = vmo.GetPropValue(propValue);
this.UnitName = HydroMonitorPropHelper.GetUnit(vmo.PropName);
this.Flags = Yw.Untity.FlagsHelper.ToString(vmo.Flags);
this.SortCode = vmo.SortCode;
@@ -41,7 +41,7 @@
/// 鏋勪欢
/// </summary>
[DisplayName("鏋勪欢")]
- public string Relation { get; set; }
+ public string Parter { get; set; }
/// <summary>
/// 鍚嶇О
@@ -85,5 +85,7 @@
public Yw.Vmo.HydroMonitorVmo Vmo { get; set; }
+
+
}
}
--
Gitblit v1.9.3