更新样式

BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj

@@ -19,7 +19,7 @@
 		</COMReference>
 	</ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BPA.CustomResource" Version="1.0.4" />
+    <PackageReference Include="BPA.CustomResource" Version="1.0.5" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" />
   </ItemGroup>
 

BPASmartClient.ScreenLib/Helper/Main.cs

@@ -1,5 +1,6 @@
 using BPA.Communication;
 using BPA.Helper;
+using BPA.Message;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
@@ -18,9 +19,9 @@ namespace BPASmartClient.ScreenLib
     {
         #region 接口继承变量
         /// <summary>
-        /// Redis连接信息
+        /// MQTT连接信息
         /// </summary>
-        public string RedisConnection { get; set; }
+        public string MQTTConnection { get; set; }
         /// <summary>
         /// 业务名称
         /// </summary>
@@ -46,9 +47,13 @@ namespace BPASmartClient.ScreenLib
         /// </summary>
         public bool IsRunning { get; set; }
         /// <summary>
-        /// Redis是否运行
+        /// Mqtt是否运行
         /// </summary>
-        public bool IsRunningReids => RedisHelper.GetInstance.IsConnected();
+        public bool IsRunningMqtt = false;
+        /// <summary>
+        /// Mqtt
+        /// </summary>
+        public MqttHelper mqttHelper = new MqttHelper();
         /// <summary>
         /// 主函数
         /// </summary>
@@ -57,23 +62,23 @@ namespace BPASmartClient.ScreenLib
         public Main()
         {
             ReadPZ();
-            if (PZdic.ContainsKey("RedisConnection"))
-                RedisConnection = PZdic["RedisConnection"];
+            if (PZdic.ContainsKey("MQTTConnection"))
+                MQTTConnection = PZdic["MQTTConnection"];
             if (PZdic.ContainsKey("DeviceMC"))
                 Name = PZdic["DeviceMC"];
         }
         /// <summary>
         /// 设备数据
         /// </summary>
-        public Dictionary<string, Dictionary<string, RedisDataModel>> redisDatasDic = new Dictionary<string, Dictionary<string, RedisDataModel>>();
-        /// <summary>
-        /// 告警数据
-        /// </summary>
-        public Dictionary<string, Dictionary<string, RedisDataModel>> redisAicDatasDic = new Dictionary<string, Dictionary<string, RedisDataModel>>();
+        public Dictionary<string, Dictionary<string, string>> mqttDatasDic = new Dictionary<string, Dictionary<string, string>>();
         /// <summary>
         /// 配置数据
         /// </summary>
         public Dictionary<string,string> PZdic=new Dictionary<string,string>();
+        /// <summary>
+        /// Mqtt消息队列
+        /// </summary>
+        public ConcurrentQueue<string> msg = new ConcurrentQueue<string>();
         #endregion
 
         #region 线程处理函数
@@ -86,44 +91,17 @@ namespace BPASmartClient.ScreenLib
             {
                 try
                 {
-                    if (IsRunning && IsRunningReids)
+                    if (IsRunning && IsRunningMqtt)
                     {
-                        //1.读取Redis变量
-                        if (!string.IsNullOrEmpty(Name))
+                        if (msg.Count > 0 && msg.TryDequeue(out string s))
                         {
-                            redisDatasDic = new Dictionary<string, Dictionary<string, RedisDataModel>>();
-                            redisAicDatasDic = new Dictionary<string, Dictionary<string, RedisDataModel>>();
-                            if (Name.Contains(","))
+                            SendScreenDataModel read= JsonConvert.DeserializeObject<SendScreenDataModel>(s);
+                            if (read != null)
                             {
-                                Name.Split(',')?.ToList().ForEach(x =>
-                                {
-                                    Dictionary<string, RedisDataModel> valuePairs = new Dictionary<string, RedisDataModel>();
-                                    RedisHelper.GetInstance.Read<List<RedisDataModel>>($"{x}[Device]").Content?.ToList().ForEach(k => {
-                                        valuePairs[k.VarName] = k;
-                                    });
-                                    redisDatasDic[x]= valuePairs;//设备数据
-
-                                    Dictionary<string, RedisDataModel> valuePairsAic = new Dictionary<string, RedisDataModel>();
-                                    RedisHelper.GetInstance.Read<List<RedisDataModel>>($"{x}[Alarm]").Content?.ToList().ForEach(k => {
-                                        valuePairsAic[k.VarName] = k;
-                                    });
-                                    redisAicDatasDic[x] = valuePairsAic;//告警数据
+                                read?.mqttAicDatasDic?.ToList().ForEach(data => {
+                                    mqttDatasDic[data.Key]= data.Value; 
                                 });
                             }
-                            else
-                            {
-                                Dictionary<string, RedisDataModel> valuePairs = new Dictionary<string, RedisDataModel>();
-                                RedisHelper.GetInstance.Read<List<RedisDataModel>>($"{Name}[Device]").Content?.ToList().ForEach(k => {
-                                    valuePairs[k.VarName] = k;
-                                });
-                                redisDatasDic[Name] = valuePairs;//设备数据
-
-                                Dictionary<string, RedisDataModel> valuePairsAic = new Dictionary<string, RedisDataModel>();
-                                RedisHelper.GetInstance.Read<List<RedisDataModel>>($"{Name}[Alarm]").Content?.ToList().ForEach(k => {
-                                    valuePairsAic[k.VarName] = k;
-                                });
-                                redisAicDatasDic[Name] = valuePairsAic;//告警数据
-                            }
                         }
                     }
                 }
@@ -162,6 +140,7 @@ namespace BPASmartClient.ScreenLib
             {
                 //0.设置运行标志
                 IsRunning = false;
+                mqttHelper.CloseConnect();
             }
             catch (Exception ex)
             {
@@ -177,11 +156,11 @@ namespace BPASmartClient.ScreenLib
         {
             string msgage = string.Empty;
             bool IsTrue = false;
-            if (IsRunningReids && IsRunning)
+            if (IsRunningMqtt && IsRunning)
                 IsTrue = true;
             else
             {
-                if (!IsRunningReids)
+                if (!IsRunningMqtt)
                     msgage += "Redis断开连接.";
                 IsTrue = false;
                 msgage = $"{Name}:健康检查失败,原因:{msgage}";
@@ -208,17 +187,36 @@ namespace BPASmartClient.ScreenLib
         {
             try
             {
-                //1.连接Redis,如果已经连接过了 那么自动不会去连接
-                if (!string.IsNullOrEmpty(this.RedisConnection) && this.RedisConnection.Contains(','))
+                //2.Mqtt连接
+                if (!string.IsNullOrEmpty(this.MQTTConnection) && this.MQTTConnection.Contains(','))
+                {
+                    string[] mqttcom = this.MQTTConnection.Split(',');
+                    if (mqttcom != null && mqttcom.Count() == 4)
+                    {
+                        mqttHelper.Connect(mqttcom[2], mqttcom[3], mqttcom[0], int.Parse(mqttcom[1]), $"{Name}:{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
+                    }
+                }
+                mqttHelper.Disconnect = new Action(() =>
+                {
+                    IsRunningMqtt = false;
+                    MessageLog.GetInstance.ShowEx($"{Name}:MQTT异常断开....");
+                });
+                mqttHelper.ConnectOk = new Action(() =>
                 {
-                    string[] rediscom = this.RedisConnection.Split(',');
-                    if (rediscom != null && rediscom.Count() == 4)
-                        RedisHelper.GetInstance.Connect(new ConfigurationOptions()
+                    IsRunningMqtt = true;//连接成功
+                    if (Name.Contains(","))
+                    {
+                        Name.Split(',')?.ToList().ForEach(x =>
                         {
-                            ServerAddress = $"{rediscom[0]}:{int.Parse(rediscom[1])}",
-                            Password = rediscom[2]
+                            mqttHelper.Subscrib(x);
                         });
-                }
+                    }
+                    else
+                    {
+                        mqttHelper.Subscrib(Name);
+                    }
+                });
+                mqttHelper.MessageRecive = new Action<string>((s) => { msg.Enqueue(s); });
             }
             catch (Exception ex)
             {
@@ -228,31 +226,4 @@ namespace BPASmartClient.ScreenLib
         }
         #endregion
     }
-
-
-    /// <summary>
-    /// Redis 数据存储格式
-    /// </summary>
-    public class RedisDataModel
-    {
-        public string VarName { get; set; }
-        public string VarVaule { get; set; }
-        public EDataType DataType { get; set; }
-    }
-
-    /// <summary>
-    /// 数据类型枚举
-    /// </summary>
-    public enum EDataType
-    {
-        Bool = 1,
-        Byte = 2,
-        Int = 3,
-        Word = 4,
-        Dint = 5,
-        Dword = 6,
-        Float = 7,
-        Double = 8,
-        String = 9,
-    }
 }

BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml

@@ -47,23 +47,12 @@
                             </TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
                         </StackPanel>
-                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                                <TextBlock.Style>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="Lime"></Setter>
-                                        <Style.Triggers>
-                                            <Trigger Property="Text" Value="异常">
-                                                <Setter Property="Foreground" Value="Red"/>
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
-                    <GroupBox Header="刷卡信息统计" Margin="20,10,0,0"/>
+                    <GroupBox Header="当前操作信息" Margin="20,10,0,0"/>
                     <Grid Height="160">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
@@ -71,25 +60,23 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="张三"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="#FFEC3107" FontSize="52" Text="{Binding YCDdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">异常刷卡数</TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="李四"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
-
                 </StackPanel>
-                
+
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
                 <ListBox ItemsSource="{Binding CookTypeListLeft,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="170" Height="100" Margin="20,20,0,0" Content="{Binding Name}"/>
-                                <Button Width="170" Height="100" Margin="20,20,0,0" Content="{Binding Name1}"/>
+                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding Name}"/>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
@@ -105,13 +92,8 @@
             </GroupBox>
 
             <StackPanel Orientation="Horizontal">
-                <GroupBox Margin="5,0,0,0" Height="340" Width="470" Header="今日菜品刷卡统计图" Style="{DynamicResource  from}">
-                    <StackPanel>
-                        <con:BasicBarChart Margin="30,40,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" SeriesArray="{Binding Histogram,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="410" Height="200" ShowSize="50"></con:BasicBarChart>
-                    </StackPanel>
-                </GroupBox>
 
-                <GroupBox Margin="10,0,0,0" Height="340" Width="470" Header="设备告警详情" Style="{DynamicResource  from}">
+                <GroupBox Margin="5,0,0,0" Height="340" Width="950" Header="设备告警详情" Style="{DynamicResource  from}">
                     <DataGrid Margin="0,10,0,0" ItemsSource="{Binding AlarmList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                         <DataGrid.Columns>
                             <DataGridTemplateColumn Width="160">
@@ -165,23 +147,12 @@
                             </TextBlock>
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
                         </StackPanel>
-                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                                <TextBlock.Style>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="Lime"></Setter>
-                                        <Style.Triggers>
-                                            <Trigger Property="Text" Value="异常">
-                                                <Setter Property="Foreground" Value="Red"/>
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
                         </StackPanel>
                     </Grid>
-                    <GroupBox Header="刷卡信息统计" Margin="20,10,0,0"/>
+                    <GroupBox Header="当前操作信息" Margin="20,10,0,0"/>
                     <Grid Height="160">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
@@ -189,25 +160,22 @@
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日刷卡数</TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="张三"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">前一位刷卡人</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="#FFEC3107" FontSize="52" Text="{Binding YCDdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">异常刷卡数</TextBlock>
+                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="Lime" FontSize="52" Text="李四"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前刷卡人</TextBlock>
                         </StackPanel>
                     </Grid>
-
                 </StackPanel>
-
             </GroupBox>
             <GroupBox Margin="0,20,10,0" Height="480" Width="450" Header="今日菜品列表"  Style="{DynamicResource  from}"  Tag="Start">
                 <ListBox ItemsSource="{Binding CookTypeListReit,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <WrapPanel>
-                                <Button Width="170" Height="100" Margin="20,20,0,0" Content="{Binding Name}"/>
-                                <Button Width="170" Height="100" Margin="20,20,0,0" Content="{Binding Name1}"/>
+                                <Button Width="370" Height="100" Margin="20,20,0,0" FontSize="60" Content="{Binding Name}"/>
                             </WrapPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>

BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControl.xaml

@@ -63,111 +63,122 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
                         </StackPanel>
                     </Grid>
-                    <GroupBox Header="订单信息统计" Margin="20,10,0,0"/>
+                    <GroupBox Header="正在炒制菜品" Margin="20,10,0,0"/>
                     <Grid Height="100">
+                        <TextBlock FontSize="60" Foreground="#FFD2C106">炒制作中</TextBlock>
+                    </Grid>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程"  Style="{DynamicResource  from}"  Tag="Start">
+
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前状态"  Style="{DynamicResource  from}"  Tag="Start">
+                <StackPanel>
+                    <Grid Height="100" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅加热挡位</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="#FFEC3107" FontSize="52" Text="{Binding YCDdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">异常订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅搅拌挡位</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅翻转速度</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前锅底温度</TextBlock>
                         </StackPanel>
                     </Grid>
-
                 </StackPanel>
             </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="待制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="60">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="120">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="160">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="状态" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding MakeStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
+        </StackPanel>
+
+        <StackPanel Grid.Column="1" >
+            <GroupBox Height="600" Width="950" Margin="0,10,0,20" Header="广告区域" HorizontalAlignment="Center" VerticalAlignment="Top" Style="{DynamicResource  from}"  Tag="Start">
+                <Grid>
+                    <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                </Grid>
             </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="已制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeListOver,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+
+            <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
+                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding AlarmList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="50">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
+                        <DataGridTemplateColumn Width="160">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
+                                <TextBlock Text="告警时间" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
+                                    <TextBlock Margin="0,5,0,5" Text="{Binding AlarmTime}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
+                        <DataGridTemplateColumn Width="*">
                             <DataGridTemplateColumn.Header>
-                                <TextBlock Text="结束时间" Foreground="White"/>
+                                <TextBlock Text="告警描述" Foreground="White"/>
                             </DataGridTemplateColumn.Header>
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StopTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
+                                    <TextBlock Margin="0,5,0,5" Text="{Binding AlarmMs}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
@@ -175,74 +186,11 @@
                 </DataGrid>
             </GroupBox>
         </StackPanel>
-
-        <StackPanel Grid.Column="1" >
-            <GroupBox Height="600" Width="950" Margin="0,10,0,20" Header="广告区域" HorizontalAlignment="Center" VerticalAlignment="Top" Style="{DynamicResource  from}"  Tag="Start">
-                <Grid>
-                    <wv2:WebView2 Name="webView" Source="{Binding GgAdder,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-                </Grid>
-            </GroupBox>
-
-            <StackPanel Orientation="Horizontal">
-                <GroupBox Margin="5,0,0,0" Height="340" Width="470" Header="2号炒锅告警信息" Style="{DynamicResource  from}">
-                    <DataGrid Margin="0,10,0,0" ItemsSource="{Binding AlarmList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                        <DataGrid.Columns>
-                            <DataGridTemplateColumn Width="160">
-                                <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警时间" Foreground="White"/>
-                                </DataGridTemplateColumn.Header>
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Margin="0,5,0,5" Text="{Binding AlarmTime}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                            <DataGridTemplateColumn Width="300">
-                                <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警描述" Foreground="White"/>
-                                </DataGridTemplateColumn.Header>
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Margin="0,5,0,5" Text="{Binding AlarmMs}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </GroupBox>
-                <GroupBox Margin="10,0,0,0" Height="340" Width="470" Header="1号炒锅告警信息" Style="{DynamicResource  from}">
-                    <DataGrid Margin="0,10,0,0" ItemsSource="{Binding AlarmList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                        <DataGrid.Columns>
-                            <DataGridTemplateColumn Width="160">
-                                <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警时间" Foreground="White"/>
-                                </DataGridTemplateColumn.Header>
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Margin="0,5,0,5" Text="{Binding AlarmTime}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                            <DataGridTemplateColumn Width="300">
-                                <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警描述" Foreground="White"/>
-                                </DataGridTemplateColumn.Header>
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Margin="0,5,0,5" Text="{Binding AlarmMs}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </GroupBox>
-            </StackPanel>
-        </StackPanel>
       
         <StackPanel Grid.Column="2"  Margin="0,10,0,0">
             <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="370" Width="450" Header="1 号炒锅" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
-                    <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
+                    <GroupBox Header="设备运行状态" Margin="20,10,0,0"/>
                     <Grid Height="100" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
@@ -280,117 +228,93 @@
                             <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
                         </StackPanel>
                     </Grid>
-                    <GroupBox Header="订单信息统计" Margin="20,10,0,0"/>
+                    <GroupBox Header="炒锅运行情况" Margin="20,10,0,0"/>
                     <Grid Height="100">
+                        <TextBlock FontSize="60" Foreground="#FFD2C106">炒制作中</TextBlock>
+                    </Grid>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程"  Style="{DynamicResource  from}"  Tag="Start">
+                
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前状态"  Style="{DynamicResource  from}"  Tag="Start">
+                <StackPanel>
+                    <Grid Height="100" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅加热挡位</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="#FFEC3107" FontSize="52" Text="{Binding YCDdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">异常订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅搅拌挡位</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅翻转速度</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前锅底温度</TextBlock>
                         </StackPanel>
                     </Grid>
-
                 </StackPanel>
             </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="待制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="60">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="120">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="160">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="状态" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding MakeStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="已制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeListOver,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="50">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="结束时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StopTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </GroupBox>
         </StackPanel>
     </Grid>
 </UserControl>

BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml

@@ -25,7 +25,45 @@
         <StackPanel Margin="0,10,0,0">
             <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="370" Width="450" Header="2 号炒锅" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
-                    <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
+                    <GroupBox Header="设备运行状态" Margin="20,10,0,0"/>
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
+                        </StackPanel>
+
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日订单数</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <GroupBox Header="炒锅运行情况" Margin="20,10,0,0"/>
+                    <Grid Height="100">
+                        <TextBlock FontSize="60" Foreground="#FFD2C106">炒制作中</TextBlock>
+                    </Grid>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程"  Style="{DynamicResource  from}"  Tag="Start">
+
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前状态"  Style="{DynamicResource  from}"  Tag="Start">
+                <StackPanel>
                     <Grid Height="100" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
@@ -45,7 +83,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅加热挡位</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
                             <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
@@ -60,120 +98,48 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅搅拌挡位</TextBlock>
                         </StackPanel>
                     </Grid>
-                    <GroupBox Header="订单信息统计" Margin="20,10,0,0"/>
-                    <Grid Height="100">
+                    <Grid Height="100" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅翻转速度</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="#FFEC3107" FontSize="52" Text="{Binding YCDdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">异常订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前锅底温度</TextBlock>
                         </StackPanel>
                     </Grid>
-
                 </StackPanel>
             </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="待制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="60">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="120">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="160">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="状态" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding MakeStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="已制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeListOver,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="50">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="结束时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StopTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </GroupBox>
         </StackPanel>
 
         <StackPanel Grid.Column="1" >
@@ -184,33 +150,7 @@
             </GroupBox>
 
             <StackPanel Orientation="Horizontal">
-                <GroupBox Margin="5,0,0,0" Height="340" Width="470" Header="2号炒锅告警信息" Style="{DynamicResource  from}">
-                    <DataGrid Margin="0,10,0,0" ItemsSource="{Binding AlarmList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                        <DataGrid.Columns>
-                            <DataGridTemplateColumn Width="160">
-                                <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警时间" Foreground="White"/>
-                                </DataGridTemplateColumn.Header>
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Margin="0,5,0,5" Text="{Binding AlarmTime}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                            <DataGridTemplateColumn Width="300">
-                                <DataGridTemplateColumn.Header>
-                                    <TextBlock Text="告警描述" Foreground="White"/>
-                                </DataGridTemplateColumn.Header>
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Margin="0,5,0,5" Text="{Binding AlarmMs}" Foreground="#FFD86E03" FontSize="14" HorizontalAlignment="Center"/>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </GroupBox>
-                <GroupBox Margin="10,0,0,0" Height="340" Width="470" Header="1号炒锅告警信息" Style="{DynamicResource  from}">
+                <GroupBox Margin="0,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
                     <DataGrid Margin="0,10,0,0" ItemsSource="{Binding AlarmList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                         <DataGrid.Columns>
                             <DataGridTemplateColumn Width="160">
@@ -223,7 +163,7 @@
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                            <DataGridTemplateColumn Width="300">
+                            <DataGridTemplateColumn Width="*">
                                 <DataGridTemplateColumn.Header>
                                     <TextBlock Text="告警描述" Foreground="White"/>
                                 </DataGridTemplateColumn.Header>
@@ -242,7 +182,45 @@
         <StackPanel Grid.Column="2"  Margin="0,10,0,0">
             <GroupBox Grid.Row="0" Margin="10,0,10,0"  Height="370" Width="450" Header="1 号炒锅" Style="{DynamicResource  from}" Tag="Start">
                 <StackPanel>
-                    <GroupBox Header="设备运行情况" Margin="20,10,0,0"/>
+                    <GroupBox Header="设备运行状态" Margin="20,10,0,0"/>
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
+                        </StackPanel>
+
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日订单数</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <GroupBox Header="炒锅运行情况" Margin="20,10,0,0"/>
+                    <Grid Height="100">
+                        <TextBlock FontSize="60" Foreground="#FFD2C106">炒制作中</TextBlock>
+                    </Grid>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程"  Style="{DynamicResource  from}"  Tag="Start">
+
+            </GroupBox>
+            <GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前状态"  Style="{DynamicResource  from}"  Tag="Start">
+                <StackPanel>
                     <Grid Height="100" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
@@ -262,7 +240,7 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备是否运行</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅加热挡位</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
                             <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
@@ -277,120 +255,48 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">设备当前状态</TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅搅拌挡位</TextBlock>
                         </StackPanel>
                     </Grid>
-                    <GroupBox Header="订单信息统计" Margin="20,10,0,0"/>
-                    <Grid Height="100">
+                    <Grid Height="100" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" FontSize="52" Foreground="#FFD2C106" Text="{Binding DdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">今日订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="停止">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">炒锅翻转速度</TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <TextBlock Style="{DynamicResource 数码管Text}" Foreground="#FFEC3107" FontSize="52" Text="{Binding YCDdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">异常订单数</TextBlock>
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="异常">
+                                                <Setter Property="Foreground" Value="Red"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">当前锅底温度</TextBlock>
                         </StackPanel>
                     </Grid>
-
                 </StackPanel>
             </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="待制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="60">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="120">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="160">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="状态" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding MakeStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding foreground,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </GroupBox>
-            <GroupBox Margin="0,20,10,0" Height="275" Width="450" Header="已制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeListOver,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="50">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="结束时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StopTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </GroupBox>
         </StackPanel>
     </Grid>
 </UserControl>

BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml

@@ -118,13 +118,8 @@
             </GroupBox>
 
             <StackPanel Orientation="Horizontal">
-                <GroupBox Margin="5,0,0,0" Height="340" Width="470" Header="今日商品统计图" Style="{DynamicResource  from}">
-                    <StackPanel>
-                        <con:BasicBarChart Margin="30,40,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" SeriesArray="{Binding Histogram,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="410" Height="200" ShowSize="50"></con:BasicBarChart>
-                    </StackPanel>
-                </GroupBox>
 
-                <GroupBox Margin="10,0,0,0" Height="340" Width="470" Header="设备告警详情" Style="{DynamicResource  from}">
+                <GroupBox Margin="5,0,0,0" Height="340" Width="950" Header="告警信息展示区域" Style="{DynamicResource  from}">
                     <DataGrid Margin="0,10,0,0" ItemsSource="{Binding AlarmList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                         <DataGrid.Columns>
                             <DataGridTemplateColumn Width="160">
@@ -137,7 +132,7 @@
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
-                            <DataGridTemplateColumn Width="300">
+                            <DataGridTemplateColumn Width="*">
                                 <DataGridTemplateColumn.Header>
                                     <TextBlock Text="告警描述" Foreground="White"/>
                                 </DataGridTemplateColumn.Header>
@@ -167,55 +162,201 @@
                     </StackPanel>
                     <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
                         <TextBlock Style="{DynamicResource 数码管Text}" Foreground="#FFEC3107" FontSize="52" Text="{Binding YCDdCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                        <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">异常订单数</TextBlock>
+                        <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">机器人当前状态</TextBlock>
                     </StackPanel>
                 </Grid>
             </GroupBox>
-            <GroupBox Margin="10,20,0,0" Height="780" Width="450" Header="已制作订单列表"  Style="{DynamicResource  from}"  Tag="Start">
-                <DataGrid Margin="0,10,0,0" ItemsSource="{Binding OrderMakeListOver,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="50">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="订单号" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding SortNum,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="80">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="商品名称" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding GoodName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="开始时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StartTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="145">
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="结束时间" Foreground="White"/>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock Margin="0,5,0,5" Text="{Binding StopTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Center"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
+            <GroupBox Margin="10,20,0,0" Height="780" Width="450" Header="设备当前状态"  Style="{DynamicResource  from}"  Tag="Start">
+                <StackPanel>
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">煮面炉1号</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">煮面炉2号</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">煮面炉1号</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">煮面炉2号</TextBlock>
+                        </StackPanel>
+                    </Grid>
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">煮面炉5号</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">煮面炉6号</TextBlock>
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">温度状态</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">料仓位置</TextBlock>
+                        </StackPanel>
+                    </Grid>
+
+                    <Grid Height="100" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="{DynamicResource 竖线}" Height="100" Width="2"></Border>
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center" FontSize="42" Text="{Binding DevIsRun,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">料仓上下物料检测</TextBlock>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock HorizontalAlignment="Center"  FontSize="42" Text="{Binding RunStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Foreground" Value="Lime"></Setter>
+                                        <Style.Triggers>
+                                            <Trigger Property="Text" Value="下降">
+                                                <Setter Property="Foreground" Value="#FFD2C106"/>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">落碗机构缺碗检测</TextBlock>
+                        </StackPanel>
+                    </Grid>
+
+                </StackPanel>
             </GroupBox>
         </StackPanel>
     </Grid>

BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs

@@ -187,9 +187,6 @@ namespace BPASmartClient.ScreenLib
                 }));
                 Thread.Sleep(5000);
             }), $"{DateTime.Now},线程服务");
-
-
-            
         }
 
         /// <summary>
@@ -199,113 +196,116 @@ namespace BPASmartClient.ScreenLib
         {
             string Dev = "MorkS";//当前设备名称
             string name = Main.GetInstance.PZdic.ContainsKey($"{Dev}_Name") ? Main.GetInstance.PZdic[$"{Dev}_Name"].ToString(): DateTime.Now.ToString();
-            ThreadManage.GetInstance().StartLong(new Action(() =>
-            {
-                System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
-                {
-                    if (!string.IsNullOrEmpty(name) && Main.GetInstance.redisDatasDic != null && Main.GetInstance.redisDatasDic.ContainsKey(name) && Main.GetInstance.redisDatasDic[name]!=null)
-                    {
-                        List<string> list=new List<string> { "IsRun", "RunStatus", "OrderCount", "ErrorOrderCount", "OrderMakeList", "OrderMakeListOver", "AlarmList" };
-                        list?.ForEach(x => {
-                            if (Main.GetInstance.PZdic.ContainsKey($"{Dev}_{x}"))
-                            {
-                                if (Main.GetInstance.redisDatasDic[name].ContainsKey(Main.GetInstance.PZdic[$"{Dev}_{x}"]))
-                                {
-                                    string _value = Main.GetInstance.redisDatasDic[name][Main.GetInstance.PZdic[$"{Dev}_{x}"]].VarVaule;
-                                    #region 执行更新界面数据
-                                    switch (x)
-                                    {
-                                        case "IsRun"://是否运行
-                                            DevIsRun = _value == "0" ? DevIsRun.停止 : DevIsRun.运行;
-                                            break;
-                                        case "RunStatus"://运行状态
-                                            DevIsRun = _value == "0" ? DevIsRun.停止 : DevIsRun.运行;
-                                            break;
-                                        case "OrderCount"://是否运行
-                                            try
-                                            {
-                                                DdCount = int.Parse(_value);
-                                            }
-                                            catch (Exception ex)
-                                            {
-                                                DdCount = 0;
-                                            }
-                                            break;
-                                        case "ErrorOrderCount":
-                                            try
-                                            {
-                                                YCDdCount = int.Parse(_value);
-                                            }
-                                            catch (Exception ex)
-                                            {
-                                                YCDdCount = 0;
-                                            }
-                                            break;
-                                        case "OrderMakeList":
-                                            try
-                                            {
-                                                OrderMakeList = new ObservableCollection<OrderMakeModel>();
-                                                JsonConvert.DeserializeObject<List<OrderMakeModel>>(_value)?.OrderBy(l => l.SortNum)?.ToList().ForEach(par => {
-                                                    OrderMakeList.Add(par);
-                                                });
-                                            }
-                                            catch (Exception ex)
-                                            {
-                                                OrderMakeList = new ObservableCollection<OrderMakeModel>();
-                                            }
-                                            break;
-                                        case "OrderMakeListOver":
-                                            try
-                                            {
-                                                OrderMakeListOver = new ObservableCollection<OrderMakeModel>();
-                                                JsonConvert.DeserializeObject<List<OrderMakeModel>>(_value)?.OrderBy(l => l.SortNum)?.ToList().ForEach(par => {
-                                                    OrderMakeListOver.Add(par);
-                                                });
-                                            }
-                                            catch (Exception ex)
-                                            {
-                                                OrderMakeListOver = new ObservableCollection<OrderMakeModel>();
-                                            }
-                                            break;
-                                        case "AlarmList":
-                                            try
-                                            {
-                                                AlarmList = new ObservableCollection<AlarmMsModel>();
-                                                JsonConvert.DeserializeObject<List<AlarmMsModel>>(_value)?.OrderBy(l => l.AlarmTime)?.ToList().ForEach(par => {
-                                                    AlarmList.Add(par);
-                                                });
+            //ThreadManage.GetInstance().StartLong(new Action(() =>
+            //{
+            //    System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
+            //    {
+            //        if (!string.IsNullOrEmpty(name) && Main.GetInstance.redisDatasDic != null && Main.GetInstance.redisDatasDic.ContainsKey(name) && Main.GetInstance.redisDatasDic[name]!=null)
+            //        {
+            //            List<string> list=new List<string> { "IsRun", "RunStatus", "OrderCount", "ErrorOrderCount", "OrderMakeList", "OrderMakeListOver", "AlarmList" };
+            //            list?.ForEach(x => {
+            //                if (Main.GetInstance.PZdic.ContainsKey($"{Dev}_{x}"))
+            //                {
+            //                    if (Main.GetInstance.redisDatasDic[name].ContainsKey(Main.GetInstance.PZdic[$"{Dev}_{x}"]))
+            //                    {
+            //                        string _value = Main.GetInstance.redisDatasDic[name][Main.GetInstance.PZdic[$"{Dev}_{x}"]].VarVaule;
+            //                        #region 执行更新界面数据
+            //                        switch (x)
+            //                        {
+            //                            case "IsRun"://是否运行
+            //                                DevIsRun = _value == "0" ? DevIsRun.停止 : DevIsRun.运行;
+            //                                break;
+            //                            case "RunStatus"://运行状态
+            //                                DevIsRun = _value == "0" ? DevIsRun.停止 : DevIsRun.运行;
+            //                                break;
+            //                            case "OrderCount"://是否运行
+            //                                try
+            //                                {
+            //                                    DdCount = int.Parse(_value);
+            //                                }
+            //                                catch (Exception ex)
+            //                                {
+            //                                    DdCount = 0;
+            //                                }
+            //                                break;
+            //                            case "ErrorOrderCount":
+            //                                try
+            //                                {
+            //                                    YCDdCount = int.Parse(_value);
+            //                                }
+            //                                catch (Exception ex)
+            //                                {
+            //                                    YCDdCount = 0;
+            //                                }
+            //                                break;
+            //                            case "OrderMakeList":
+            //                                try
+            //                                {
+            //                                    OrderMakeList = new ObservableCollection<OrderMakeModel>();
+            //                                    JsonConvert.DeserializeObject<List<OrderMakeModel>>(_value)?.OrderBy(l => l.SortNum)?.ToList().ForEach(par => {
+            //                                        OrderMakeList.Add(par);
+            //                                    });
+            //                                }
+            //                                catch (Exception ex)
+            //                                {
+            //                                    OrderMakeList = new ObservableCollection<OrderMakeModel>();
+            //                                }
+            //                                break;
+            //                            case "OrderMakeListOver":
+            //                                try
+            //                                {
+            //                                    OrderMakeListOver = new ObservableCollection<OrderMakeModel>();
+            //                                    JsonConvert.DeserializeObject<List<OrderMakeModel>>(_value)?.OrderBy(l => l.SortNum)?.ToList().ForEach(par => {
+            //                                        OrderMakeListOver.Add(par);
+            //                                    });
+            //                                    //OrderMakeListOver?.ToList().FindAll(m => m.GoodName).di
+            //                                }
+            //                                catch (Exception ex)
+            //                                {
+            //                                    OrderMakeListOver = new ObservableCollection<OrderMakeModel>();
+            //                                }
+            //                                break;
+            //                            case "AlarmList":
+            //                                try
+            //                                {
+            //                                    AlarmList = new ObservableCollection<AlarmMsModel>();
+            //                                    JsonConvert.DeserializeObject<List<AlarmMsModel>>(_value)?.OrderBy(l => l.AlarmTime)?.ToList().ForEach(par => {
+            //                                        AlarmList.Add(par);
+            //                                    });
+
 
-                                                //Histogram=new 
-                                                //if (AlarmList.Count > 0)
-                                                //{
-                                                    
-                                                //}
-                                            }
-                                            catch (Exception ex)
-                                            {
-                                                OrderMakeListOver = new ObservableCollection<OrderMakeModel>();
-                                            }
-                                            break;
-                                        default:
-                                            break;
-                                    }
-                                    #endregion
+                                                
+            //                                    //Histogram=new 
+            //                                    //if (AlarmList.Count > 0)
+            //                                    //{
 
-                                }
-                            }
+            //                                    //}
+            //                                }
+            //                                catch (Exception ex)
+            //                                {
+            //                                    OrderMakeListOver = new ObservableCollection<OrderMakeModel>();
+            //                                }
+            //                                break;
+            //                            default:
+            //                                break;
+            //                        }
+            //                        #endregion
 
-                        });
-                    }
+            //                    }
+            //                }
+
+            //            });
+            //        }
                     
-                    //Histogram = new[] {
-                    //        new KeyValuePair<string, double>(name_s[0], new Random().Next(0,400)),
-                    //        new KeyValuePair<string, double>(name_s[1],  new Random().Next(0,400)),
-                    //        new KeyValuePair<string, double>(name_s[2],  new Random().Next(0,400)),
-                    //        new KeyValuePair<string, double>(name_s[3],  new Random().Next(0,400)),
-                    //        new KeyValuePair<string, double>(name_s[4],  new Random().Next(0,400))};
-                }));
-                Thread.Sleep(500);
-            }), $"{name},线程服务");
+            //        //Histogram = new[] {
+            //        //        new KeyValuePair<string, double>(name_s[0], new Random().Next(0,400)),
+            //        //        new KeyValuePair<string, double>(name_s[1],  new Random().Next(0,400)),
+            //        //        new KeyValuePair<string, double>(name_s[2],  new Random().Next(0,400)),
+            //        //        new KeyValuePair<string, double>(name_s[3],  new Random().Next(0,400)),
+            //        //        new KeyValuePair<string, double>(name_s[4],  new Random().Next(0,400))};
+            //    }));
+            //    Thread.Sleep(500);
+            //}), $"{name},线程服务");
         }
     }
 }

BPASmartClient.ScreenMaxWok/App.config

@@ -1,188 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<appSettings>
-		<!--Redis配置-->
-		<add key="RedisConnection" value="10.2.1.254,6379,BapAdmin123456.,1"/>
-		<add key="DeviceMC" value="test_1"/>
+		<!--MQTT配置-->
+		<add key="MQTTConnection" value="10.2.1.254,1883,admin,public"/>
+		<!--订阅主题设置：大炒,小炒,分餐机,煮面机-->
+		<add key="DeviceMC" value="大炒,小炒,分餐机,煮面机"/>
 		<add key="GgAdder" value="https://stream7.iqilu.com/10339/upload_transcode/202002/18/20200218114723HDu3hhxqIT.mp4"/>
-
-		<!--变量名称配置-->
-		
-		<!--MorkS 变量配置-->
-		<!--设备名称-->
-		<add key="MorkS_Name"				value="MorkS"/>
-		<!--设备是否运行-->
-		<add key="MorkS_IsRun"				value="IsRun"/>
-		<!--设备运行状态-->
-		<add key="MorkS_RunStatus"			value="RunStatus"/>
-		<!--设备订单数量-->
-		<add key="MorkS_OrderCount"			value="OrderCount"/>
-		<!--设备异常订单数量-->
-		<add key="MorkS_ErrorOrderCount"	value="ErrorOrderCount"/>
-		<!--正在制作订单数据-->
-		<add key="MorkS_OrderMakeList"		value="OrderMakeList"/>
-		<!--制作完成订单数据-->
-		<add key="MorkS_OrderMakeListOver"	value="OrderMakeListOver"/>
-		<!--告警数据-->
-		<add key="MorkS_AlarmList"			value="AlarmList"/>
-
-		<!--大炒 变量配置-->
-		<!--设备名称-->
-		<add key="MaxWok_Name"					value="大炒"/>
-		<!--1号_设备是否运行-->
-		<add key="MaxWok1_IsRun"				value="IsRun"/>
-		<!--1号_设备运行状态-->
-		<add key="MaxWok1_RunStatus"			value="RunStatus"/>
-		<!--1号_设备订单数量-->
-		<add key="MaxWok1_OrderCount"			value="OrderCount"/>
-		<!--1号_设备异常订单数量-->
-		<add key="MaxWok1_ErrorOrderCount"		value="ErrorOrderCount"/>
-		<!--1号_正在制作订单数据-->
-		<add key="MaxWok1_OrderMakeList"		value="OrderMakeList"/>
-		<!--1号_制作完成订单数据-->
-		<add key="MaxWok1_OrderMakeListOver"	value="OrderMakeListOver"/>
-		<!--1号_告警数据-->
-		<add key="MaxWok1_AlarmList"			value="AlarmList"/>
-		<!--2号_设备是否运行-->
-		<add key="MaxWok2_IsRun"				value="IsRun_1"/>
-		<!--2号_设备运行状态-->
-		<add key="MaxWok2_RunStatus"			value="RunStatus_1"/>
-		<!--2号_设备订单数量-->
-		<add key="MaxWok2_OrderCount"			value="OrderCount_1"/>
-		<!--2号_设备异常订单数量-->
-		<add key="MaxWok2_ErrorOrderCount"		value="ErrorOrderCount_1"/>
-		<!--2号_正在制作订单数据-->
-		<add key="MaxWok2_OrderMakeList"		value="OrderMakeList_1"/>
-		<!--2号_制作完成订单数据-->
-		<add key="MaxWok2_OrderMakeListOver"	value="OrderMakeListOver_1"/>
-		<!--2号_告警数据-->
-		<add key="MaxWok2_AlarmList"			value="AlarmList_1"/>
-
-		<!--小炒 变量配置-->
-		<!--设备名称-->
-		<add key="MinWok_Name"					value="小炒"/>
-		<!--1号_设备是否运行-->
-		<add key="MinWok1_IsRun"				value="IsRun"/>
-		<!--1号_设备运行状态-->
-		<add key="MinWok1_RunStatus"			value="RunStatus"/>
-		<!--1号_设备订单数量-->
-		<add key="MinWok1_OrderCount"			value="OrderCount"/>
-		<!--1号_设备异常订单数量-->
-		<add key="MinWok1_ErrorOrderCount"		value="ErrorOrderCount"/>
-		<!--1号_正在制作订单数据-->
-		<add key="MinWok1_OrderMakeList"		value="OrderMakeList"/>
-		<!--1号_制作完成订单数据-->
-		<add key="MinWok1_OrderMakeListOver"	value="OrderMakeListOver"/>
-		<!--1号_告警数据-->
-		<add key="MinWok1_AlarmList"			value="AlarmList"/>
-		<!--2号_设备是否运行-->
-		<add key="MinWok2_IsRun"				value="IsRun_1"/>
-		<!--2号_设备运行状态-->
-		<add key="MinWok2_RunStatus"			value="RunStatus_1"/>
-		<!--2号_设备订单数量-->
-		<add key="MinWok2_OrderCount"			value="OrderCount_1"/>
-		<!--2号_设备异常订单数量-->
-		<add key="MinWok2_ErrorOrderCount"		value="ErrorOrderCount_1"/>
-		<!--2号_正在制作订单数据-->
-		<add key="MinWok2_OrderMakeList"		value="OrderMakeList_1"/>
-		<!--2号_制作完成订单数据-->
-		<add key="MinWok2_OrderMakeListOver"	value="OrderMakeListOver_1"/>
-		<!--2号_告警数据-->
-		<add key="MinWok2_AlarmList"			value="AlarmList_1"/>
-
-		<!--分餐机 变量配置-->
-		<!--设备名称-->
-		<add key="SplitMeals_Name"					value="分餐机"/>
-		<!--1号_设备是否运行-->
-		<add key="SplitMeals1_IsRun"				value="IsRun_1"/>
-		<!--1号_设备运行状态-->
-		<add key="SplitMeals1_RunStatus"			value="RunStatus_1"/>
-		<!--1号_设备刷卡数量-->
-		<add key="SplitMeals1_OrderCount"			value="OrderCount_1"/>
-		<!--1号_设备异常刷卡数量-->
-		<add key="SplitMeals1_ErrorOrderCount"		value="ErrorOrderCount_1"/>
-		<!--1号_菜品集合-->
-		<add key="SplitMeals1_CookTypeList"		    value="CookTypeList_1"/>
-		<!--1号_菜品统计集合-->
-		<add key="SplitMeals1_CookStatsList"	    value="CookStatsList_1"/>
-		<!--1号_告警数据-->
-		<add key="SplitMeals1_AlarmList"			value="AlarmList_1"/>
-
-		<!--2号_设备是否运行-->
-		<add key="SplitMeals2_IsRun"				value="IsRun_2"/>
-		<!--2号_设备运行状态-->
-		<add key="SplitMeals2_RunStatus"			value="RunStatus_2"/>
-		<!--2号_设备刷卡数量-->
-		<add key="SplitMeals2_OrderCount"			value="OrderCount_2"/>
-		<!--2号_设备异常刷卡数量-->
-		<add key="SplitMeals2_ErrorOrderCount"		value="ErrorOrderCount_2"/>
-		<!--2号_菜品集合-->
-		<add key="SplitMeals2_CookTypeList"		    value="CookTypeList_2"/>
-		<!--2号_菜品统计集合-->
-		<add key="SplitMeals2_CookStatsList"	    value="CookStatsList_2"/>
-		<!--2号_告警数据-->
-		<add key="SplitMeals2_AlarmList"			value="AlarmList_2"/>
-
-		<!--3号_设备是否运行-->
-		<add key="SplitMeals3_IsRun"				value="IsRun_3"/>
-		<!--3号_设备运行状态-->
-		<add key="SplitMeals3_RunStatus"			value="RunStatus_3"/>
-		<!--3号_设备刷卡数量-->
-		<add key="SplitMeals3_OrderCount"			value="OrderCount_3"/>
-		<!--3号_设备异常刷卡数量-->
-		<add key="SplitMeals3_ErrorOrderCount"		value="ErrorOrderCount_3"/>
-		<!--3号_菜品集合-->
-		<add key="SplitMeals3_CookTypeList"		    value="CookTypeList_3"/>
-		<!--3号_菜品统计集合-->
-		<add key="SplitMeals3_CookStatsList"	    value="CookStatsList_3"/>
-		<!--3号_告警数据-->
-		<add key="SplitMeals3_AlarmList"			value="AlarmList_3"/>
-
-		<!--4号_设备是否运行-->
-		<add key="SplitMeals4_IsRun"				value="IsRun_4"/>
-		<!--4号_设备运行状态-->
-		<add key="SplitMeals4_RunStatus"			value="RunStatus_4"/>
-		<!--4号_设备刷卡数量-->
-		<add key="SplitMeals4_OrderCount"			value="OrderCount_4"/>
-		<!--4号_设备异常刷卡数量-->
-		<add key="SplitMeals4_ErrorOrderCount"		value="ErrorOrderCount_4"/>
-		<!--4号_菜品集合-->
-		<add key="SplitMeals4_CookTypeList"		    value="CookTypeList_4"/>
-		<!--4号_菜品统计集合-->
-		<add key="SplitMeals4_CookStatsList"	    value="CookStatsList_4"/>
-		<!--4号_告警数据-->
-		<add key="SplitMeals4_AlarmList"			value="AlarmList_4"/>
-
-		<!--5号_设备是否运行-->
-		<add key="SplitMeals5_IsRun"				value="IsRun_5"/>
-		<!--5号_设备运行状态-->
-		<add key="SplitMeals5_RunStatus"			value="RunStatus_5"/>
-		<!--5号_设备刷卡数量-->
-		<add key="SplitMeals5_OrderCount"			value="OrderCount_5"/>
-		<!--5号_设备异常刷卡数量-->
-		<add key="SplitMeals5_ErrorOrderCount"		value="ErrorOrderCount_5"/>
-		<!--5号_菜品集合-->
-		<add key="SplitMeals5_CookTypeList"		    value="CookTypeList_5"/>
-		<!--5号_菜品统计集合-->
-		<add key="SplitMeals5_CookStatsList"	    value="CookStatsList_5"/>
-		<!--5号_告警数据-->
-		<add key="SplitMeals5_AlarmList"			value="AlarmList_5"/>
-
-		<!--6号_设备是否运行-->
-		<add key="SplitMeals6_IsRun"				value="IsRun_6"/>
-		<!--6号_设备运行状态-->
-		<add key="SplitMeals6_RunStatus"			value="RunStatus_6"/>
-		<!--6号_设备刷卡数量-->
-		<add key="SplitMeals6_OrderCount"			value="OrderCount_6"/>
-		<!--6号_设备异常刷卡数量-->
-		<add key="SplitMeals6_ErrorOrderCount"		value="ErrorOrderCount_6"/>
-		<!--6号_菜品集合-->
-		<add key="SplitMeals6_CookTypeList"		    value="CookTypeList_6"/>
-		<!--6号_菜品统计集合-->
-		<add key="SplitMeals6_CookStatsList"	    value="CookStatsList_6"/>
-		<!--6号_告警数据-->
-		<add key="SplitMeals6_AlarmList"			value="AlarmList_6"/>
-		
-
 	</appSettings>
 </configuration>