From 935a8a4996853c51188402c57f905ee9c9eac898 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 22:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs | 101 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 73 insertions(+), 28 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs
index 41b8c0b..762c0af 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs
@@ -1,55 +1,100 @@
-锘縰sing HStation.Assets;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public class TankSingleMatchingViewModel
{
- public TankSingleMatchingViewModel()
- {
- }
-
public TankSingleMatchingViewModel(Vmo.AssetsTankMainVmo rhs)
{
- this.Caliber = rhs.Caliber;
this.ID = rhs.ID;
- this.Material = rhs.Material;
- this.ModelType = rhs.Name;
- this.MinorLoss = rhs.MinorLoss;
+ this.Name = rhs.Name;
+ this.Description = rhs.Description;
+ this.SortCode = rhs.SortCode;
+ this.ID = rhs.ID;
+ this.Name = rhs.Name;
+ this.Description = rhs.Description;
+ this.SeriesID = rhs.SeriesID;
+ this.SortCode = rhs.SortCode;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
}
- /// <summary>
- /// ID
- /// </summary>
[DisplayName("ID")]
[Browsable(false)]
public long ID { get; set; }
/// <summary>
- /// 鍨嬪彿鍚�
+ /// 绯诲垪ID
/// </summary>
- [DisplayName("鍨嬪彿鍚�")]
- [Browsable(true)]
- public string ModelType { get; set; }
-
- /// <summary>
- /// 鏉愯川
- /// </summary>
- [DisplayName("鏉愯川")]
- [Browsable(true)]
- public string Material { get; set; }
+ [DisplayName("绯诲垪ID")]
+ [Browsable(false)]
+ public long SeriesID { get; set; }
/// <summary>
/// 鍙ｅ緞
/// </summary>
- [DisplayName("鍙ｅ緞")]
+ [DisplayName("鍙ｅ緞(mm)")]
[Browsable(true)]
- public double? Caliber { get; set; }
+ public string Caliber { get; set; }
+
+ /// <summary>
+ /// 鏉愭枡
+ /// </summary>
+ [DisplayName("鏉愭枡")]
+ [Browsable(true)]
+ public string Material { get; set; }
/// <summary>
/// 鎹熷け绯绘暟
/// </summary>
[DisplayName("鎹熷け绯绘暟")]
[Browsable(true)]
- public double? MinorLoss { get; set; }
+ public double Coefficient { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ [DisplayName("璇存槑")]
+ [Browsable(true)]
+ public string Description { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ [DisplayName("鎺掑簭鐮�")]
+ [Browsable(true)]
+ public int SortCode { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ [DisplayName("鍚嶇О")]
+ [Browsable(true)]
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [DisplayName("鍒涘缓浜�")]
+ [Browsable(false)]
+ public string CreateName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [DisplayName("鍒涘缓鏃堕棿")]
+ [Browsable(false)]
+ public string CreateTime { get; set; }
+
+ /// <summary>
+ /// 璇嗗埆鍏抽敭瀛�
+ /// </summary>
+ [DisplayName("鍏抽敭瀛�")]
+ [Browsable(true)]
+ public string KeyWord { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ [DisplayName("闃�闂ㄨ缃�")]
+ [Browsable(true)]
+ public string TankSetting { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3