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 | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 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 f0e84f3..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
{
@@ -9,7 +7,7 @@
this.ID = rhs.ID;
this.Name = rhs.Name;
this.Description = rhs.Description;
- if (rhs.Caliber == null )
+ if (rhs.Caliber == null)
{
this.Caliber = "榛樿";
}
@@ -17,7 +15,7 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.Material == null|| rhs.Material==string.Empty)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
this.Material = "榛樿";
}
@@ -27,9 +25,8 @@
}
this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.ValveType = rhs.ValveType;
this.SortCode = rhs.SortCode;
- this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.KeyWord = string.Join(",", rhs.KeyWords);
this.ValveSetting = rhs.ValveSetting;
}
@@ -47,7 +44,7 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.Material == null)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
this.Material = "榛樿";
}
@@ -57,9 +54,8 @@
}
this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.ValveType = rhs.ValveType;
this.SortCode = rhs.SortCode;
- this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.KeyWord = string.Join(",", rhs.KeyWords);
this.ValveSetting = rhs.ValveSetting;
}
@@ -94,13 +90,6 @@
[DisplayName("鎹熷け绯绘暟")]
[Browsable(true)]
public double Coefficient { get; set; }
-
- /// <summary>
- /// 绫诲瀷
- /// </summary>
- [DisplayName("绫诲瀷")]
- [Browsable(true)]
- public HStation.Assets.eValveType ValveType { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3