From 5dac45fe6402027f1a19f331045c811c9e96b729 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 23 十月 2024 10:16:02 +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/03-mgr/XhsProjectMgrViewModel.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 926f04b..08a88e5 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,5 +1,6 @@
锘縰sing DevExpress.Pdf.Native;
using HStation.Service.Xhs;
+using HStation.Vmo;
namespace HStation.WinFrmUI
{
@@ -71,7 +72,7 @@
Noupload,
}
- public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool IsHaveBimface, int BimfaceState, Yw.Vmo.Map.MapInfo mapInfo)
+ public XhsProjectMgrViewModel(XhsProjectExtensionsVmo project, bool IsHaveBimface, int BimfaceState, Yw.Vmo.MapInfoVmo mapInfo)
{
this.ID = project.ID;
this.ParentID = project.ParentID;
@@ -81,6 +82,8 @@
{
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;
@@ -90,7 +93,7 @@
this.ModelState = (eFileStatus)BimfaceState;
}
- public void Reset(Vmo.Xhs.XhsProjectExtensions project)
+ public void Reset(XhsProjectExtensionsVmo project)
{
this.ID = project.ID;
this.ParentID = project.ParentID;
@@ -104,10 +107,25 @@
this.Description = project.Description;
}
+ public void Reset(XhsProjectMgrViewModel project, int BimfaceState)
+ {
+ 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.CreateTime = project.NO.Substring(4, 10);
this.Name = project.Name;
this.Address = project.Address;
this.Customer = project.Customer;
@@ -165,6 +183,12 @@
public string Address { get; set; }
/// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [Display(Name = "鍒涘缓鏃堕棿")]
+ public string CreateTime { get; set; }
+
+ /// <summary>
/// 瀹㈡埛
/// </summary>
[Display(Name = "瀹㈡埛鍚嶇О")]
--
Gitblit v1.9.3