From 330002911a64ea58d6834b64228870228eb75391 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 20 三月 2025 16:12:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilityViewModel.cs | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilityViewModel.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilityViewModel.cs
index 9bf5273..adace0f 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilityViewModel.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilityViewModel.cs
@@ -1,5 +1,5 @@
锘縰sing System.ComponentModel;
-using System.Windows.Forms.VisualStyles;
+using Yw.Untity;
namespace PBS.WinFrmUI
{
@@ -21,17 +21,16 @@
this.FloorHeight = rhs.FloorHeight;
this.Households = rhs.Households;
this.MaxWaterDemand = rhs.MaxWaterDemand;
- this.ServicePipeLength = rhs.ServicePipeLength;
this.ConstantPressure = rhs.ConstantPressure;
this.TerminalPressure = rhs.TerminalPressure;
- this.Paras = rhs.Paras == null ? null : new(rhs.Paras);
- this.Flags = rhs.Flags?.ToList();
+ this.Paras = rhs.Paras == null ? null : rhs.Paras;
+ this.Flags = FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
+ this.Vmo = rhs;
}
-
public void Resert(Vmo.FacilityVmo rhs)
{
@@ -45,16 +44,15 @@
this.FloorHeight = rhs.FloorHeight;
this.Households = rhs.Households;
this.MaxWaterDemand = rhs.MaxWaterDemand;
- this.ServicePipeLength = rhs.ServicePipeLength;
this.ConstantPressure = rhs.ConstantPressure;
this.TerminalPressure = rhs.TerminalPressure;
- this.Paras = rhs.Paras == null ? null : new(rhs.Paras);
- this.Flags = rhs.Flags?.ToList();
+ this.Paras = rhs.Paras == null ? null : rhs.Paras;
+ this.Flags = FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
-
+ this.Vmo = rhs;
}
/// <summary>
@@ -62,13 +60,13 @@
///</summary>
[DisplayName("ID")]
[Browsable(false)]
- public long ID { get; set; }
+ public long ID { get; set; }
/// <summary>
/// PlaceID
///</summary>
[DisplayName("PlaceID")]
- [Browsable(false)]
+ [Browsable(true)]
public long PlaceID { get; set; }
/// <summary>
@@ -81,7 +79,7 @@
/// <summary>
/// 鍚嶇О
///</summary>
- [DisplayName("Name")]
+ [DisplayName("鍚嶇О")]
[Browsable(true)]
public string Name { get; set; }
@@ -90,22 +88,20 @@
///</summary>
[DisplayName("渚涙按鍗曞厓")]
[Browsable(true)]
- public int WaterSupply { get; set; }
+ public eWaterSupply WaterSupply { get; set; }
/// <summary>
/// 渚涙按妯″紡
///</summary>
[DisplayName("渚涙按妯″紡")]
[Browsable(true)]
-
- public int SupplyMode { get; set; }
+ public eSupplyMode SupplyMode { get; set; }
/// <summary>
/// 妤煎眰
///</summary>
[DisplayName("妤煎眰")]
[Browsable(true)]
-
public int Floor { get; set; }
/// <summary>
@@ -113,7 +109,6 @@
///</summary>
[DisplayName("灞傞珮")]
[Browsable(true)]
-
public double? FloorHeight { get; set; }
/// <summary>
@@ -131,13 +126,6 @@
[DisplayName("鏈�澶ч渶姘撮噺")]
[Browsable(true)]
public double? MaxWaterDemand { get; set; }
-
- /// <summary>
- /// 鍏ユ埛绠￠暱
- ///</summary>
- [DisplayName("鍏ユ埛绠￠暱")]
- [Browsable(true)]
- public double? ServicePipeLength { get; set; }
/// <summary>
/// 鎭掑畾鍘嬪姏
@@ -165,7 +153,7 @@
///</summary>
[DisplayName("鏍囩")]
[Browsable(true)]
- public List<string> Flags { get; set; }
+ public string Flags { get; set; }
/// <summary>
/// 鏍囧織
@@ -179,7 +167,7 @@
///</summary>
[DisplayName("浣跨敤鐘舵��")]
[Browsable(true)]
- public int UseStatus { get; set; }
+ public Yw.Vmo.eUseStatus UseStatus { get; set; }
/// <summary>
/// 鎺掑簭鐮�
@@ -194,5 +182,7 @@
[DisplayName("璇存槑")]
[Browsable(true)]
public string Description { get; set; }
+
+ public Vmo.FacilityVmo Vmo { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3