From d2ccacb3317aa6310f1b1bb5eb19fbdecba39ff9 Mon Sep 17 00:00:00 2001 From: duheng <2286773002@qq.com> Date: 星期四, 27 三月 2025 11:50:43 +0800 Subject: [PATCH] 增加设施最高楼层标高字段 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/02-map/MapViewProjectListContainer.cs | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/02-map/MapViewProjectListContainer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/02-map/MapViewProjectListContainer.cs index 58cf232..b347ada 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/02-map/MapViewProjectListContainer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/02-map/MapViewProjectListContainer.cs @@ -1,4 +1,6 @@ -锘縩amespace HStation.WinFrmUI +锘縰sing DevExpress.Mvvm.Native; + +namespace HStation.WinFrmUI { public partial class MapViewProjectListContainer : UserControl, IMapViewProjectListContainer { @@ -8,8 +10,14 @@ } public event Action LoadCompletedEvent; + public event Action LoadFailedEvent; + public event Action<HandingError> HandingErrorEvent; + + public event Action<string> JumpSimulationEvent; + + public event Action<long> JumpDirectEvent; /// <summary> /// 浜や簰瀵硅薄 @@ -25,6 +33,7 @@ return _callBackObj; } } + private MapViewProjectListCallBackObj _callBackObj; /// <summary> @@ -37,13 +46,8 @@ return _isInitialized; } } - private bool _isInitialized; - /// <summary> - /// 鏄剧ず杈规 - /// </summary> - [Browsable(true)] - public bool ShowBoder { get; set; } + private bool _isInitialized; /// <summary> /// 鍒濆璇濆鍣� @@ -54,7 +58,17 @@ callBackObj.LoadCompletedEvent += CallBackObj_LoadCompletedEvent; callBackObj.LoadFailedEvent += CallBackObj_LoadFailedEvent; callBackObj.HandingErrorEvent += CallBackObj_HandingErrorEvent; + callBackObj.JumpSimulationEvent += CallBackObj_JumpSimulationEvent; await this.webViewControl1.InitialWebBrower(MapViewProjectListUrlHelper.GetUrl(), callBackObj, true); + } + + //璺宠浆鏂规 + private void CallBackObj_JumpSimulationEvent(string obj) + { + if (long.TryParse(obj, out long PrjID)) + { + JumpDirectEvent.Invoke(PrjID); + } } //鍔犺浇瀹屾垚 @@ -79,14 +93,14 @@ /// <summary> /// 璁剧疆椤圭洰鍒楄〃 /// </summary> - public async Task<bool> SetProjectList(List<XhsProjectStdDto> allProjectList) + public async Task<bool> SetProjectList(List<XhsProjectVmo> allProjectList) { if (!_isInitialized) { return false; } var allProjectIds = allProjectList?.Select(x => x.ID).Distinct().ToList(); - var allMapInfoList = await new Yw.BLL.MapInfoStd().GetByObjectTypeAndObjectIdsOfKindPurpose + var allMapInfoList = await new Yw.BLL.MapInfo().GetByObjectTypeAndObjectIdsOfKindPurpose (HStation.Xhs.DataType.XhsProject, allProjectIds, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location); var vmList = new List<MapProjectViewModel>(); if (allMapInfoList != null && allMapInfoList.Count > 0) @@ -117,15 +131,5 @@ { return await this.webViewControl1.EvaluateScriptAsync<bool>("cancelSelectProject()"); } - - //缁樺埗杈规 - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); - if (this.ShowBoder) - { - this.DrawBorder(e, Color.LightGray); - } - } } -} +} \ No newline at end of file -- Gitblit v1.9.3