From be3e4f6d2dd0529b87204169bce6df55c37a4199 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:47 +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/05-function/SimulationFunctionCtrl.cs | 72 +++++-------------------------------
1 files changed, 10 insertions(+), 62 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
index 7c3dc8a..4ac3b54 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
@@ -1,10 +1,5 @@
-锘縰sing DevExpress.CodeParser;
-using DevExpress.DataAccess.Native;
-using DevExpress.Utils.Extensions;
-using DevExpress.Utils.Svg;
-using DevExpress.XtraCharts;
+锘縰sing DevExpress.Utils.Svg;
using System.Collections.Concurrent;
-using Yw.DAL.Basic;
using Yw.Vmo;
namespace HStation.WinFrmUI
@@ -26,10 +21,6 @@
/// </summary>
public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, Dictionary<HydroWorkingVmo, bool>, SvgImage> ShowProjectSiteSimulationEvent;
/// <summary>
- /// 鏄剧ず椤圭洰绔欏伐鍐典簨浠�
- /// </summary>
- public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo, SvgImage> ShowProjectSiteWorkingEvent;
- /// <summary>
/// 椤圭洰绔欏伐鍐甸�夋嫨鏀瑰彉浜嬩欢
/// </summary>
public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, HydroWorkingVmo, bool> ProjectSiteWorkingCheckedEvent;
@@ -48,7 +39,7 @@
/// <summary>
/// 鍒涘缓椤圭洰绔欐柟妗堜簨浠�
/// </summary>
- public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, SvgImage> CreateProjectSiteSchemeEvent;
+ public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, List<XhsSchemeVmo>, SvgImage> CreateProjectSiteSchemeEvent;
/// <summary>
/// 椤圭洰绔欐柟妗堝鍔犱簨浠�
/// </summary>
@@ -110,6 +101,7 @@
});
await ShowInfo();
overlay.Close();
+ this.accordionControl1.ExpandAll();
}
//椤圭洰绔欐鍐�
@@ -158,7 +150,8 @@
{
return;
}
- this.CreateProjectSiteSchemeEvent?.Invoke(_project, _projectSite, hydroInfo, this.svgImg32[3]);
+ var allSchemeList = _allSchemeHydroInfoDict?.Keys.ToList();
+ this.CreateProjectSiteSchemeEvent?.Invoke(_project, _projectSite, hydroInfo, allSchemeList, this.svgImg32[3]);
}
//鍙抽敭寮瑰嚭
@@ -301,8 +294,7 @@
{
return default;
}
- //var hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(relation.ModelID);
- var hydroInfo = await HStation.BLL.XhsHydroInfo.GetByID(relation.ModelID);
+ var hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(relation.ModelID);
_gettingHydroInfoDict[key] = false;
//overlay.Close();
WaitFormHelper.HideWaitForm();
@@ -525,14 +517,9 @@
elementWorking.Text = working.Name;
elementWorking.Hint = working.Description;
elementWorking.Tag = working;
- elementWorking.Click += async (sender, e) =>
+ elementWorking.Click += (sender, e) =>
{
- var hydroInfo = await GetHydroInfo(null, true);
- if (hydroInfo == null)
- {
- return;
- }
- this.ShowProjectSiteWorkingEvent?.Invoke(_project, _projectSite, null, hydroInfo, working, this.svgImg32[4]);
+
};
this.elementProjectSiteSimulation.Elements.Add(elementWorking);
this.elementProjectSiteSimulation.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
@@ -579,14 +566,9 @@
elementWorking.Text = working.Name;
elementWorking.Hint = working.Description;
elementWorking.Tag = working;
- elementWorking.Click += async (sender, e) =>
+ elementWorking.Click += (sender, e) =>
{
- var hydroInfo = await GetHydroInfo(scheme, true);
- if (hydroInfo == null)
- {
- return;
- }
- this.ShowProjectSiteWorkingEvent?.Invoke(_project, _projectSite, scheme, hydroInfo, working, this.svgImg32[4]);
+
};
elementScheme.Elements.Add(elementWorking);
elementScheme.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
@@ -796,40 +778,6 @@
return;
}
this.ShowProjectSiteInfoEvent?.Invoke(_project, _projectSite, hydroInfo, this.svgImg32[0]);
- }
-
- /// <summary>
- /// 淇濆瓨
- /// </summary>
- public async Task<Yw.Model.HydroModelInfo> SaveModel(XhsSchemeVmo scheme, Yw.Model.HydroModelInfo hydroInfo)
- {
- if (hydroInfo == null)
- {
- return default;
- }
- //var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(hydroInfo);
- var id = await HStation.BLL.XhsHydroInfo.Save(hydroInfo);
- if (id < 1)
- {
- return default;
- }
- var db = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
- if (scheme == null)
- {
- _hydroInfo = db;
- return _hydroInfo;
- }
- if (_allSchemeHydroInfoDict == null || _allSchemeHydroInfoDict.Count < 1)
- {
- return default;
- }
- var schemeKey = _allSchemeHydroInfoDict.Keys.FirstOrDefault(x => x.ID == scheme.ID);
- if (schemeKey == null)
- {
- return default;
- }
- _allSchemeHydroInfoDict[schemeKey] = db;
- return db;
}
/// <summary>
--
Gitblit v1.9.3