From 60908c00556f4f53d82f5588ae3013f80c443590 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 14 十一月 2024 17:22:58 +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/04-scheme/XhsProjectSimulationSchemeMgrPage.cs | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs
index f007f3d..d30191d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs
@@ -2075,7 +2075,7 @@
{
Code = Yw.Hydro.ParterCatalog.Pipe,
Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
- PropName = Yw.Hydro.ParterProp.CalcuFlow
+ PropName = HydroCalcuProp.CalcuFlow
});
}
}
@@ -2142,9 +2142,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuFlow:
+ case HydroCalcuProp.CalcuFlow:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2167,9 +2167,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuVelocity:
+ case HydroCalcuProp.CalcuVelocity:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2192,9 +2192,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuHeadLoss:
+ case HydroCalcuProp.CalcuHeadLoss:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2249,9 +2249,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuFlow:
+ case HydroCalcuProp.CalcuFlow:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2274,9 +2274,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuVelocity:
+ case HydroCalcuProp.CalcuVelocity:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2299,9 +2299,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuHeadLoss:
+ case HydroCalcuProp.CalcuHeadLoss:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2338,9 +2338,9 @@
{
switch (x.PropName)
{
- case Yw.Hydro.ParterProp.CalcuFlow:
+ case HydroCalcuProp.CalcuFlow:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2363,9 +2363,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuVelocity:
+ case HydroCalcuProp.CalcuVelocity:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2388,9 +2388,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuHeadLoss:
+ case HydroCalcuProp.CalcuHeadLoss:
{
- var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2496,9 +2496,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuFlow:
+ case HydroCalcuProp.CalcuFlow:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2521,9 +2521,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuVelocity:
+ case HydroCalcuProp.CalcuVelocity:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2546,9 +2546,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuHeadLoss:
+ case HydroCalcuProp.CalcuHeadLoss:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
@@ -2603,9 +2603,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuFlow:
+ case HydroCalcuProp.CalcuFlow:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2628,9 +2628,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuVelocity:
+ case HydroCalcuProp.CalcuVelocity:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2653,9 +2653,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuHeadLoss:
+ case HydroCalcuProp.CalcuHeadLoss:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
@@ -2692,9 +2692,9 @@
{
switch (propName)
{
- case Yw.Hydro.ParterProp.CalcuFlow:
+ case HydroCalcuProp.CalcuFlow:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2717,9 +2717,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuVelocity:
+ case HydroCalcuProp.CalcuVelocity:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
@@ -2742,9 +2742,9 @@
}
}
break;
- case Yw.Hydro.ParterProp.CalcuHeadLoss:
+ case HydroCalcuProp.CalcuHeadLoss:
{
- var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+ var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
if (gradingList != null && gradingList.Count > 0)
{
var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
--
Gitblit v1.9.3