From c390474980cea47189c1fcc962315b9867c9e2ce Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期日, 17 十一月 2024 16:03:18 +0800
Subject: [PATCH] 颜色分级梳理

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/XhsProjectSimulationSchemeMgrPage.cs |   70 +++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 35 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 3559e3e..754ab94 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
@@ -2055,8 +2055,8 @@
                 {
                     _allGradingApplyList.Add(new HydroGradingApplyViewModel()
                     {
-                        Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump),
+                        Catalog = Yw.Hydro.ParterCatalog.Pump,
+                        CatalogName = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump),
                         PropName = Yw.Hydro.ParterProp.LinkStatus
                     });
                 }
@@ -2064,8 +2064,8 @@
                 {
                     _allGradingApplyList.Add(new HydroGradingApplyViewModel()
                     {
-                        Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve),
+                        Catalog = Yw.Hydro.ParterCatalog.Valve,
+                        CatalogName = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve),
                         PropName = Yw.Hydro.ParterProp.LinkStatus
                     });
                 }
@@ -2073,8 +2073,8 @@
                 {
                     _allGradingApplyList.Add(new HydroGradingApplyViewModel()
                     {
-                        Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
+                        Catalog = Yw.Hydro.ParterCatalog.Pipe,
+                        CatalogName = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
                         PropName = HydroVisualCalcuProp.CalcuFlow
                     });
                 }
@@ -2083,7 +2083,7 @@
         }
 
         //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
-        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList()
+        private async Task<List<HydroGradingResultViewModel>> GetGradingApplyResultList()
         {
             if (_hydroInfo == null)
             {
@@ -2108,13 +2108,13 @@
             var allCalcuResultList = GetCalcuResultList();
 
             //鎵�鏈夊簲鐢ㄧ粨鏋滃垪琛�
-            var allGradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
+            var allGradingApplyResultList = new List<HydroGradingResultViewModel>();
             allGradingApplyList.ForEach(x =>
             {
-                var allCatalogGradingList = allGradingList.Where(t => t.Catalog == x.Code).ToList();
+                var allCatalogGradingList = allGradingList.Where(t => t.Catalog == x.Catalog).ToList();
                 if (allCatalogGradingList != null || allCatalogGradingList.Count > 0)
                 {
-                    switch (x.Code)
+                    switch (x.Catalog)
                     {
                         case Yw.Hydro.ParterCatalog.Pump:
                             {
@@ -2132,7 +2132,7 @@
                                                         var grading = gradingList.Meet(pump.LinkStatus);
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = pump.Code,
                                                                 Color = grading.Color
@@ -2155,7 +2155,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = pump.Code,
                                                                         Color = grading.Color
@@ -2180,7 +2180,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = pump.Code,
                                                                         Color = grading.Color
@@ -2205,7 +2205,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = pump.Code,
                                                                         Color = grading.Color
@@ -2239,7 +2239,7 @@
                                                         var grading = gradingList.Meet(valve.LinkStatus);
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = valve.Code,
                                                                 Color = grading.Color
@@ -2262,7 +2262,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = valve.Code,
                                                                         Color = grading.Color
@@ -2287,7 +2287,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = valve.Code,
                                                                         Color = grading.Color
@@ -2312,7 +2312,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = valve.Code,
                                                                         Color = grading.Color
@@ -2351,7 +2351,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = pipe.Code,
                                                                         Color = grading.Color
@@ -2376,7 +2376,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = pipe.Code,
                                                                         Color = grading.Color
@@ -2401,7 +2401,7 @@
                                                                 var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
                                                                 if (grading != null)
                                                                 {
-                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    var result = new HydroGradingResultViewModel()
                                                                     {
                                                                         Code = pipe.Code,
                                                                         Color = grading.Color
@@ -2428,7 +2428,7 @@
         }
 
         //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
-        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList(string catalog, string propName)
+        private async Task<List<HydroGradingResultViewModel>> GetGradingApplyResultList(string catalog, string propName)
         {
             if (_hydroInfo == null)
             {
@@ -2455,7 +2455,7 @@
             }
 
             //褰撳墠鍒嗙骇搴旂敤
-            var gradingApply = allGradingApplyList.Find(x => x.Code == catalog);
+            var gradingApply = allGradingApplyList.Find(x => x.Catalog == catalog);
             if (gradingApply == null)
             {
                 return default;
@@ -2466,7 +2466,7 @@
             var allCalcuResultList = GetCalcuResultList();
 
             //搴旂敤缁撴灉鍒楄〃
-            var gradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
+            var gradingApplyResultList = new List<HydroGradingResultViewModel>();
 
             switch (catalog)
             {
@@ -2486,7 +2486,7 @@
                                                 var grading = gradingList.Meet(pump.LinkStatus);
                                                 if (grading != null)
                                                 {
-                                                    var result = new HydroGradingApplyResultViewModel()
+                                                    var result = new HydroGradingResultViewModel()
                                                     {
                                                         Code = pump.Code,
                                                         Color = grading.Color
@@ -2509,7 +2509,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = pump.Code,
                                                                 Color = grading.Color
@@ -2534,7 +2534,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = pump.Code,
                                                                 Color = grading.Color
@@ -2559,7 +2559,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = pump.Code,
                                                                 Color = grading.Color
@@ -2593,7 +2593,7 @@
                                                 var grading = gradingList.Meet(valve.LinkStatus);
                                                 if (grading != null)
                                                 {
-                                                    var result = new HydroGradingApplyResultViewModel()
+                                                    var result = new HydroGradingResultViewModel()
                                                     {
                                                         Code = valve.Code,
                                                         Color = grading.Color
@@ -2616,7 +2616,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = valve.Code,
                                                                 Color = grading.Color
@@ -2641,7 +2641,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = valve.Code,
                                                                 Color = grading.Color
@@ -2666,7 +2666,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = valve.Code,
                                                                 Color = grading.Color
@@ -2705,7 +2705,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = pipe.Code,
                                                                 Color = grading.Color
@@ -2730,7 +2730,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = pipe.Code,
                                                                 Color = grading.Color
@@ -2755,7 +2755,7 @@
                                                         var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
                                                         if (grading != null)
                                                         {
-                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            var result = new HydroGradingResultViewModel()
                                                             {
                                                                 Code = pipe.Code,
                                                                 Color = grading.Color

--
Gitblit v1.9.3