From 02c14c9c57dbde72d9c771bd8b0fab1cd023047d Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期一, 13 一月 2025 09:09:22 +0800
Subject: [PATCH] 上下游纵断面分析
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/SprinklerViewModel.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/SprinklerViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/SprinklerViewModel.cs
index 53203a2..7c60592 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/SprinklerViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/SprinklerViewModel.cs
@@ -20,7 +20,7 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.Material == null)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
this.Material = "榛樿";
}
@@ -30,7 +30,7 @@
}
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
- this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.KeyWord = string.Join(",", rhs.KeyWords);
this.MinorLoss = rhs.MinorLoss;
this.Angle = rhs.Angle;
this.FlowMinorLoss = rhs.FlowMinorLoss;
@@ -47,7 +47,7 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.Material == null)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
this.Material = "榛樿";
}
@@ -57,7 +57,7 @@
}
this.Description = rhs.Description;
this.Name = rhs.Name;
- this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.KeyWord = string.Join(",", rhs.KeyWords);
this.SortCode = rhs.SortCode;
this.MinorLoss = rhs.MinorLoss;
this.Angle = rhs.Angle;
@@ -105,13 +105,6 @@
public double MinorLoss { get; set; }
/// <summary>
- /// 娴侀噺绯绘暟
- /// </summary>
- [DisplayName("娴侀噺绯绘暟")]
- [Browsable(true)]
- private double? FlowMinorLoss { get; set; }
-
- /// <summary>
/// 璇嗗埆鍏抽敭瀛�
/// </summary>
[DisplayName("鍏抽敭瀛�")]
@@ -119,6 +112,13 @@
public string KeyWord { get; set; }
/// <summary>
+ /// 娴侀噺绯绘暟
+ /// </summary>
+ [DisplayName("娴侀噺绯绘暟")]
+ [Browsable(true)]
+ public double? FlowMinorLoss { get; set; }
+
+ /// <summary>
/// 鎺掑簭鐮�
/// </summary>
[DisplayName("鎺掑簭鐮�")]
--
Gitblit v1.9.3