From 01a87d5aafc5cf63275d73f0c8cfd5e626d74261 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 九月 2024 23:40:24 +0800
Subject: [PATCH] 新增未匹配列表
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 187 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 158 insertions(+), 29 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 7b8c743..1b345ca 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1,7 +1,9 @@
锘縢lobal using Yw.EPAnet;
+using DevExpress.Xpo.Helpers;
using HStation.WinFrmUI.Xhs;
using HStation.WinFrmUI.Xhs.Core;
using NPOI.SS.Formula.Functions;
+using Yw.WinFrmUI.HydroL2d;
namespace HStation.WinFrmUI
{
@@ -14,6 +16,8 @@
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
}
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
@@ -52,7 +56,6 @@
.GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
_hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
}
- this.xhsProjectSimulationPropertyCtrl1.SetBindingData(_hydroInfo);
this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
}
@@ -70,7 +73,11 @@
await this.xhsProjectSimulationBimfaceCtrl1.SetBindingData(_project, _projectSite);
}
- #region 妯″瀷
+ //灞炴�ч潰鏉胯幏鍙栨按鍔涗俊鎭簨浠�
+ private Yw.Model.HydroModelInfo xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent()
+ {
+ return _hydroInfo;
+ }
//涓�閿樉闅�
private async void barBtnShowHide_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -95,10 +102,6 @@
}
}
- #endregion 妯″瀷
-
- #region 姘村姏
-
//姘村姏楠岃瘉
private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -106,8 +109,10 @@
{
return;
}
- this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
_checkResult = netWork.Check();
@@ -118,6 +123,7 @@
}
this.xhsProjectSimulationHydroCheckFailedCtrl1.SetBindingData(_checkResult.FailedList);
this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlHydroCheck.Height = 350;
}
//姘村姏璁＄畻
@@ -127,8 +133,10 @@
{
return;
}
- this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
_calcuResult = netWork.Calcu();
@@ -140,21 +148,24 @@
}
this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlHydroCalcu.Height = 350;
}
//姘村姏鏋勪欢鍒楄〃
private void barBtnHydroParterList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new HydroParterListDlg();
- dlg.TopMost = true;
- dlg.HydroClickEvent += async (parter) =>
+ if (_hydroInfo == null)
{
- _parter = parter;
- await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { parter.Code });
- ShowProperty();
- };
- dlg.SetBindingData(_hydroInfo);
- dlg.Show();
+ return;
+ }
+ this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+
+ this.hydroParterListCtrl1.SetBindingData(_hydroInfo);
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlHydroParterList.Height = 350;
}
//瀵煎嚭姘村姏INP鏂囦欢
@@ -173,6 +184,23 @@
var result = netWork.ToInpString();
File.WriteAllText(fileName, result);
TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
+ }
+
+ //鏈尮閰嶅垪琛�
+ private void barBtnUnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+
+ this.xhsProjectSimulationUnMatchingListCtrl1.SetBindingData(_hydroInfo);
+ this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlUnMatchingList.Height = 350;
}
//bimface 鏋勪欢鐐瑰嚮
@@ -237,10 +265,6 @@
}
}
- #endregion 姘村姏
-
- #region 鏇村
-
//淇濆瓨
private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -255,22 +279,99 @@
return;
}
_hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
- this.xhsProjectSimulationBimfaceCtrl1.
+ //this.xhsProjectSimulationPropertyCtrl1.SetMatching(_hydroInfo);
TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
}
-
- #endregion 鏇村
-
- #region 鑷姩鍖归厤
//鑷姩鍖归厤
private void barBtnAllAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new AssetsAutoMatchingMainDlg(new AssetsAutoMatchingInputViewModel());
+ if (_hydroInfo == null)
+ {
+ return;
+ }
+ var input = new AssetsAutoMatchingViewModel();
+ input.PumpMatchingModels = _hydroInfo.Pumps?.Select(x => new PumpMatchingViewModel()
+ {
+ ID = x.ID,
+ Code = x.Code,
+ Name = x.Name,
+ DbID = x.DbId,
+ DbLocked = x.DbLocked,
+ //ChartDbID=_hydroInfo.Curves?.Find(t=>t.Code==x.CurveQH)?.DbId,杩欓噷涓嶆槸long CurveDbId
+ ModelType = x.ModelType,
+ RatedP = x.RatedP,
+ RatedH = x.RatedH,
+ RatedN = x.RatedN,
+ RatedQ = x.RatedQ,
+ }).ToList();
+ input.ElbowsMatchingModels = _hydroInfo.Elbows?.Select(x => new ElbowsMatchingViewModel()
+ {
+ ID = x.ID,
+ Name = x.Name,
+ Code = x.Code,
+ // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbLocked = x.DbLocked,
+ ModelType = x.ModelType,
+ // Caliber = x.Caliber,
+ Material = x.Material
+ }).ToList();
+ input.ThreeLinkMatchingModels = _hydroInfo.Threelinks?.Select(x => new ThreeLinkMatchingViewModel()
+ {
+ ID = x.ID,
+ Name = x.Name,
+ Code = x.Code,
+ // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbLocked = x.DbLocked,
+ ModelType = x.ModelType,
+ // Caliber = x.Caliber,
+ Material = x.Material
+ }).ToList();
+ input.FourLinkMatchingModels = _hydroInfo.Fourlinks?.Select(x => new FourLinkMatchingViewModel()
+ {
+ ID = x.ID,
+ Name = x.Name,
+ Code = x.Code,
+ // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbLocked = x.DbLocked,
+ ModelType = x.ModelType,
+ // Caliber = x.Caliber,
+ Material = x.Material
+ }).ToList();
+ input.PipeLineMatchingModels = _hydroInfo.Pipes?.Select(x => new PipeLineMatchingViewModel()
+ {
+ ID = x.ID,
+ Name = x.Name,
+ Code = x.Code,
+ // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbLocked = x.DbLocked,
+ ModelType = x.ModelType,
+ //Caliber = x.Diameter,//杩欓噷鏄暟鍊�
+ Material = x.Material
+ }).ToList();
+
+ input.ValveMatchingModels = _hydroInfo.Pipes?.Select(x => new ValveMatchingViewModel()
+ {
+ ID = x.ID,
+ Name = x.Name,
+ Code = x.Code,
+ // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbLocked = x.DbLocked,
+ ModelType = x.ModelType,
+ Caliber = x.Diameter.ToString(),//杩欓噷鏄暟鍊�
+ Material = x.Material//鎬庝箞娌℃湁闃�闂ㄧ被鍨�
+ }).ToList();
+
+ //鏃㈢劧鍏ュ弬鍜屽嚭鍙傚凡缁忎繚鎸佷竴鑷翠簡锛屽氨涓嶈兘鍙仛InputViewModel浜嗭紝鏈夋涔�
+ //杩欓噷鍙互鍏堟槸绐椾綋锛岃皟璇曞ソ锛屽悗闈㈡敼鎴愭帶浠�
+ var dlg = new AssetsAutoMatchingMainDlg();
+ dlg.SetBindingData(input);
+ dlg.RelaodEvent += (rhs) =>
+ {
+ return false;
+ };
dlg.ShowDialog();
}
-
- #endregion 鑷姩鍖归厤
private void BtnPerformChart_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -291,5 +392,33 @@
ShowProperty();
}
+ //姘村姏鏋勪欢鏄庣粏闈㈡澘鐐瑰嚮浜嬩欢
+ private async void hydroParterListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
+ {
+ var allParterList = _hydroInfo.GetAllParters();
+ _parter = allParterList.Find(x => x.ID == parter.ID);
+ await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { _parter.Code });
+ ShowProperty();
+ }
+
+
+ //鏈尮閰嶅垪琛ㄧ偣鍑讳簨浠�
+ private async void xhsProjectSimulationUnMatchingListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
+ {
+ var allParterList = _hydroInfo.GetAllParters();
+ _parter = allParterList.Find(x => x.ID == parter.ID);
+ await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { _parter.Code });
+ ShowProperty();
+ }
+
+ //鏈尮閰嶅垪琛ㄦ煡鐪嬫ā鍨�
+ private async void xhsProjectSimulationUnMatchingListCtrl1_ViewModelEvent(List<Yw.Model.HydroParterInfo> parters)
+ {
+ var codes = parters?.Select(x => x.Code).Distinct().ToList();
+ await this.xhsProjectSimulationBimfaceCtrl1.AddSelectedComponents(codes);
+ _parter = null;
+ ShowProperty();
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3