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 |   94 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 75 insertions(+), 19 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 0e911ed..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
@@ -6,49 +8,103 @@
     public class ImportXhsProjectViewModel
     {
         /// <summary>
-        /// 鍘嬬缉鏂囦欢
+        /// 
         /// </summary>
-        public string ZipFile { get; set; }
+        public ImportXhsProjectViewModel() { }
 
         /// <summary>
-        /// 缂栧彿
+        /// 
         /// </summary>
-        public string NO { get; set; }
+        public ImportXhsProjectViewModel(HStation.Vmo.XhsProjectExtensionsVmo project)
+        {
+            this.Project = project;
+        }
 
         /// <summary>
-        /// 鍚嶇О
+        /// 
         /// </summary>
-        public string Name { get; set; }
+        public ImportXhsProjectViewModel(HStation.Vmo.XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo) : this(project)
+        {
+            this.MapInfo = mapInfo;
+        }
+
+
+
+        #region 绗竴姝ラ�夋嫨鍘嬬缉鏂囦欢
 
         /// <summary>
-        /// 璇︾粏鍦板潃
+        /// 鏄惁涓烘湰鍦�
         /// </summary>
-        public string Address { get; set; }
+        public bool IsLocal { get; set; }
 
         /// <summary>
-        /// 瀹㈡埛
+        /// 鏈湴鍘嬬缉鏂囦欢
         /// </summary>
-        public string Customer { get; set; }
+        public string LocalZipFile { get; set; }
 
         /// <summary>
-        /// 鏍囩
+        /// 浜戞枃浠�
         /// </summary>
-        public List<string> Flags { get; set; }
+        public TransferRevitFileVmo TransferRevitFile { get; set; }
+
+        #endregion
+
+        #region 绗簩姝ュ綍鍏ラ」鐩俊鎭�
 
         /// <summary>
-        /// 鏍囧織
+        /// 椤圭洰
         /// </summary>
-        public string TagName { get; set; }
+        public HStation.Vmo.XhsProjectExtensionsVmo Project { get; set; }
+
+        #endregion
+
+        #region 绗笁姝ヨ缃湴鍥句綅缃�
 
         /// <summary>
-        /// 璇存槑
+        /// 浣嶇疆淇℃伅
         /// </summary>
-        public string Description { get; set; }
+        public Yw.Vmo.MapInfoVmo MapInfo { get; set; }
+
+        #endregion
+
+        #region 绗洓姝ヨ嚜鍔ㄧ敓鎴愰」鐩�
 
         /// <summary>
-        /// 浣嶇疆
+        /// Revit淇℃伅
         /// </summary>
-        public Yw.Model.Map.Marker Location { get; set; }
+        public HStation.Model.RevitModel RevitModel { get; set; }
+
+        /// <summary>
+        /// 姘村姏淇℃伅
+        /// </summary>
+        public Yw.Model.HydroModelInfo HydroInfo { get; set; }
+
+        /// <summary>
+        /// 姘村姏鍏宠仈
+        /// </summary>
+        public HydroModelRelationVmo HydroRelation { get; set; }
+
+        /// <summary>
+        /// bimface鏂囦欢
+        /// </summary>
+        public Yw.Vmo.BimfaceFileVmo BimfaceFile { get; set; }
+
+        /// <summary>
+        /// bimface鍏宠仈
+        /// </summary>
+        public Yw.Vmo.BimfaceFileRelationVmo BimfaceRelation { get; set; }
+
+        #endregion
+
+        #region 绗簲姝ラ」鐩鍏ュ畬鎴�
+
+        /// <summary>
+        /// 鏄惁瀹屾垚
+        /// </summary>
+        public bool IsCompleted { get; set; }
+
+
+        #endregion
 
 
 

--
Gitblit v1.9.3