From d2ccacb3317aa6310f1b1bb5eb19fbdecba39ff9 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 27 三月 2025 11:50:43 +0800
Subject: [PATCH] 增加设施最高楼层标高字段
---
WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs b/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs
index a88add3..e902514 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs
@@ -91,38 +91,41 @@
this.HandingErrorEvent?.Invoke(obj);
}
- /* /// <summary>
- /// 璁剧疆椤圭洰鍒楄〃
- /// </summary>
- 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.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)
- {
- foreach (var mapInfo in allMapInfoList)
- {
- var project = allProjectList.Find(x => x.ID == mapInfo.ObjectID);
- var vm = new MapProjectViewModel(project, mapInfo);
- vmList.Add(vm);
- }
- }
+ /// <summary>
+ /// 璁剧疆椤圭洰鍒楄〃
+ /// </summary>
+ public async Task<bool> SetProjectList(List<PBS.Vmo.FacilityVmo> allProjectList)
+ {
+ if (!_isInitialized)
+ {
+ return false;
+ }
+ var allProjectIds = allProjectList?.Select(x => x.PlaceID).Distinct().ToList();
+ var allMapInfoList = await new Yw.BLL.MapInfo().GetByObjectTypeAndObjectIdsOfKindPurpose
+ (PBS.DataType.PBSPlace, allProjectIds, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
+ var vmList = new List<MapProjectViewModel>();
+ if (allMapInfoList != null && allMapInfoList.Count > 0)
+ {
+ foreach (var mapInfo in allMapInfoList)
+ {
+ var project = allProjectList.Find(x => x.PlaceID == mapInfo.ObjectID);
+ if (project != null)
+ {
+ var vm = new MapProjectViewModel(project, mapInfo);
+ vmList.Add(vm);
+ }
+ }
+ }
- return await this.webViewControl1.EvaluateScriptAsync<bool>("setProjectList", vmList);
- }*/
+ return await this.webViewControl2.EvaluateScriptAsync<bool>("setProjectList", vmList);
+ }
/// <summary>
/// 閫夋嫨椤圭洰
/// </summary>
public async Task<bool> SelectProject(long projectId)
{
- return await this.webViewControl1.EvaluateScriptAsync<bool>("selectProject", projectId.ToString());
+ return await this.webViewControl2.EvaluateScriptAsync<bool>("selectProject", projectId.ToString());
}
/// <summary>
@@ -130,7 +133,7 @@
/// </summary>
public async Task<bool> CancelSelectProject()
{
- return await this.webViewControl1.EvaluateScriptAsync<bool>("cancelSelectProject()");
+ return await this.webViewControl2.EvaluateScriptAsync<bool>("cancelSelectProject()");
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3