From 13764e3f5e8eb400b84c2c7b238d09f6089612f8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 14 十月 2024 11:20:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
index e0a03d2..247e86d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
@@ -14,7 +14,7 @@
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
this.PageTitle.SvgImageSize = new Size(24, 24);
- this.xhsProjectSimulationSchemeMgrCtrl1.ProjectSiteSelectedChangedEvent += XhsProjectSimulationSchemeMgrCtrl1_ProjectSiteSelectedChangedEvent;
+ this.xhsProjectSimulationFunctionMgrCtrl1.ProjectSiteSelectedChangedEvent += xhsProjectSimulationFunctionMgrCtrl1_ProjectSiteSelectedChangedEvent;
this.xhsProjectSimulationFunctionMgrCtrl1.ShowXhsProjectInfoEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowXhsProjectInfoEvent;
this.xhsProjectSimulationFunctionMgrCtrl1.ShowXhsProjectSimulationEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowXhsProjectSimulationEvent;
this.xhsProjectSimulationFunctionMgrCtrl1.CreateXhsProjectSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CreateXhsProjectSchemeEvent;
@@ -25,6 +25,14 @@
private XhsProjectVmo _project = null;//椤圭洰
private XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
+
+ /// <summary>
+ /// 鍒濆鍖栨暟鎹簮
+ /// </summary>
+ public override void InitialDataSource()
+ {
+ base.InitialDataSource();
+ }
/// <summary>
/// 缁戝畾鏁版嵁
@@ -46,20 +54,14 @@
}
_project = project;
_projectId = project.ID;
- this.PageTitle.Caption = $"{_project.Name}\r\n姘村姏妯℃嫙";
- await this.xhsProjectSimulationSchemeMgrCtrl1.SetBindingData(_project);
+ this.PageTitle.Caption = $"{_project.Name}\r\n椤圭洰妯℃嫙";
+ await this.xhsProjectSimulationFunctionMgrCtrl1.SetBindingData(_project);
}
- /// <summary>
- /// 鍒濆鍖栨暟鎹簮
- /// </summary>
- public override void InitialDataSource()
- {
- base.InitialDataSource();
- }
+ #region 鍔熻兘闈㈡澘
//椤圭洰绔欓�夋嫨鏀瑰彉浜嬩欢
- private async void XhsProjectSimulationSchemeMgrCtrl1_ProjectSiteSelectedChangedEvent(XhsProjectSiteVmo obj)
+ private async void xhsProjectSimulationFunctionMgrCtrl1_ProjectSiteSelectedChangedEvent(XhsProjectSiteVmo obj)
{
_projectSite = obj;
if (_projectSite != null)
@@ -67,7 +69,7 @@
var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
.GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
_hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
- this.xhsProjectSimulationFunctionMgrCtrl1.SetBindingData();
+ this.xhsProjectSimulationFunctionMgrCtrl1.ResetBindingData();
}
}
@@ -117,7 +119,7 @@
await dlg.SetBindingData(_projectSite.ID);
dlg.ReloadDataEvent += (scheme) =>
{
- this.xhsProjectSimulationSchemeMgrCtrl1.AppendScheme(scheme);
+ this.xhsProjectSimulationFunctionMgrCtrl1.AppendScheme(scheme);
};
dlg.ShowDialog();
}
@@ -125,9 +127,11 @@
//姣旇緝椤圭洰鏂规浜嬩欢
private void XhsProjectSimulationFunctionMgrCtrl1_CompareXhsProjectSchemeEvent(DevExpress.Utils.Svg.SvgImage obj)
{
-
+ TipFormHelper.ShowWarn("姝ｅ湪寮�鍙戜腑锛屾暚璇锋湡寰�...");
}
+ #endregion
+
#region TabbedView 鐩稿叧浜嬩欢澶勭悊绋嬪簭
//閫変腑
--
Gitblit v1.9.3