From b26ae60e85d4a03a2426e6607e7afe89e1c10a5f Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期四, 05 十二月 2024 11:50:35 +0800 Subject: [PATCH] 水池单独匹配界面修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs | 152 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 116 insertions(+), 36 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 ab51a5b..0ce8faa 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,23 +1,93 @@ -锘縰sing DevExpress.Pdf.Native; -using HStation.Service.Xhs; - - -namespace HStation.WinFrmUI +锘縩amespace HStation.WinFrmUI { /// <summary> - /// + /// /// </summary> public class XhsProjectMgrViewModel { /// <summary> - /// + /// /// </summary> public XhsProjectMgrViewModel() { } - /// <summary> - /// - /// </summary> - public XhsProjectMgrViewModel(XhsProjectDto project) + 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.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; @@ -31,12 +101,30 @@ this.Description = project.Description; } - /// <summary> - /// - /// </summary> - public XhsProjectMgrViewModel(XhsProjectDto project, bool hasLocation) : this(project) + public void Reset(XhsProjectMgrViewModel project, int BimfaceState) { - this.HasLocation = hasLocation; + this.ID = project.ID; + this.ParentID = project.ParentID; + this.NO = project.NO; + this.Name = project.Name; + this.Address = project.Address; + this.Customer = project.Customer; + this.TagName = project.TagName; + this.SortCode = project.SortCode; + this.Description = project.Description; + this.ModelState = (eFileStatus)BimfaceState; + } + + public XhsProjectMgrViewModel(HStation.WinFrmUI.ImportXhsProjectViewModel project, int BimfaceState) + { + this.ID = (long)project.ProjectID; + this.NO = project.NO; + 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.Description = project.Description; } /// <summary> @@ -64,22 +152,10 @@ public string Name { get; set; } /// <summary> - /// 鐢熸晥鏃堕棿 + /// 瀹㈡埛 /// </summary> - [Display(Name = "鐢熸晥鏃堕棿")] - public string StartTime { get; set; } - - /// <summary> - /// 澶辨晥鏃堕棿 - /// </summary> - [Display(Name = "澶辨晥鏃堕棿")] - public string EndTime { get; set; } - - /// <summary> - /// 鍙戝竷鐘舵�� - /// </summary> - [Display(Name = "鍙戝竷鐘舵��")] - public string PublishStatus { get; set; } + [Display(Name = "瀹㈡埛鍚嶇О")] + public string Customer { get; set; } /// <summary> /// 璇︾粏鍦板潃 @@ -88,10 +164,10 @@ public string Address { get; set; } /// <summary> - /// 瀹㈡埛 + /// 妯″瀷鐘舵�� /// </summary> - [Display(Name = "瀹㈡埛鍚嶇О")] - public string Customer { get; set; } + [Display(Name = "妯″瀷鐘舵��")] + public eFileStatus? ModelState { get; set; } /// <summary> /// 鏍囩 @@ -124,7 +200,11 @@ public bool HasLocation { get; set; } + public bool HasModel { get; set; } - + /// <summary> + /// 鏄惁瀛樺湪涓夌淮妯″瀷 + /// </summary> + public bool IsHaveBimface { get; set; } } -} +} \ No newline at end of file -- Gitblit v1.9.3