From 49eb2a09634e439090d4a2b13ec7d6f911d3deaf Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 27 七月 2024 11:44:21 +0800
Subject: [PATCH] fix:修复沿程损失计算异常的问题
---
Hydraulic/Hydro.ConfigModel/GlobalModel.cs | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/Hydraulic/Hydro.ConfigModel/GlobalModel.cs b/Hydraulic/Hydro.ConfigModel/GlobalModel.cs
index 11735ba..377a879 100644
--- a/Hydraulic/Hydro.ConfigModel/GlobalModel.cs
+++ b/Hydraulic/Hydro.ConfigModel/GlobalModel.cs
@@ -333,6 +333,13 @@
},
new TypeIndicator
{
+ Name="鍒濆鍖�",
+ isNode=true,
+ Type=HydraulicInputType.None,
+ ObjectNames=new List<string>(){"姘存车"},
+ },
+ new TypeIndicator
+ {
Name="鍒濆鍙婅繍琛屼紶鍙�",
isNode=true,
Type=HydraulicInputType.None,
@@ -368,7 +375,21 @@
},
new TypeIndicator
{
+ Name="鍩哄洜绛涢�夊櫒",
+ isNode=true,
+ Type=HydraulicInputType.None,
+ ObjectNames=new List<string>(){"姘存车"},
+ },
+ new TypeIndicator
+ {
Name="璁＄畻鍓嶅鐞�",
+ isNode=true,
+ Type=HydraulicInputType.None,
+ ObjectNames=new List<string>(){"姘存车"},
+ },
+ new TypeIndicator
+ {
+ Name="杈撳嚭璁＄畻澶勭悊",
isNode=true,
Type=HydraulicInputType.None,
ObjectNames=new List<string>(){"姘存车"},
@@ -526,14 +547,14 @@
Name = "鍒濆鏉′欢",
titleStyle = MetroColorStyle_Inner.Blue,
IndicatorNames = new List<string>(){ "宸茬煡鍘嬪姏","鑺傜偣鐢ㄦ按閲�", "鑺傜偣鐢ㄦ按妯″紡", "姘存睜姘翠綅", "鎬绘按閲�", "姘存车杞�熸瘮","绠＄嚎闃诲姏绯绘暟","闃�闂ㄥ紑搴�","姘存车寮�鍏�","闃�闂ㄥ紑鍏�","绠＄嚎寮�鍏�","绠＄嚎鐩村緞","绠＄嚎闀垮害" },
- Type_expression= new List<string>() { "鍩哄噯鍊�(鐣岄潰)", "鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)"},
+ Type_expression= new List<string>() { "鍩哄噯鍊�(鐣岄潰)", "鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)","鏇茬嚎(鐣岄潰)","鏇茬嚎(鎺ュ彛)"},
},
new LogicalPointType()
{
Name = "涓嬮樁娈垫潯浠�",
titleStyle = MetroColorStyle_Inner.Blue,
IndicatorNames = new List<string>(){ "宸茬煡鍘嬪姏","鑺傜偣鐢ㄦ按閲�", "鑺傜偣鐢ㄦ按妯″紡", "姘存睜姘翠綅","姘存车杞�熸瘮","绠＄嚎闃诲姏绯绘暟","闃�闂ㄥ紑搴�","姘存车寮�鍏�","闃�闂ㄥ紑鍏�","绠＄嚎寮�鍏�","绠＄嚎鐩村緞","绠＄嚎闀垮害","鎬绘按閲�" },
- Type_expression= new List<string>() { "鍩哄噯鍊�(鐣岄潰)", "鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)"},
+ Type_expression= new List<string>() { "鍩哄噯鍊�(鐣岄潰)", "鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)","鏇茬嚎(鐣岄潰)","鏇茬嚎(鎺ュ彛)"},
},
new LogicalPointType()
{
@@ -547,7 +568,7 @@
Name = "姘撮噺鍒嗛厤",
titleStyle = MetroColorStyle_Inner.DarkGreen,
IndicatorNames = new List<string>(){ "褰撻噺鍒嗛厤" ,"闅忔満鍒嗛厤","鎬绘按閲�"},//,"鎬诲垎閰嶆按閲�"
- Type_expression= new List<string>() { "鍩哄噯鍊�(鐣岄潰)", "鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)" },
+ Type_expression= new List<string>() { "鍩哄噯鍊�(鐣岄潰)", "鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)"},
},
new LogicalPointType()
{
@@ -575,13 +596,13 @@
Name = "鍙橀噺",
titleStyle = MetroColorStyle_Inner.Green_Content,
IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏","鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺","鑺傜偣鏍囬珮","鑺傜偣姘磋川", "绠＄嚎娴侀噺", "绠＄嚎娴侀��","姘村ご鎹熷け","绠＄嚎鐘舵��", "姘存车鑳借��" ,"姘存车寮�鍏�","姘存车杞�熸瘮"},
- Type_expression= new List<string>() { "璁＄畻鍊�","鍙樺寲鍊�","鍒濆璁＄畻鍊�","鍩哄噯鍊�(鐣岄潰)","鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)", "瀛愭柟妗堝��"},
+ Type_expression= new List<string>() { "璁＄畻鍊�","鍙樺寲鍊�","鍒濆璁＄畻鍊�","鍩哄噯鍊�(鐣岄潰)","鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)", "鏇茬嚎(鐣岄潰)", "鏇茬嚎(鎺ュ彛)", "瀛愭柟妗堝��" },
},
new LogicalPointType()
{
Name = "棰勫鐞嗘彃浠�",
titleStyle = MetroColorStyle_Inner.Yellow_Content,
- IndicatorNames = new List<string>(){"鍒濆鍙婅繍琛屼紶鍙�", "鍒濆浼犲弬", "杩愯浼犲弬", "绉嶇兢鐢熸垚鍣�", "鏂规绛涢�夊櫒", "璁＄畻鍓嶅鐞�", "缁撴灉澶勭悊" },
+ IndicatorNames = new List<string>(){"鍒濆鍖�","鍒濆鍙婅繍琛屼紶鍙�", "鍒濆浼犲弬", "杩愯浼犲弬", "绉嶇兢鐢熸垚鍣�", "鏂规绛涢�夊櫒","鍩哄洜绛涢�夊櫒", "璁＄畻鍓嶅鐞�", "杈撳嚭璁＄畻澶勭悊", "缁撴灉澶勭悊" },
Type_expression= new List<string>() { },
},
new LogicalPointType()
--
Gitblit v1.9.3