临时提交

BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs

@@ -65,6 +65,9 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
                     return;
                 }
             });
+
+            //AlarmInfos = AlarmHelper<AlarmInfo>.Alarms;
+
         }
 
         private void GetHistoryAlarm()

BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs

@@ -45,7 +45,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
 
         private void DoNavChanged(object obj)
         {
-            ActionManage.GetInstance.Send("RecipeIsChange");
+            
 
             if (obj != null && obj is SubMenumodel menumodel)
             {

FryPot_DosingSystem/App.xaml.cs

@@ -16,7 +16,6 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using AlarmInfo = BPASmartClient.CustomResource.Pages.Model.AlarmInfo;
 
 namespace FryPot_DosingSystem
 {

FryPot_DosingSystem/Control/DosingLogicControl.cs

@@ -1568,7 +1568,6 @@ namespace FryPot_DosingSystem.Control
                     FryPotMonitorManage.GetInstance.fryFive.OilCapacity = globalVar.fryPotFive.OilCapacity;
                     FryPotMonitorManage.GetInstance.fryFive.TotalOilCapactiy += globalVar.fryPotFive.OilCapacity;
                 }
-
                 //炒锅状态实时显示
                 FryPotStatusDisplay();
                 RollerLineStatusDisplay();

BPASmartClient.CustomResource/Pages/Model/AlarmInfo.cs → FryPot_DosingSystem/Model/AlarmInfo.cs

@@ -1,10 +1,11 @@
-using System;
+using BPASmartClient.CustomResource.Pages.Model;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.CustomResource.Pages.Model
+namespace FryPot_DosingSystem.Model
 {
     public class AlarmInfo
     {

FryPot_DosingSystem/View/RecipeManageView.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Helper;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -23,6 +24,12 @@ namespace FryPot_DosingSystem.View
         public RecipeManageView()
         {
             InitializeComponent();
+            this.Unloaded += RecipeManageView_Unloaded;
+        }
+
+        private void RecipeManageView_Unloaded(object sender, RoutedEventArgs e)
+        {
+            ActionManage.GetInstance.Send("RecipeIsChange");
         }
     }
 }

FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs

@@ -54,7 +54,7 @@ namespace FryPot_DosingSystem.ViewModel
             int count = recipeModels.Count;
             bool sign = false;
             ActionManage.GetInstance.CancelRegister("RecipeIsChange");
-            ActionManage.GetInstance.Register(new Action(() =>
+            ActionManage.GetInstance.RegisterAsync(new Action(() =>
             {
                 if (!sign)
                 {