WIN-GH9CEESPLTB\Administrator vor 1 Monat
Ursprung
Commit
f36651a68a
1 geänderte Dateien mit 21 neuen und 21 gelöschten Zeilen
  1. 21 21
      MainForm/FaForm/Form_Home.cs

+ 21 - 21
MainForm/FaForm/Form_Home.cs

@@ -2675,39 +2675,39 @@ namespace MainForm
 
 
                 if (FaultData.Length > 0)
                 if (FaultData.Length > 0)
                 {
                 {
-                    foreach (var item in FaultData)
+                    //foreach (var item in FaultData)
+                    //{
+                    //    if (item > 0)
+                    //    {
+                    //        isNoAlarm = true;
+                    //        break;
+                    //    }
+                    //    else { 
+                    //        isNoAlarm = false;
+                    //    }
+                    //}
+                    //如果警报都是0,则跳过解析
+                    if (FaultData?.All(x => x == 0) ?? true)
                     {
                     {
-                        if (item > 0)
+                        if (flag == "left")
                         {
                         {
-                            isNoAlarm = true;
-                            break;
+                            _FaultDatas_Old = FaultData.ToArray();
                         }
                         }
-                        else { 
-                            isNoAlarm = false;
+                        else
+                        {
+                            _FaultDatas_Old2 = FaultData.ToArray();
                         }
                         }
+                        return;
                     }
                     }
-
                     if (!FaultData.SequenceEqual(FaultDataOld))
                     if (!FaultData.SequenceEqual(FaultDataOld))
                     {
                     {
                         isNoNewAlarm = true;
                         isNoNewAlarm = true;
                         isNeedUpdUI = true;
                         isNeedUpdUI = true;
                     }
                     }
 
 
-                    if (FaultData.Length > 0 && isNoAlarm && isNoNewAlarm)
+                    //if (FaultData.Length > 0 && isNoAlarm && isNoNewAlarm)
+                    if (FaultData.Length > 0 && isNoNewAlarm)
                     {
                     {
-                        //如果警报都是0,则跳过解析
-                        if (FaultData?.All(x => x == 0) ?? true)
-                        {
-                            if (flag == "left")
-                            {
-                                _FaultDatas_Old = FaultData.ToArray();
-                            }
-                            else
-                            {
-                                _FaultDatas_Old2 = FaultData.ToArray();
-                            }
-                            return;
-                        }
                         //解析报警信息,分析当前报警在字典中的定位
                         //解析报警信息,分析当前报警在字典中的定位
                         for (int i = 0; i <= FaultData.Length - 1; i++)
                         for (int i = 0; i <= FaultData.Length - 1; i++)
                         {
                         {