From 2b31b7e3926134da96d384ab3bdac345691a179c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 10 一月 2025 10:48:45 +0800
Subject: [PATCH] 优化权限
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 362 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 240 insertions(+), 122 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 8173b76..c4beacc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1,18 +1,10 @@
-锘縰sing Castle.Core.Logging;
-using DevExpress.Diagram.Core.Native;
+锘縰sing DevExpress.Diagram.Core.Native;
using DevExpress.Mvvm.Native;
-using DevExpress.Utils.MVVM;
-using DevExpress.XtraMap;
-using HStation.WinFrmUI.PhartRelation;
using Mapster;
-using NPOI.OpenXmlFormats.Dml;
-using NPOI.SS.Formula.Functions;
-using System.Diagnostics;
using Yw.EPAnet;
using Yw.Hydro;
using Yw.Model;
using Yw.Vmo;
-using Yw.WinFrmUI.Q3d;
namespace HStation.WinFrmUI
{
@@ -31,11 +23,6 @@
/// 鏂板宸ュ喌浜嬩欢
/// </summary>
public event Action<HydroWorkingVmo> AppendWorkingEvent;
-
- /// <summary>
- /// 淇濆瓨妯″瀷浜嬩欢
- /// </summary>
- public event Func<Yw.Model.HydroModelInfo, Task<Yw.Model.HydroModelInfo>> SaveModelEvent;
/// <summary>
/// 鍒锋柊妯″瀷浜嬩欢
@@ -222,6 +209,80 @@
this.barBtnSetCompressorList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
}
+ #region 灞炴�х姸鎬�
+
+ //灞炴�х姸鎬佽緟鍔╃被
+ private HydroPropStatusHelper _propStatusHelper = null;
+
+ //鑾峰彇灞炴�х姸鎬佽緟鍔╃被
+ private async Task<HydroPropStatusHelper> GetPropStatusHelper()
+ {
+ if (_propStatusHelper == null)
+ {
+ var allPropStatusList = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.GetByModelID(_hydroInfo.ID);
+ _propStatusHelper = new HydroPropStatusHelper(_hydroInfo, allPropStatusList);
+ }
+ return _propStatusHelper;
+ }
+
+ //鑾峰彇灞炴�х姸鎬丏b鍒楄〃
+ private async Task<List<HydroParterPropStatusInfo>> GetPropStatusDbList()
+ {
+ var helper = await GetPropStatusHelper();
+ return helper.GetPropStatusDbList();
+ }
+
+ #endregion
+
+ #region 鏇存敼鐘舵��
+
+ //鏀瑰彉杈呭姪绫�
+ private HydroChangeHelper _changeHelper = null;
+
+ //鑾峰彇鏀瑰彉杈呭姪绫�
+ private HydroChangeHelper GetChangeHelper()
+ {
+ if (_hydroInfo == null)
+ {
+ return default;
+ }
+ if (_changeHelper == null)
+ {
+ _changeHelper = new HydroChangeHelper(_hydroInfo);
+ }
+ return _changeHelper;
+ }
+
+ //闄勫姞鏀瑰彉鏋勪欢
+ private void AppendChangeParter(HydroParterInfo parter, eChangeType changeType)
+ {
+ var helper = GetChangeHelper();
+ helper.Append(parter, changeType);
+ }
+
+ //鑾峰彇澧炲姞鏋勪欢鍒楄〃
+ private List<HydroParterInfo> GetAddParterList()
+ {
+ var helper = GetChangeHelper();
+ return helper.GetAddParterList();
+ }
+
+ //鑾峰彇鏇存柊鏋勪欢鍒楄〃
+ private List<HydroParterInfo> GetUpdateParterList()
+ {
+ var helper = GetChangeHelper();
+ return helper.GetUpdateParterList();
+ }
+
+ //鑾峰彇绉婚櫎鏋勪欢鍒楄〃
+ private List<string> GetRemoveParters()
+ {
+ var helper = GetChangeHelper();
+ return helper.GetRemoveParters();
+ }
+
+ #endregion
+
#region BIM鎺т欢
//bimface鎺т欢
@@ -236,13 +297,13 @@
}
if (_bimfaceCtrl == null)
{
- var overlay = this.ShowOverlay();
_bimfaceCtrl = new SimulationBimfaceCtrl();
_bimfaceCtrl.Dock = DockStyle.Fill;
+ WaitFormHelper.ShowWaitForm(this.FindForm(), "姝ｅ湪鍔犺浇妯″瀷锛岃绋嶅悗...");
await _bimfaceCtrl.InitialData(_project, _projectSite);
_bimfaceCtrl.LoadCompletedEvent += () =>
{//view鍔犺浇瀹屾垚浜嬩欢
- overlay.Close();
+ WaitFormHelper.HideWaitForm();
this.barCkDecorator.Checked = false;
this.barCkGrading.Checked = true;
};
@@ -264,7 +325,7 @@
this.tabPageBimface.Controls.Add(bimfaceCtrl);
}
- #endregion BIM鎺т欢
+ #endregion
#region Q3d鎺т欢
@@ -301,7 +362,7 @@
this.tabPageQ3d.Controls.Add(q3dCtrl);
}
- #endregion Q3d鎺т欢
+ #endregion
#region 灞炴�ф帶浠�
@@ -309,7 +370,7 @@
private SimulationPropertyCtrl _propertyCtrl = null;
//鑾峰彇灞炴�ф帶浠�
- private SimulationPropertyCtrl GetPropertyCtrl()
+ private async Task<SimulationPropertyCtrl> GetPropertyCtrl()
{
if (_hydroInfo == null)
{
@@ -317,9 +378,13 @@
}
if (_propertyCtrl == null)
{
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
_propertyCtrl = new SimulationPropertyCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
_propertyCtrl.AllowEdit = true;
+ _propertyCtrl.InitialData(changeHelper, propStatusHelper);
+ _propertyCtrl.CalcuResult = () => GetCalcuResult();
_propertyCtrl.HydroViewEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Property);
@@ -385,13 +450,6 @@
var gradingHelper = await GetGradingHelper();
gradingHelper.Set(visual);
};
- _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
- {
- //娴佸悜灞炴�у彂鐢熸敼鍙�
- //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
- var flowEffectHelper = await GetFlowEffectHelper();
- flowEffectHelper.Set(visual);
- };
}
return _propertyCtrl;
}
@@ -416,13 +474,13 @@
}
//鏄剧ず灞炴�ф帶浠�
- private void ShowPropertyCtrl()
+ private async void ShowPropertyCtrl()
{
if (IsPropertyCtrlVisible)
{
return;
}
- var propertyCtrl = GetPropertyCtrl();
+ var propertyCtrl = await GetPropertyCtrl();
this.controlContainerRight.Controls.Clear();
this.controlContainerRight.Controls.Add(propertyCtrl);
this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -446,7 +504,7 @@
_propertyCtrl?.UpdateRows();
}
- #endregion 灞炴�ф帶浠�
+ #endregion
#region 閫夋嫨鏋勪欢
@@ -699,7 +757,7 @@
}
//鏄剧ず鏋勪欢鏄庣粏鎺т欢
- private void ShowVisualListCtrl()
+ private async void ShowVisualListCtrl()
{
if (_hydroInfo == null)
{
@@ -715,8 +773,10 @@
this.docPnlBottom.Height = 350;
}
var visualVmListHelper = GetVisualVmListHelper();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var allVisualVmList = visualVmListHelper.GetVisualList();
- visualListCtrl.SetBindingData(allVisualVmList);
+ visualListCtrl.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
var calcuResult = GetCalcuResult();
if (calcuResult != null && calcuResult.Succeed)
{
@@ -753,7 +813,7 @@
ShowVisualListCtrl();
}
- #endregion 鏄庣粏鎺т欢
+ #endregion
#region 鏋勪欢鏄剧ず
@@ -804,7 +864,7 @@
#endregion 鏋勪欢鏄剧ず
- #endregion 鏋勪欢鏄庣粏
+ #endregion
#region 涓�閿樉闅�
@@ -852,6 +912,10 @@
#region 淇濆瓨淇℃伅
+ //淇濆瓨閿佸畾瀵硅薄
+ private object _locker_save = new();
+ private bool _isSaving = false;//姝ｅ湪淇濆瓨
+
//淇濆瓨
private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -859,19 +923,68 @@
{
return;
}
- if (this.SaveModelEvent == null)
- {
- return;
- }
- var hydroInfo = await this.SaveModelEvent.Invoke(_hydroInfo);
- if (hydroInfo == null)
- {
- TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
- return;
- }
- _hydroInfo = hydroInfo;
+ lock (_locker_save)
+ {
+ if (_isSaving)
+ {
+ this.FindForm().ShowAlertInfo("淇濆瓨", "姝ｅ湪淇濆瓨锛岃绋嶅悗閲嶈瘯锛�");
+ return;
+ }
+ }
+
+ _isSaving = true;
+
+ var changeHelper = GetChangeHelper();
+
+ var addParterList = changeHelper.GetAddParterList();
+ var updateParterList = changeHelper.GetUpdateParterList();
+ var removeParters = changeHelper.GetRemoveParters();
+
+ if (addParterList == null || addParterList.Count < 1)
+ {
+ if (updateParterList == null || updateParterList.Count < 1)
+ {
+ if (removeParters == null || removeParters.Count < 1)
+ {
+ TipFormHelper.ShowWarn("鏈娴嬪埌淇敼锛屾棤闇�淇濆瓨锛�");
+ _isSaving = false;
+ return;
+ }
+ }
+ }
+
+ WaitFormHelper.ShowWaitForm("姝ｅ湪淇濆瓨锛岃绋嶅悗...");
+
+ var bol = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance
+ .Update(_hydroInfo, addParterList, updateParterList, removeParters);
+ if (!bol)
+ {
+ WaitFormHelper.HideWaitForm();
+ TipFormHelper.ShowError("姘村姏淇℃伅鏇存柊澶辫触锛�");
+ _isSaving = false;
+ return;
+ }
+ changeHelper.Reset();
+
+ var propStatusHelper = await GetPropStatusHelper();
+ var updatePropStatusList = propStatusHelper.GetUpdatePropStatusDbList();
+ if (updatePropStatusList != null && updatePropStatusList.Count > 0)
+ {
+ bol = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.Update(_hydroInfo.ID, updatePropStatusList);
+ if (!bol)
+ {
+ WaitFormHelper.HideWaitForm();
+ TipFormHelper.ShowWarn("灞炴�х姸鎬佹洿鏂板け璐ワ紒");
+ _isSaving = false;
+ return;
+ }
+ }
+ propStatusHelper.Reset();
+
+ WaitFormHelper.HideWaitForm();
TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
+ _isSaving = false;
//Stopwatch sw = new Stopwatch();
//sw.Start();
@@ -889,11 +1002,13 @@
private void RegistBulkSetEvents()
{
//姘村簱
- this.barBtnSetReservoirList.ItemClick += delegate
+ this.barBtnSetReservoirList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroReservoirListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -906,11 +1021,13 @@
dlg.ShowDialog();
};
//姘存睜
- this.barBtnSetTankList.ItemClick += delegate
+ this.barBtnSetTankList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroTankListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -923,11 +1040,13 @@
dlg.ShowDialog();
};
//姘寸
- this.barBtnSetWaterboxList.ItemClick += delegate
+ this.barBtnSetWaterboxList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroWaterboxListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -940,11 +1059,13 @@
dlg.ShowDialog();
};
//杩炴帴鑺傜偣
- this.barBtnSetJunctionList.ItemClick += delegate
+ this.barBtnSetJunctionList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroJunctionListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -957,11 +1078,13 @@
dlg.ShowDialog();
};
//闂峰ご
- this.barBtnSetBluntheadList.ItemClick += delegate
+ this.barBtnSetBluntheadList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroBluntheadListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -974,11 +1097,13 @@
dlg.ShowDialog();
};
//寮ご
- this.barBtnSetElbowsList.ItemClick += delegate
+ this.barBtnSetElbowsList.ItemClick += async delegate
{
var allVisualVmList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroElbowListDlg();
- dlg.SetBindingData(allVisualVmList);
+ dlg.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -991,11 +1116,13 @@
dlg.ShowDialog();
};
//涓夐��
- this.barBtnSetThreelinkList.ItemClick += delegate
+ this.barBtnSetThreelinkList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroThreelinkListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1008,11 +1135,13 @@
dlg.ShowDialog();
};
//鍥涢��
- this.barBtnSetFourlinkList.ItemClick += delegate
+ this.barBtnSetFourlinkList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroFourlinkListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1025,11 +1154,13 @@
dlg.ShowDialog();
};
//姘磋〃
- this.barBtnSetMeterList.ItemClick += delegate
+ this.barBtnSetMeterList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroMeterListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1042,11 +1173,13 @@
dlg.ShowDialog();
};
//娴侀噺璁�
- this.barBtnSetFlowmeterList.ItemClick += delegate
+ this.barBtnSetFlowmeterList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroFlowmeterListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1059,11 +1192,13 @@
dlg.ShowDialog();
};
//鍘嬪姏琛�
- this.barBtnSetPressmeterList.ItemClick += delegate
+ this.barBtnSetPressmeterList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroPressmeterListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1076,11 +1211,13 @@
dlg.ShowDialog();
};
//鍠峰槾
- this.barBtnSetNozzleList.ItemClick += delegate
+ this.barBtnSetNozzleList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroNozzleListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1093,11 +1230,13 @@
dlg.ShowDialog();
};
//鍐峰嵈濉�
- this.barBtnSetCoolingList.ItemClick += delegate
+ this.barBtnSetCoolingList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroCoolingListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1110,11 +1249,13 @@
dlg.ShowDialog();
};
//绠￠亾
- this.barBtnSetPipeList.ItemClick += delegate
+ this.barBtnSetPipeList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroPipeListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1127,11 +1268,13 @@
dlg.ShowDialog();
};
//杩囨浮浠�
- this.barBtnSetTranslationList.ItemClick += delegate
+ this.barBtnSetTranslationList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroTranslationListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1144,11 +1287,13 @@
dlg.ShowDialog();
};
//姘存车
- this.barBtnSetPumpList.ItemClick += delegate
+ this.barBtnSetPumpList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroPumpListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1161,11 +1306,13 @@
dlg.ShowDialog();
};
//闃�闂�
- this.barBtnSetValveList.ItemClick += delegate
+ this.barBtnSetValveList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroValveListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1178,11 +1325,13 @@
dlg.ShowDialog();
};
//鎹㈢儹鍣�
- this.barBtnSetExchangerList.ItemClick += delegate
+ this.barBtnSetExchangerList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroExchangerListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1195,11 +1344,13 @@
dlg.ShowDialog();
};
//鍘嬬缉鏈�
- this.barBtnSetCompressorList.ItemClick += delegate
+ this.barBtnSetCompressorList.ItemClick += async delegate
{
var allVisualViewModelList = GetVisualViewModelList();
+ var changeHelper = GetChangeHelper();
+ var propStatusHelper = await GetPropStatusHelper();
var dlg = new SetHydroCompressorListDlg();
- dlg.SetBindingData(allVisualViewModelList);
+ dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
dlg.HydroClickInfoEvent += (visual) =>
{
SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1428,7 +1579,7 @@
}
}
- #endregion 鎵归噺閰嶇疆
+ #endregion
#region 鏋勪欢鏌ヨ
@@ -1571,7 +1722,7 @@
markHelper.Set();
}
- #endregion 妯″瀷鏍囨敞
+ #endregion
#region 棰滆壊鍒嗙骇
@@ -1681,39 +1832,6 @@
}
#endregion 浜哄伐鍒锋柊
-
- #region 姘存祦鍔ㄧ敾
-
- //姘存祦鍔ㄧ敾杈呭姪绫�
- private SimulationFlowEffectHelper _flowEffectHelper = null;
-
- //鑾峰彇姘存祦鍔ㄧ敾杈呭姪绫�
- private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
- {
- if (_hydroInfo == null)
- {
- return default;
- }
- if (_flowEffectHelper == null)
- {
- var visualListHelper = GetVisualListHelper();
- var bimfaceCtrl = await GetBimfaceCtrl();
- _flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, bimfaceCtrl);
- var calcuResult = GetCalcuResult();
- _flowEffectHelper.InitialData(calcuResult);
- }
- return _flowEffectHelper;
- }
-
- //姘存祦鍔ㄧ敾鏄惁鍙
- private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- var flowEffectHelper = await GetFlowEffectHelper();
- flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
- flowEffectHelper.Set();
- }
-
- #endregion 姘存祦鍔ㄧ敾
#region 鐩戞祴鐐�
@@ -1929,7 +2047,7 @@
return;
}
var monitorHelper = GetMonitorHelper();
- var allMonitorList = await monitorHelper.GetAll();
+ var allMonitorList = await monitorHelper.GetAnalyseList();
var dlg = new SetHydroMonitorAnalyseListDlg();
dlg.ReloadDataEvent += async (list) =>
{
@@ -2569,7 +2687,7 @@
AddWorking();
}
- #endregion 褰撳墠宸ュ喌
+ #endregion
#region 閫夋嫨宸ュ喌
@@ -2691,7 +2809,7 @@
this.docPnlBottom.Text = "鐩戞祴鍒嗘瀽";
this.docPnlBottom.Height = 350;
}
- var allMontorList = await GetMonitorList();
+ var allMontorList = await GetMonitorAnalyseList();
if (allWorkingList == null || allWorkingList.Count < 1)
{
monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, GetCalcuResult());
@@ -2708,7 +2826,7 @@
ShowMonitorAnalyListCtrl();
}
- #endregion 鐩戞祴鍒嗘瀽
+ #endregion
#region 宸ュ喌鍒嗘瀽
@@ -3036,7 +3154,7 @@
TipFormHelper.ShowError("姘村姏妯℃嫙鏂规鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
return;
}
- if (!await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.DeleteAllByID(relation.ID))
+ if (!await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.DeleteByID(relation.ModelID))
{
TipFormHelper.ShowError("姘村姏妯℃嫙鏂规鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
return;
--
Gitblit v1.9.3