From ce9752fd657c6689ea64929eb962146e2730624e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 28 三月 2025 14:07:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs b/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs
index f5d97d7..6c38937 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs
@@ -14,6 +14,7 @@
this.PageTitle.SvgImageSize = new Size(24, 24);
// this.xhsProjectHomeTitleCtrl1.JumpEvent += XhsProjectHomeTitleCtrl1_JumpEvent;
this.mapViewProjectListContainer2.LoadCompletedEvent += MapViewProjectListContainer1_LoadCompletedEvent;
+ this.homePbsProjectTreeListCtrl1.SelectProjectEvent += homeXhsProjectTreeListCtrl1_SelectProjectEvent;
}
private List<FacilityVmo> _allProjectList = null;//鎵�鏈夐」鐩垪琛�
@@ -44,17 +45,21 @@
//鍦板浘鍔犺浇瀹屾垚
private async void MapViewProjectListContainer1_LoadCompletedEvent()
{
- await this.mapViewProjectListContainer2.SetProjectList(_allProjectList);
+ await this.mapViewProjectListContainer2.SetProjectList(_allProjectList);
// this.homeXhsProjectTreeListCtrl1.SetBindingData(_allProjectList);
}
- /* //閫夋嫨椤圭洰浜嬩欢
- private async void homeXhsProjectTreeListCtrl1_SelectProjectEvent(XhsProjectVmo obj)
- {
- await this.mapViewProjectListContainer1.SelectProject(obj.ID);
- var vm = new HomeXhsProjectPropertyViewModel(obj);
- this.homeXhsProjectPropertyCtrl1.SelectedObject = vm;
- }*/
+ //閫夋嫨椤圭洰浜嬩欢
+ private async void homeXhsProjectTreeListCtrl1_SelectProjectEvent(FacilityVmo obj)
+ {
+ await this.mapViewProjectListContainer2.SelectProject(obj.ID);
+ var vm = new HomePbsProjectPropertyViewModel(obj);
+ this.homeXhsProjectPropertyCtrl2.SelectedObject = vm;
+
+ /* await this.mapViewProjectListContainer1.SelectProject(obj.ID);
+ var vm = new HomeXhsProjectPropertyViewModel(obj);
+ this.homeXhsProjectPropertyCtrl1.SelectedObject = vm;*/
+ }
/* //瀵煎叆瀹屾垚浜嬩欢
private void homeXhsProjectTreeListCtrl1_ImportProjectCompletedEvent(ImportXhsProjectViewModel obj)
--
Gitblit v1.9.3