From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
index de1013c..3e50ece 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
@@ -31,7 +31,7 @@
[Category("鎷撴墤缁撴瀯")]
[DisplayName("涓婃父鑺傜偣")]
[PropertyOrder(1001)]
- [IsHydroLinkCode]
+ [IsHydroLinkPro]
[ReadOnly(true)]
[Browsable(true)]
public string StartCode { get; set; }
@@ -42,7 +42,7 @@
[Category("鎷撴墤缁撴瀯")]
[DisplayName("涓嬫父鑺傜偣")]
[PropertyOrder(1002)]
- [IsHydroLinkCode]
+ [IsHydroLinkPro]
[ReadOnly(true)]
[Browsable(true)]
public string EndCode { get; set; }
@@ -64,7 +64,7 @@
[PropertyOrder(10001)]
[Browsable(true)]
[DisplayUnit("m鲁/h")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
public virtual double? CalcuFlow { get; set; }
@@ -76,7 +76,7 @@
[PropertyOrder(10002)]
[Browsable(true)]
[DisplayUnit("m/s")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
public virtual double? CalcuVelocity { get; set; }
@@ -88,7 +88,7 @@
[PropertyOrder(10003)]
[Browsable(true)]
[DisplayUnit("m")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
public virtual double? CalcuHeadLoss { get; set; }
@@ -123,7 +123,7 @@
this.Vmo.UpdatePropStatus(nameof(this.Vmo.StartCode), this, nameof(this.StartCode));
this.Vmo.EndCode = this.EndCode;
this.Vmo.UpdatePropStatus(nameof(this.Vmo.EndCode), this, nameof(this.EndCode));
- this.Vmo.LinkStatus = this.LinkStatus;
+ this.Vmo.LinkStatus = HydroLinkStatusHelper.GetStatusCode(this.LinkStatus);
this.Vmo.UpdatePropStatus(nameof(this.Vmo.LinkStatus), this, nameof(this.LinkStatus));
}
--
Gitblit v1.9.3