From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs
index 4305455..8c1d407 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs
@@ -57,9 +57,9 @@
return;
}
- var graph_qh = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.QH);
- var graph_qe = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.QH);
- var graph_qp = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.QH);
+ var graph_qh = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQH);
+ var graph_qe = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQH);
+ var graph_qp = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQH);
if (graph_qp == null)
{
@@ -133,21 +133,21 @@
{
Name = other_name+"-QH",
GeometryStyle= HStation.PhartRelation.eGeometryStyle.FeatCurve,
- GraphType= HStation.PhartRelation.eGraphType.QH,
+ GraphType= HStation.PhartRelation.eGraphType.PumpQH,
GeometryInfo=qh.ToDbString()
},
new ()
{
Name = other_name+"-QE",
GeometryStyle= HStation.PhartRelation.eGeometryStyle.FeatCurve,
- GraphType= HStation.PhartRelation.eGraphType.QE,
+ GraphType= HStation.PhartRelation.eGraphType.PumpQE,
GeometryInfo=qe.ToDbString()
},
new ()
{
Name = other_name+"-QP",
GeometryStyle= HStation.PhartRelation.eGeometryStyle.FeatCurve,
- GraphType= HStation.PhartRelation.eGraphType.QP,
+ GraphType= HStation.PhartRelation.eGraphType.PumpQP,
GeometryInfo=qp.ToDbString()
},
}
--
Gitblit v1.9.3