From 146ca8c7eefe74d3b73c00a73e99e94e903be401 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 06 二月 2025 15:04:21 +0800
Subject: [PATCH] 增加工况管理功能和计算结果自由压力与绝对压力切换
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectViewModel.cs | 99 ++++++-------------------------------------------
1 files changed, 12 insertions(+), 87 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectViewModel.cs
index 950f944..01193ab 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing Yw.Vmo;
+
+namespace HStation.WinFrmUI
{
/// <summary>
/// 椤圭洰瀵煎叆view model
@@ -15,15 +17,6 @@
/// </summary>
public ImportXhsProjectViewModel(HStation.Vmo.XhsProjectExtensionsVmo project)
{
- this.ProjectID = project.ID;
- this.NO = project.NO;
- this.Name = project.Name;
- this.Address = project.Address;
- this.Customer = project.Customer;
- this.Flags = project.Flags;
- this.TagName = project.TagName;
- this.Description = project.Description;
- this.ProjectSiteID = project.SiteList?.FirstOrDefault()?.ID;
this.Project = project;
}
@@ -32,8 +25,6 @@
/// </summary>
public ImportXhsProjectViewModel(HStation.Vmo.XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo) : this(project)
{
- this.MapInfoID = mapInfo.ID;
- this.Location = Yw.Model.Map.Marker.ToModel(mapInfo.Position);
this.MapInfo = mapInfo;
}
@@ -61,51 +52,6 @@
#region 绗簩姝ュ綍鍏ラ」鐩俊鎭�
/// <summary>
- /// 椤圭洰id
- /// </summary>
- public long? ProjectID { get; set; }
-
- /// <summary>
- /// 缂栧彿
- /// </summary>
- public string NO { get; set; }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- public string Name { get; set; }
-
- /// <summary>
- /// 璇︾粏鍦板潃
- /// </summary>
- public string Address { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- public string Customer { get; set; }
-
- /// <summary>
- /// 鏍囩
- /// </summary>
- public List<string> Flags { get; set; }
-
- /// <summary>
- /// 鏍囧織
- /// </summary>
- public string TagName { get; set; }
-
- /// <summary>
- /// 璇存槑
- /// </summary>
- public string Description { get; set; }
-
- /// <summary>
- /// 椤圭洰绔檌d
- /// </summary>
- public long? ProjectSiteID { get; set; }
-
- /// <summary>
/// 椤圭洰
/// </summary>
public HStation.Vmo.XhsProjectExtensionsVmo Project { get; set; }
@@ -113,16 +59,6 @@
#endregion
#region 绗笁姝ヨ缃湴鍥句綅缃�
-
- /// <summary>
- /// 浣嶇疆
- /// </summary>
- public Yw.Model.Map.Marker Location { get; set; }
-
- /// <summary>
- /// 鍦板浘淇℃伅id
- /// </summary>
- public long? MapInfoID { get; set; }
/// <summary>
/// 浣嶇疆淇℃伅
@@ -134,40 +70,29 @@
#region 绗洓姝ヨ嚜鍔ㄧ敓鎴愰」鐩�
/// <summary>
- ///
+ /// Revit淇℃伅
/// </summary>
public HStation.Model.RevitModel RevitModel { get; set; }
/// <summary>
- /// 姘村姏妯″瀷id
+ /// 姘村姏淇℃伅
/// </summary>
- public long? HydroID { get; set; }
+ public Yw.Model.HydroModelInfo HydroInfo { get; set; }
/// <summary>
- /// 姘村姏妯″瀷鍏宠仈id
+ /// 姘村姏鍏宠仈
/// </summary>
- public long? HydroRelationID { get; set; }
+ public HydroModelRelationVmo HydroRelation { get; set; }
/// <summary>
- /// bimfaceid
+ /// bimface鏂囦欢
/// </summary>
- public long? BimfaceId { get; set; }
+ public Yw.Vmo.BimfaceFileVmo BimfaceFile { get; set; }
/// <summary>
- /// bimface 鏂囦欢id
+ /// bimface鍏宠仈
/// </summary>
- public long? BimfaceFileID { get; set; }
-
- /// <summary>
- /// bimface 鏂囦欢鍏宠仈id
- /// </summary>
- public long? BimfaceFileRelationID { get; set; }
-
- /// <summary>
- /// Bimface 杞崲鎴愬姛
- /// </summary>
- public bool BimfaceConverted { get; set; }
-
+ public Yw.Vmo.BimfaceFileRelationVmo BimfaceRelation { get; set; }
#endregion
--
Gitblit v1.9.3