xuhsili 9 月之前
父節點
當前提交
c74b0a6adb
共有 2 個文件被更改,包括 12 次插入2 次删除
  1. 6 1
      NEIntelligentControl2/Models/AGC/ViewModel.cs
  2. 6 1
      NEIntelligentControl2/Views/AGC/AGCCard2.xaml.cs

+ 6 - 1
NEIntelligentControl2/Models/AGC/ViewModel.cs

@@ -120,11 +120,16 @@ namespace NEIntelligentControl2.Models.AGC
                 _PowerSet = arg2;
                 AddData(ls2, arg2);
             }
-            else
+            else if (arg1.Type == TagType.ActualPower)
             {
                 _ActPower = arg2;
                 AddData(ls1, arg2);
             }
+            else
+            {
+                _IdeaPower = arg2;
+                AddData(ls3, arg2);
+            }
             var dts = arg2[0].Ts.GetLongDateTime();
             var dte = arg2[arg2.Count - 1].Ts.GetLongDateTime();
 

+ 6 - 1
NEIntelligentControl2/Views/AGC/AGCCard2.xaml.cs

@@ -54,6 +54,7 @@ namespace NEIntelligentControl2.Views.AGC
         private TagInfo _ActualPower;
         private List<TsData> _PowerSetList;
         private List<TsData> _ActualPowerList;
+        private List<TsData> _IdeaPowerList;
         private List<TsData> _StatusList;
         public AGCCard2()
         {
@@ -132,10 +133,14 @@ namespace NEIntelligentControl2.Views.AGC
                 _PowerSetList = arg2;
                 return;
             }
-            else
+            else if (arg1.Type == TagType.ActualPower)
             {
                 _ActualPowerList = arg2;
             }
+            else
+            {
+                _IdeaPowerList = arg2;
+            }
             if (Status != 1) return;
             InitCurveDeviationRate();
         }