From 81819f13e1e3a49bf8456051ec0f0b51e3f10821 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 九月 2024 12:20:33 +0800
Subject: [PATCH] 解析优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 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 1b345ca..24d5df3 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
@@ -18,6 +18,8 @@
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.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ this.assetsMainChoicePage1.FormRowClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
}
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
@@ -57,6 +59,7 @@
_hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
}
this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
+ this.xhsProjectSimulationL3dCtrl1.SetBindingData(_hydroInfo);
}
/// <summary>
@@ -92,7 +95,7 @@
}
if (_fastShowHideCodeList == null)
{
- _fastShowHideCodeList = _hydroInfo.Waterboxs.Select(x => x.Code).ToList();
+ _fastShowHideCodeList = _hydroInfo.Decorators.Select(x => x.Code).ToList();
await this.xhsProjectSimulationBimfaceCtrl1.HideComponents(_fastShowHideCodeList);
}
else
@@ -162,6 +165,7 @@
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.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
this.hydroParterListCtrl1.SetBindingData(_hydroInfo);
this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -298,7 +302,7 @@
Name = x.Name,
DbID = x.DbId,
DbLocked = x.DbLocked,
- //ChartDbID=_hydroInfo.Curves?.Find(t=>t.Code==x.CurveQH)?.DbId,杩欓噷涓嶆槸long CurveDbId
+ ChartDbID = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQH)?.DbId,
ModelType = x.ModelType,
RatedP = x.RatedP,
RatedH = x.RatedH,
@@ -310,10 +314,10 @@
ID = x.ID,
Name = x.Name,
Code = x.Code,
- // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ Dbid = x.DbId,
DbLocked = x.DbLocked,
ModelType = x.ModelType,
- // Caliber = x.Caliber,
+ Caliber = x.Caliber,
Material = x.Material
}).ToList();
input.ThreeLinkMatchingModels = _hydroInfo.Threelinks?.Select(x => new ThreeLinkMatchingViewModel()
@@ -321,10 +325,10 @@
ID = x.ID,
Name = x.Name,
Code = x.Code,
- // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbId = x.DbId,
DbLocked = x.DbLocked,
ModelType = x.ModelType,
- // Caliber = x.Caliber,
+ Caliber = x.Caliber,
Material = x.Material
}).ToList();
input.FourLinkMatchingModels = _hydroInfo.Fourlinks?.Select(x => new FourLinkMatchingViewModel()
@@ -332,10 +336,10 @@
ID = x.ID,
Name = x.Name,
Code = x.Code,
- // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ Dbid = x.DbId,
DbLocked = x.DbLocked,
ModelType = x.ModelType,
- // Caliber = x.Caliber,
+ Caliber = x.Caliber,
Material = x.Material
}).ToList();
input.PipeLineMatchingModels = _hydroInfo.Pipes?.Select(x => new PipeLineMatchingViewModel()
@@ -343,10 +347,10 @@
ID = x.ID,
Name = x.Name,
Code = x.Code,
- // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbId = x.DbId,
DbLocked = x.DbLocked,
ModelType = x.ModelType,
- //Caliber = x.Diameter,//杩欓噷鏄暟鍊�
+ Caliber = x.Diameter,//杩欓噷鏄暟鍊�
Material = x.Material
}).ToList();
@@ -355,22 +359,25 @@
ID = x.ID,
Name = x.Name,
Code = x.Code,
- // Dbid=x.DbId,杩欓噷鏄痵tring DbId
+ DbId = x.DbId,
DbLocked = x.DbLocked,
ModelType = x.ModelType,
- Caliber = x.Diameter.ToString(),//杩欓噷鏄暟鍊�
+ Caliber = x.Diameter,//杩欓噷鏄暟鍊�
Material = x.Material//鎬庝箞娌℃湁闃�闂ㄧ被鍨�
}).ToList();
-
- //鏃㈢劧鍏ュ弬鍜屽嚭鍙傚凡缁忎繚鎸佷竴鑷翠簡锛屽氨涓嶈兘鍙仛InputViewModel浜嗭紝鏈夋涔�
- //杩欓噷鍙互鍏堟槸绐椾綋锛岃皟璇曞ソ锛屽悗闈㈡敼鎴愭帶浠�
- var dlg = new AssetsAutoMatchingMainDlg();
- dlg.SetBindingData(input);
- dlg.RelaodEvent += (rhs) =>
- {
- return false;
- };
- dlg.ShowDialog();
+ 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.Hidden;
+ this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlMatchingList.Height = 350;
+ this.assetsMainChoicePage1.SetBindingData(input);
+ this.assetsMainChoicePage1.RelaodEvent += (rhs) =>
+ {
+ return false;
+ };
}
private void BtnPerformChart_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -401,7 +408,6 @@
ShowProperty();
}
-
//鏈尮閰嶅垪琛ㄧ偣鍑讳簨浠�
private async void xhsProjectSimulationUnMatchingListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
{
@@ -419,6 +425,5 @@
_parter = null;
ShowProperty();
}
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3