From bcc7f0563d92efd7013ec36e1d9ad7871b631454 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 08 十一月 2024 14:52:00 +0800
Subject: [PATCH] 优化水力特性
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 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..4379a1a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
@@ -14,17 +14,26 @@
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;
this.xhsProjectSimulationFunctionMgrCtrl1.CompareXhsProjectSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CompareXhsProjectSchemeEvent;
+ PumpFullInfoViewDlg.JumpPumpFullInfoCtrl += ShowPumpInfo;
}
private long _projectId;//椤圭洰id
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 +55,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 +70,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();
}
}
@@ -86,7 +89,6 @@
await page.SetBindingData(_project, _projectSite, _hydroInfo);
CreatePage(page, guid);
}
-
}
//鏄剧ず姘村姏妯℃嫙浜嬩欢
@@ -113,20 +115,26 @@
{
return;
}
- var dlg = new AddXhsProjectSimulationSchemeDlg();
- await dlg.SetBindingData(_projectSite.ID);
- dlg.ReloadDataEvent += (scheme) =>
- {
- this.xhsProjectSimulationSchemeMgrCtrl1.AppendScheme(scheme);
- };
+ //var dlg = new AddXhsProjectSimulationSchemeDlg();
+ //await dlg.SetBindingData(_projectSite.ID);
+ //dlg.ReloadDataEvent += (scheme) =>
+ //{
+ // this.xhsProjectSimulationFunctionMgrCtrl1.AppendScheme(scheme);
+ //};
+ //dlg.ShowDialog();
+
+ var dlg = new AddXhsSchemeDlg();
+ await dlg.SetBindingData(_project, _projectSite, _hydroInfo);
dlg.ShowDialog();
}
//姣旇緝椤圭洰鏂规浜嬩欢
private void XhsProjectSimulationFunctionMgrCtrl1_CompareXhsProjectSchemeEvent(DevExpress.Utils.Svg.SvgImage obj)
{
-
+ TipFormHelper.ShowWarn("姝ｅ湪寮�鍙戜腑锛屾暚璇锋湡寰�...");
}
+
+ #endregion 鍔熻兘闈㈡澘
#region TabbedView 鐩稿叧浜嬩欢澶勭悊绋嬪簭
@@ -408,5 +416,19 @@
}
#endregion Page
+
+ private void ShowPumpInfo(PumpFullInfoCtrl pumpFullInfoCtrl)
+ {
+ var guid = new PageGuid()
+ {
+ Modular = this.PageGuid.Modular,
+ MoudingType = eMoudingType.Tab,
+ Function = "xhs-project-pump-info",
+ };
+ if (!IsExistPage(guid, true))
+ {
+ CreatePage(pumpFullInfoCtrl, guid);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3