From a8cb18d49c3014e2929b93628748b5c8aee6e5e9 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 11 十二月 2024 18:35:07 +0800
Subject: [PATCH] 多工况下水泵列表修复
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs | 97 +++++++++++++++++++++++++++++++-----------------
1 files changed, 63 insertions(+), 34 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 0dc9ecc..bbacdaf 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,34 +1,37 @@
-锘縰sing DevExpress.Pdf.Native;
-using HStation.Service.Xhs;
-
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
/// <summary>
- ///
+ ///
/// </summary>
public class XhsProjectMgrViewModel
{
/// <summary>
- ///
+ ///
/// </summary>
public XhsProjectMgrViewModel() { }
- 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.StartTime = project.StartTime?.ToStandardString();
- this.EndTime = project?.EndTime?.ToStandardString();
- this.PublishStatus = project.PublishStatus.GetDisplayText();
- 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>
@@ -56,34 +59,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>
/// 鏍囩
@@ -109,8 +94,52 @@
[Display(Name = "璇存槑")]
public string Description { get; set; }
+ /// <summary>
+ /// 瀹氫綅
+ /// </summary>
+ [Display(Name = "瀹氫綅")]
+ 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