From d750fc90db76b0c6aab2f99b987b7af84b831ce4 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 07 五月 2024 22:09:59 +0800
Subject: [PATCH] 2024年5月7日

---
 Hydraulic/Hydro.ConfigModel/GlobalModel.cs |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Hydraulic/Hydro.ConfigModel/GlobalModel.cs b/Hydraulic/Hydro.ConfigModel/GlobalModel.cs
index 517b76e..957ee88 100644
--- a/Hydraulic/Hydro.ConfigModel/GlobalModel.cs
+++ b/Hydraulic/Hydro.ConfigModel/GlobalModel.cs
@@ -202,6 +202,15 @@
             },
             new TypeIndicator
             {
+                Name="鑺傜偣鏍囬珮",
+                isNode=true,
+                EpaType=EPAModelOutput.eType.EN_DIAMETER,
+
+                isInput=false,
+                ObjectNames=new List<string>(){"鑺傜偣","姘磋〃","娑堢伀鏍�","姘存睜","姘村簱"},
+            },
+            new TypeIndicator
+            {
                 Name="鑺傜偣姘撮緞",
                 isNode=true,
                 EpaType=EPAModelOutput.eType.QUALITY_SETTINGS,
@@ -376,28 +385,28 @@
             {
                 Name = "绾︽潫鏉′欢",
                 titleStyle = MetroColorStyle_Inner.Yellow_Content,
-                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏", "鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "绠$嚎娴侀噺", "绠$嚎娴侀��", "姘村ご鎹熷け", "姘存车鑳借��","姘存车寮�鍏�","姘存车杞�熸瘮" },
+                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏", "鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "鑺傜偣鏍囬珮", "绠$嚎娴侀噺", "绠$嚎娴侀��", "姘村ご鎹熷け", "姘存车鑳借��","姘存车寮�鍏�","姘存车杞�熸瘮" },
                 Type_expression= new List<string>() { "鈭�" },
             },
             new LogicalPointType()
             {
                 Name = "鐩爣鍑芥暟",
                 titleStyle = MetroColorStyle_Inner.DarkRed,
-                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏", "鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "绠$嚎娴侀噺", "绠$嚎娴侀��", "姘村ご鎹熷け", "姘存车鑳借��","姘存车寮�鍏�","姘存车杞�熸瘮" },
+                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏", "鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "鑺傜偣鏍囬珮", "绠$嚎娴侀噺", "绠$嚎娴侀��", "姘村ご鎹熷け", "姘存车鑳借��","姘存车寮�鍏�","姘存车杞�熸瘮" },
                 Type_expression= new List<string>() { "鏈�灏�","鏈�澶�"  },//"鎺ヨ繎",
             },
             new LogicalPointType()
             {
                 Name = "琛ㄨ揪寮�",
                 titleStyle = MetroColorStyle_Inner.SkyBlue_Content,
-                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏", "鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "绠$嚎娴侀噺", "绠$嚎娴侀��", "姘村ご鎹熷け", "姘存车鑳借��","姘存车寮�鍏�","姘存车杞�熸瘮" },
+                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏", "鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "鑺傜偣鏍囬珮", "绠$嚎娴侀噺", "绠$嚎娴侀��", "姘村ご鎹熷け", "姘存车鑳借��","姘存车寮�鍏�","姘存车杞�熸瘮" },
                 Type_expression= new List<string>() { "琛ㄨ揪寮忚绠�"  },//"鎺ヨ繎",
             },
             new LogicalPointType()
             {
                 Name = "鍙橀噺",
                 titleStyle = MetroColorStyle_Inner.Green_Content,
-                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏","鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺","鑺傜偣姘磋川", "绠$嚎娴侀噺", "绠$嚎娴侀��","姘村ご鎹熷け","绠$嚎鐘舵��", "姘存车鑳借��" ,"姘存车寮�鍏�","姘存车杞�熸瘮"},
+                IndicatorNames = new List<string>(){ "鑺傜偣鍘嬪姏","鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺","鑺傜偣鏍囬珮","鑺傜偣姘磋川", "绠$嚎娴侀噺", "绠$嚎娴侀��","姘村ご鎹熷け","绠$嚎鐘舵��", "姘存车鑳借��" ,"姘存车寮�鍏�","姘存车杞�熸瘮"},
                 Type_expression= new List<string>() { "璁$畻鍊�","鍙樺寲鍊�","鍒濆璁$畻鍊�","鍩哄噯鍊�(鐣岄潰)","鍩哄噯鍊�(鎺ュ彛)", "妯″紡绯绘暟(鐣岄潰)", "妯″紡绯绘暟(鎺ュ彛)", "瀹氫箟鍊�","瀛愭柟妗堝��"},
             },
             new LogicalPointType()
@@ -412,7 +421,7 @@
                 Name = "闆嗗悎",
                 titleStyle = MetroColorStyle_Inner.Yellow_Content,
                 //IndicatorNames = new List<string>(){ "宸茬煡鍘嬪姏","鑺傜偣鐢ㄦ按閲�", "姘存睜姘翠綅","姘存车杞�熸瘮","绠$嚎闃诲姏绯绘暟","闃�闂ㄥ紑搴�","姘存车寮�鍏�","闃�闂ㄥ紑鍏�","绠$嚎寮�鍏�","绠$嚎鐩村緞","绠$嚎闀垮害","[-----杈撳嚭-----]","鑺傜偣鍘嬪姏", "鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "绠$嚎娴侀噺", "绠$嚎娴侀��", "姘存车鑳借��","姘存车寮�鍏�","姘存车杞�熸瘮" },
-                IndicatorNames = new List<string>(){  "鑺傜偣鍘嬪姏","鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺","鑺傜偣姘磋川", "绠$嚎娴侀噺", "绠$嚎娴侀��","姘村ご鎹熷け","绠$嚎鐘舵��", "姘存车鑳借��" ,"姘存车寮�鍏�","姘存车杞�熸瘮" },
+                IndicatorNames = new List<string>(){  "鑺傜偣鍘嬪姏","鑺傜偣鑷敱鍘嬪姏", "鑺傜偣闇�姘撮噺", "鑺傜偣鏍囬珮", "鑺傜偣姘磋川", "绠$嚎娴侀噺", "绠$嚎娴侀��","姘村ご鎹熷け","绠$嚎鐘舵��", "姘存车鑳借��" ,"姘存车寮�鍏�","姘存车杞�熸瘮" },
                 Type_expression= new List<string>() { "鏈�澶у��","鏈�灏忓��","骞冲潎鍊�","绱鍊�","璁℃暟"},
             },            
         };

--
Gitblit v1.9.3