From ad8f813f5eddd66740b4e09801e4ea02ddf70a4a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 15:58:22 +0800
Subject: [PATCH] 继续优化报表
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
index 31ba521..281c807 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
@@ -1,6 +1,4 @@
-锘縰sing System.ComponentModel;
-
-namespace HStation.WinFrmUI.Assets
+锘縩amespace HStation.WinFrmUI.Assets
{
public class AssetsValveMainViewModel
{
@@ -17,19 +15,19 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.MaterialName == null)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
this.Material = "榛樿";
}
else
{
- this.Material = rhs.MaterialName.ToString();
+ this.Material = rhs.Material.ToString();
}
- this.Coefficient = rhs.Coefficient;
+ this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.Type;
- this.ValveLift = rhs.ValveLift;
this.SortCode = rhs.SortCode;
+ this.KeyWord = string.Join(",", rhs.KeyWords);
+ this.ValveSetting = rhs.ValveSetting;
}
public void Reset(Vmo.AssetsValveMainVmo rhs)
@@ -37,7 +35,7 @@
this.ID = rhs.ID;
this.Name = rhs.Name;
this.Description = rhs.Description;
- this.Material = rhs.MaterialName;
+ this.Material = rhs.Material;
if (rhs.Caliber == null)
{
this.Caliber = "榛樿";
@@ -46,19 +44,19 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.MaterialName == null)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
this.Material = "榛樿";
}
else
{
- this.Material = rhs.MaterialName.ToString();
+ this.Material = rhs.Material.ToString();
}
- this.Coefficient = rhs.Coefficient;
+ this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.Type;
this.SortCode = rhs.SortCode;
- this.ValveLift = rhs.ValveLift;
+ this.KeyWord = string.Join(",", rhs.KeyWords);
+ this.ValveSetting = rhs.ValveSetting;
}
[DisplayName("ID")]
@@ -94,25 +92,11 @@
public double Coefficient { get; set; }
/// <summary>
- /// 绫诲瀷
- /// </summary>
- [DisplayName("绫诲瀷")]
- [Browsable(true)]
- public HStation.Assets.eAssetsValveSeriesType SeriesType { get; set; }
-
- /// <summary>
/// 璇存槑
/// </summary>
[DisplayName("璇存槑")]
[Browsable(true)]
- public string? Description { get; set; }
-
- /// <summary>
- /// 闃�闂ㄥ紑搴�
- /// </summary>
- [DisplayName("闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int ValveLift { get; set; }
+ public string Description { get; set; }
/// <summary>
/// 鎺掑簭鐮�
@@ -132,14 +116,28 @@
/// 鍒涘缓浜�
/// </summary>
[DisplayName("鍒涘缓浜�")]
- [Browsable(true)]
+ [Browsable(false)]
public string CreateName { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
[DisplayName("鍒涘缓鏃堕棿")]
- [Browsable(true)]
+ [Browsable(false)]
public string CreateTime { get; set; }
+
+ /// <summary>
+ /// 璇嗗埆鍏抽敭瀛�
+ /// </summary>
+ [DisplayName("鍏抽敭瀛�")]
+ [Browsable(true)]
+ public string KeyWord { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ [DisplayName("闃�闂ㄨ缃�")]
+ [Browsable(true)]
+ public string ValveSetting { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3