From 45929342d7825d680781001cbf6beb87be541faa Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 04 十二月 2024 10:01:13 +0800
Subject: [PATCH] 曲线修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs |  111 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 92 insertions(+), 19 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs
index fb78010..011dc67 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs
@@ -1,7 +1,4 @@
-锘縰sing DevExpress.Pdf.Native;
-using HStation.Service.Xhs;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
 {
     /// <summary>
     ///
@@ -14,10 +11,85 @@
         public XhsProjectMgrViewModel()
         { }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool IsHaveBimface)
+        public enum eFileStatus
+        {
+            /// <summary>
+            /// 涓婁紶涓�
+            /// </summary>
+            [Display(Name = "涓婁紶涓�")]
+            Uploading,
+
+            /// <summary>
+            /// 涓婁紶鎴愬姛
+            /// </summary>
+            [Display(Name = "涓婁紶鎴愬姛")]
+            UploadSucceed,
+
+            /// <summary>
+            /// 杞崲涓�
+            /// </summary>
+            [Display(Name = "杞崲涓�")]
+            Converting,
+
+            /// <summary>
+            /// 杞崲鎴愬姛
+            /// </summary>
+            [Display(Name = "杞崲鎴愬姛")]
+            ConvertSucceed,
+
+            /// <summary>
+            /// 瀵规瘮涓�
+            /// </summary>
+            [Display(Name = "瀵规瘮涓�")]
+            Comparing,
+
+            /// <summary>
+            /// 瀵规瘮鎴愬姛
+            /// </summary>
+            [Display(Name = "瀵规瘮鎴愬姛")]
+            CompareSucceed,
+
+            /// <summary>
+            /// 闆嗘垚涓�
+            /// </summary>
+            [Display(Name = "闆嗘垚涓�")]
+            Integrating,
+
+            /// <summary>
+            /// 闆嗘垚鎴愬姛
+            /// </summary>
+            [Display(Name = "闆嗘垚鎴愬姛")]
+            IntegrateSucceed,
+
+            /// <summary>
+            /// 鏈笂浼�
+            /// </summary>
+            [Display(Name = "鏈笂浼�")]
+            Noupload,
+        }
+
+        public XhsProjectMgrViewModel(XhsProjectExtensionsVmo project, bool IsHaveBimface, int BimfaceState, Yw.Vmo.MapInfoVmo mapInfo)
+        {
+            this.ID = project.ID;
+            this.ParentID = project.ParentID;
+            this.NO = project.NO;
+            this.Name = project.Name;
+            if (mapInfo != null)
+            {
+                this.Address = Yw.Model.Map.Marker.ToModel(mapInfo.Position).Address;
+            }
+            this.CreateTime = project.NO.Substring(4, 10);
+
+            this.Customer = project.Customer;
+            this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags);
+            this.TagName = project.TagName;
+            this.SortCode = project.SortCode;
+            this.Description = project.Description;
+            this.IsHaveBimface = IsHaveBimface;
+            this.ModelState = (eFileStatus)BimfaceState;
+        }
+
+        public void Reset(XhsProjectExtensionsVmo project)
         {
             this.ID = project.ID;
             this.ParentID = project.ParentID;
@@ -29,11 +101,9 @@
             this.TagName = project.TagName;
             this.SortCode = project.SortCode;
             this.Description = project.Description;
-            this.IsHaveBimface = IsHaveBimface;
-            this.ModelState = Yw.WinFrmUI.Bimface.eFileStatus.ConvertSucceed;
         }
 
-        public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool IsHaveBimface, int BimfaceState)
+        public void Reset(XhsProjectMgrViewModel project, int BimfaceState)
         {
             this.ID = project.ID;
             this.ParentID = project.ParentID;
@@ -41,25 +111,22 @@
             this.Name = project.Name;
             this.Address = project.Address;
             this.Customer = project.Customer;
-            this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags);
             this.TagName = project.TagName;
             this.SortCode = project.SortCode;
             this.Description = project.Description;
-            this.IsHaveBimface = IsHaveBimface;
-            this.ModelState = (Yw.WinFrmUI.Bimface.eFileStatus)BimfaceState;
+            this.ModelState = (eFileStatus)BimfaceState;
         }
 
-        public void Reset(Vmo.Xhs.XhsProjectExtensions project)
+        public XhsProjectMgrViewModel(HStation.WinFrmUI.ImportXhsProjectViewModel project, int BimfaceState)
         {
-            this.ID = project.ID;
-            this.ParentID = project.ParentID;
+            this.ID = (long)project.ProjectID;
             this.NO = project.NO;
+            this.CreateTime = project.NO.Substring(4, 10);
             this.Name = project.Name;
             this.Address = project.Address;
             this.Customer = project.Customer;
             this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags);
             this.TagName = project.TagName;
-            this.SortCode = project.SortCode;
             this.Description = project.Description;
         }
 
@@ -112,6 +179,12 @@
         public string Address { get; set; }
 
         /// <summary>
+        /// 鍒涘缓鏃堕棿
+        /// </summary>
+        [Display(Name = "鍒涘缓鏃堕棿")]
+        public string CreateTime { get; set; }
+
+        /// <summary>
         /// 瀹㈡埛
         /// </summary>
         [Display(Name = "瀹㈡埛鍚嶇О")]
@@ -121,7 +194,7 @@
         /// 妯″瀷鐘舵��
         /// </summary>
         [Display(Name = "妯″瀷鐘舵��")]
-        public Yw.WinFrmUI.Bimface.eFileStatus ModelState { get; set; }
+        public eFileStatus? ModelState { get; set; }
 
         /// <summary>
         /// 鏍囩

--
Gitblit v1.9.3