From ff457d72c09f3f0d49e6b79d9461bf596e8945bf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 10 十二月 2024 17:34:31 +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/08-working/XhsProjectSimulationWorkingPage.cs | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
index 13239e2..50c8947 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
@@ -386,21 +386,33 @@
return _visualListHelper;
}
- //鑾峰彇鍙鏋勪欢
- private Yw.Model.HydroVisualInfo GetVisual(string code)
+ //閲嶇疆鍙鍒楄〃
+ private void ResetVisualList()
{
- if (string.IsNullOrEmpty(code))
- {
- return default;
- }
- var visualListHelper = GetVisualListHelper();
- return visualListHelper.GetVisual(code);
+ var helper = GetVisualListHelper();
+ helper.InitialData(_hydroInfo);
}
//鑾峰彇鍙鏋勪欢
- private Yw.Model.HydroVisualInfo GetVisual(HydroVisualViewModel visualViewModel)
+ private Yw.Model.HydroVisualInfo GetVisual(string code)
{
- return GetVisual(visualViewModel?.Code);
+ var helper = GetVisualListHelper();
+ var visual = helper.GetVisual(code);
+ return visual;
+ }
+
+ //鑾峰彇鍙鍒楄〃
+ private List<Yw.Model.HydroVisualInfo> GetVisualList()
+ {
+ var helper = GetVisualListHelper();
+ return helper.GetVisualList();
+ }
+
+ //鑾峰彇姘存簮鍒楄〃
+ private List<Yw.Model.HydroSourceInfo> GetSourceList()
+ {
+ var helper = GetVisualListHelper();
+ return helper.GetSourceList();
}
#endregion
@@ -1512,6 +1524,27 @@
#region 宸ュ喌鍒嗘瀽
+ //閫夋嫨杩涘彛姘存簮
+ private void SelectInputSource()
+ {
+ var sources = GetSourceList();
+ if (sources != null)
+ {
+ if (sources.Count == 1)
+ {
+ SelectVisual(sources[0], eVisualSource.None);
+ }
+ else
+ {
+ var source = sources.FirstOrDefault(x => x.Flags.Contains(HStation.Xhs.Flags.杩涘彛));
+ if (source != null)
+ {
+ SelectVisual(source, eVisualSource.None);
+ }
+ }
+ }
+ }
+
//绮惧害璇勪及
private async void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -1630,22 +1663,27 @@
return;
}
var dlg = new SimulationSingleWorkingEnergyDlg();
- dlg.SetBindingData(workingHelper.Working, workingHelper.HydroInfo, workingHelper.CalcuResult);
+ //dlg.SetBindingData(workingHelper.Working, workingHelper.HydroInfo, workingHelper.CalcuResult);
dlg.ShowDialog();
}
//鎹熷け鏇茬嚎
private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
+ if (_visual == null)
+ {
+ SelectInputSource();
+ if (_visual == null)
+ {
+ TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+ return;
+ }
+ }
+
var workingHelper = GetWorkingHelper();
if (!workingHelper.Initialized)
{
TipFormHelper.ShowError("宸ュ喌璁＄畻澶辫触锛�");
- return;
- }
- if (_visual == null)
- {
- TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢锛�");
return;
}
HydroVisualInfo visual = _visual;
--
Gitblit v1.9.3