From 1207fd998b9dbcf26ad3b93ee47a148156ac20d3 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 11:32:37 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs | 50 ++++++++++++++++----------------------------------
1 files changed, 16 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 8452d69..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,7 +1,4 @@
-锘縰sing DevExpress.Pdf.Native;
-using HStation.Service.Xhs;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
/// <summary>
///
@@ -11,8 +8,7 @@
/// <summary>
///
/// </summary>
- public XhsProjectMgrViewModel()
- { }
+ public XhsProjectMgrViewModel() { }
public enum eFileStatus
{
@@ -71,7 +67,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 +77,7 @@
{
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;
@@ -90,7 +87,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;
@@ -155,34 +152,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>
/// 妯″瀷鐘舵��
@@ -214,11 +193,14 @@
[Display(Name = "璇存槑")]
public string Description { get; set; }
- /* /// <summary>
- /// 瀹氫綅
- /// </summary>
- [Display(Name = "瀹氫綅")]
- public bool HasLocation { get; set; }*/
+ /// <summary>
+ /// 瀹氫綅
+ /// </summary>
+ [Display(Name = "瀹氫綅")]
+ public bool HasLocation { get; set; }
+
+
+ public bool HasModel { get; set; }
/// <summary>
/// 鏄惁瀛樺湪涓夌淮妯″瀷
--
Gitblit v1.9.3