From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 17:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectViewModel.cs | 111 ++++++++++++++++++++-----------------------------------
1 files changed, 41 insertions(+), 70 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 fc89121..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,10 +1,35 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing Yw.Vmo;
+
+namespace HStation.WinFrmUI
{
/// <summary>
/// 椤圭洰瀵煎叆view model
/// </summary>
public class ImportXhsProjectViewModel
{
+ /// <summary>
+ ///
+ /// </summary>
+ public ImportXhsProjectViewModel() { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public ImportXhsProjectViewModel(HStation.Vmo.XhsProjectExtensionsVmo project)
+ {
+ this.Project = project;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public ImportXhsProjectViewModel(HStation.Vmo.XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo) : this(project)
+ {
+ this.MapInfo = mapInfo;
+ }
+
+
+
#region 绗竴姝ラ�夋嫨鍘嬬缉鏂囦欢
/// <summary>
@@ -27,103 +52,47 @@
#region 绗簩姝ュ綍鍏ラ」鐩俊鎭�
/// <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; }
+ public HStation.Vmo.XhsProjectExtensionsVmo Project { get; set; }
#endregion
#region 绗笁姝ヨ缃湴鍥句綅缃�
/// <summary>
- /// 浣嶇疆
+ /// 浣嶇疆淇℃伅
/// </summary>
- public Yw.Model.Map.Marker Location { get; set; }
+ public Yw.Vmo.MapInfoVmo MapInfo { get; set; }
#endregion
#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? ProjectID { get; set; }
+ public HydroModelRelationVmo HydroRelation { get; set; }
/// <summary>
- /// 椤圭洰绔檌d
+ /// bimface鏂囦欢
/// </summary>
- public long? ProjectSiteID { get; set; }
+ public Yw.Vmo.BimfaceFileVmo BimfaceFile { get; set; }
/// <summary>
- /// 姘村姏妯″瀷鍏宠仈id
+ /// bimface鍏宠仈
/// </summary>
- public long? HydroRelationID { get; set; }
-
- /// <summary>
- /// 鍦板浘淇℃伅id
- /// </summary>
- public long? MapInfoID { get; set; }
-
- /// <summary>
- /// bimfaceid
- /// </summary>
- public long? BimfaceId { get; set; }
-
- /// <summary>
- /// bimface 鏂囦欢id
- /// </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
@@ -137,5 +106,7 @@
#endregion
+
+
}
}
--
Gitblit v1.9.3