From 5e776f1884d4d865c8d3d037a1fb10fb083f37ed Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期五, 03 一月 2025 11:13:02 +0800 Subject: [PATCH] PhartRelation 新增远程方式 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs | 118 ++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 80 insertions(+), 38 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..cc4ace8 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,42 +1,64 @@ -锘縰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 XhsProjectMgrViewModel(XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo, Yw.Vmo.BimfaceFileVmo bimfaceFile) { 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.Address = project.Address; + if (string.IsNullOrEmpty(this.Address)) + { + if (mapInfo != null) + { + this.Address = Yw.Model.Map.Marker.ToModel(mapInfo.Position).Address; + } + } this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags); this.TagName = project.TagName; this.SortCode = project.SortCode; this.Description = project.Description; + this.Project = project; + this.MapInfo = mapInfo; + this.BimfaceFile = bimfaceFile; } /// <summary> - /// + /// 閲嶇疆 /// </summary> - public XhsProjectMgrViewModel(XhsProjectDto project, bool hasLocation) : this(project) + public void Reset(XhsProjectExtensionsVmo project, Yw.Vmo.MapInfoVmo mapInfo, Yw.Vmo.BimfaceFileVmo bimfaceFile) { - this.HasLocation = hasLocation; + this.ID = project.ID; + this.ParentID = project.ParentID; + this.NO = project.NO; + this.Name = project.Name; + this.Customer = project.Customer; + this.Address = project.Address; + if (string.IsNullOrEmpty(this.Address)) + { + if (mapInfo != null) + { + this.Address = Yw.Model.Map.Marker.ToModel(mapInfo.Position).Address; + } + } + this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags); + this.TagName = project.TagName; + this.SortCode = project.SortCode; + this.Description = project.Description; + this.Project = project; + this.MapInfo = mapInfo; + this.BimfaceFile = bimfaceFile; } /// <summary> @@ -64,34 +86,16 @@ 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> /// 璇︾粏鍦板潃 /// </summary> [Display(Name = "璇︾粏鍦板潃")] public string Address { get; set; } - - /// <summary> - /// 瀹㈡埛 - /// </summary> - [Display(Name = "瀹㈡埛鍚嶇О")] - public string Customer { get; set; } /// <summary> /// 鏍囩 @@ -121,10 +125,48 @@ /// 瀹氫綅 /// </summary> [Display(Name = "瀹氫綅")] - public bool HasLocation { get; set; } + public bool HasLocation + { + get { return this.MapInfo != null; } + } + /// <summary> + /// 妯″瀷鐘舵�� + /// </summary> + [Display(Name = "妯″瀷鐘舵��")] + public eXhsProjectStatus ModelStatus + { + get + { + if (this.BimfaceFile == null) + { + return eXhsProjectStatus.Noupload; + } + return (eXhsProjectStatus)this.BimfaceFile.FileStatus; + } + } + /// <summary> + /// 鐘舵�� + /// </summary> + [Display(Name = "鐘舵��")] + public string StatusName { get; set; } + + /// <summary> + /// 椤圭洰 + /// </summary> + public HStation.Vmo.XhsProjectExtensionsVmo Project { get; set; } + + /// <summary> + /// 鍦板浘淇℃伅 + /// </summary> + public Yw.Vmo.MapInfoVmo MapInfo { get; set; } + + /// <summary> + /// Bimface鏂囦欢 + /// </summary> + public Yw.Vmo.BimfaceFileVmo BimfaceFile { get; set; } } -} +} \ No newline at end of file -- Gitblit v1.9.3