From ce1cc10e518ddac71cfefd433f8a6af9fb46ed40 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 27 九月 2024 12:01:02 +0800
Subject: [PATCH] 更改事件名称
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs | 36 ++++++++++++++++++------------------
WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/js/CustomLabels.js | 3 +++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs | 5 +++--
WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/html/Interop3d.html | 1 +
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 3 +--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs | 6 +++---
6 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
index 8b7492f..e3bf429 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs
@@ -172,8 +172,7 @@
var curveqh = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQH);
if (curveqh == null)
{
- var allParterList = hydroInfo.GetAllParters();
- var parterNameList = allParterList?.Select(x => x.Code).Distinct().ToList();
+ curveqh = new Yw.Model.HydroCurveInfo();
curveqh.Catalog = Yw.Hydro.ParterCatalog.Curve;
curveqh.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", GetAllCodeList(hydroInfo));
curveqh.Name = "鍖归厤";
@@ -201,6 +200,7 @@
var curveqp = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
if (curveqp == null)
{
+ curveqp = new Yw.Model.HydroCurveInfo();
curveqp.Catalog = Yw.Hydro.ParterCatalog.Curve;
curveqp.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", GetAllCodeList(hydroInfo));
curveqp.Name = "鍖归厤";
@@ -228,6 +228,7 @@
var curveqe = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQE);
if (curveqe == null)
{
+ curveqe = new Yw.Model.HydroCurveInfo();
curveqe.Catalog = Yw.Hydro.ParterCatalog.Curve;
curveqe.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", GetAllCodeList(hydroInfo));
curveqe.Name = "鍖归厤";
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
index bfb05bd..96b6506 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -186,24 +186,24 @@
return true;
}
- feedBackMsg?.Invoke("姝ｅ湪杩涜浜у搧鍖归厤...", Color.Black);
- hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroId);
- var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo);
- if (await AssetsMatchingHelper.Matching(matchingParas))
- {
- if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
- {
- feedBackMsg?.Invoke("浜у搧鍖归厤鎴愬姛銆傘�傘��", Color.Green);
- }
- else
- {
- feedBackMsg?.Invoke("浜у搧鍖归厤澶辫触锛侊紒锛�", Color.Red);
- }
- }
- else
- {
- feedBackMsg?.Invoke("浜у搧鍖归厤澶辫触锛侊紒锛�", Color.Red);
- }
+ //feedBackMsg?.Invoke("姝ｅ湪杩涜浜у搧鍖归厤...", Color.Black);
+ //hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroId);
+ //var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo);
+ //if (await AssetsMatchingHelper.Matching(matchingParas))
+ //{
+ // if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
+ // {
+ // feedBackMsg?.Invoke("浜у搧鍖归厤鎴愬姛銆傘�傘��", Color.Green);
+ // }
+ // else
+ // {
+ // feedBackMsg?.Invoke("浜у搧鍖归厤澶辫触锛侊紒锛�", Color.Red);
+ // }
+ //}
+ //else
+ //{
+ // feedBackMsg?.Invoke("浜у搧鍖归厤澶辫触锛侊紒锛�", Color.Red);
+ //}
feedBackMsg?.Invoke("姘村姏缁撴瀯鏂囦欢瑙ｆ瀽鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 30);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
index b747569..05e882f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs
@@ -18,9 +18,9 @@
HydroClickEvent.Invoke(code);
}
- public event Action<string> HydroClickEvent = null;
+ public event Action<string> HydroClickEvent;
- public event Func<AssetsMatchingViewModel, bool> RelaodEvent = null;
+ public event Func<AssetsMatchingViewModel, bool> ApplyMatchingEvent;
private BLL.PumpMain _pumpMain = null;
@@ -85,7 +85,7 @@
//纭畾
private void btnComplete_Click(object sender, EventArgs e)
{
- if (RelaodEvent.Invoke(_assetsAutoMatching))
+ if (ApplyMatchingEvent.Invoke(_assetsAutoMatching))
{
TipFormHelper.ShowSucceed("淇敼鎴愬姛!");
}
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 20a86ac..32dfaaf 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
@@ -20,7 +20,6 @@
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.xhsProjectSimulationMatchingListCtrl1.HydroClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
}
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
@@ -222,7 +221,7 @@
var input = AssetsMatchingParasHelper.Create(_hydroInfo);
this.xhsProjectSimulationMatchingListCtrl1.SetBindingData(input);
- this.xhsProjectSimulationMatchingListCtrl1.RelaodEvent += (output) =>
+ this.xhsProjectSimulationMatchingListCtrl1.ApplyMatchingEvent += (output) =>
{
return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
};
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/html/Interop3d.html b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/html/Interop3d.html
index f134111..1a589e2 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/html/Interop3d.html
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/html/Interop3d.html
@@ -120,6 +120,7 @@
<script src="../js/ComponentsColor.js"></script>
<script src="../js/CustomLabels.js"></script>
+
<script src="js/Background.js"></script>
<script src="js/CameraStatus.js"></script>
<script src="js/ContextMenu.js"></script>
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/js/CustomLabels.js b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/js/CustomLabels.js
index a54a402..6c50e67 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/js/CustomLabels.js
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/js/CustomLabels.js
@@ -66,3 +66,6 @@
return html += '</table>';
}
+
+
+
--
Gitblit v1.9.3