@@ -77,8 +77,26 @@ | |||
</GroupBox> | |||
<GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程" Style="{DynamicResource from}" Tag="Start"> | |||
<Grid> | |||
<!--<Grid Margin="0,10,0,0" Height="100" Width="130" VerticalAlignment="Top" HorizontalAlignment="Left"> | |||
<Grid.ColumnDefinitions> | |||
<ColumnDefinition Width="*"/> | |||
<ColumnDefinition Width="30"/> | |||
</Grid.ColumnDefinitions> | |||
<Border Background="{DynamicResource 椭圆}" > | |||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> | |||
<TextBlock x:Name="wb" FontSize="32" Text="{Binding Name}"></TextBlock> | |||
<TextBlock x:Name="xs" Style="{DynamicResource 数码管Text}" FontSize="24" Margin="0,0,0,0" Text="{Binding Id}"></TextBlock> | |||
</StackPanel> | |||
</Border> | |||
<Border Background="Red" Margin="10"> | |||
</Border> | |||
<Image x:Name="image" Grid.Column="1" Style="{DynamicResource image右1}" Cursor="Hand" ></Image> | |||
</Grid>--> | |||
<ListBox x:Name="PageList" BorderThickness="0" Margin="0,-20,0,0" Height="270" HorizontalAlignment="Stretch" VerticalAlignment="Top" | |||
ItemsSource="{Binding ViewData.MaxWok_Process_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
ItemsSource="{Binding ProcessModel1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" > | |||
<ListBox.ItemsPanel> | |||
<ItemsPanelTemplate> | |||
@@ -97,12 +115,19 @@ | |||
<DiscreteObjectKeyFrame KeyTime="00:00:2" Value="{x:Static Visibility.Visible}"/> | |||
</ObjectAnimationUsingKeyFrames> | |||
</Storyboard> | |||
<Storyboard RepeatBehavior="Forever" x:Key="csd_kaishi"> | |||
<ThicknessAnimationUsingKeyFrames Storyboard.TargetName="kaishi" Storyboard.TargetProperty="Margin" BeginTime="00:00:00"> | |||
<SplineThicknessKeyFrame KeyTime="00:00:00" Value="0" /> | |||
<SplineThicknessKeyFrame KeyTime="00:00:2" Value="-30" /> | |||
</ThicknessAnimationUsingKeyFrames> | |||
</Storyboard> | |||
</DataTemplate.Resources> | |||
<Grid Margin="0,10,0,0" Height="100" Width="130" VerticalAlignment="Top" HorizontalAlignment="Left"> | |||
<Grid.ColumnDefinitions> | |||
<ColumnDefinition Width="*"/> | |||
<ColumnDefinition Width="30"/> | |||
</Grid.ColumnDefinitions> | |||
<Border x:Name="kaishi" Background="{DynamicResource 椭圆}" BorderBrush="Aqua" Margin="60"/> | |||
<Border Background="{DynamicResource 椭圆}" > | |||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> | |||
<TextBlock x:Name="wb" FontSize="32" Text="{Binding Name}"></TextBlock> | |||
@@ -117,11 +142,13 @@ | |||
<Setter TargetName="wb" Property="Foreground" Value="lime"/> | |||
<DataTrigger.EnterActions> | |||
<BeginStoryboard x:Name="begin_name" Storyboard="{StaticResource csd_dh}"/> | |||
<BeginStoryboard x:Name="begin_dh" Storyboard="{StaticResource csd_kaishi}"/> | |||
</DataTrigger.EnterActions> | |||
</DataTrigger> | |||
<DataTrigger Binding="{Binding Status}" Value="执行完成"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#FFD2C106"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#FFD2C106"/> | |||
@@ -129,11 +156,12 @@ | |||
<DataTrigger Binding="{Binding Status}" Value="未执行"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#a2c2e8"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#a2c2e8"/> | |||
</DataTrigger> | |||
<DataTrigger Binding="{Binding Id}" Value="4"> | |||
<DataTrigger Binding="{Binding IsLast}" Value="1"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
</DataTrigger.EnterActions> | |||
@@ -272,7 +300,7 @@ | |||
<GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程" Style="{DynamicResource from}" Tag="Start"> | |||
<Grid> | |||
<ListBox BorderThickness="0" Margin="0,-20,0,0" Height="270" HorizontalAlignment="Stretch" VerticalAlignment="Top" | |||
ItemsSource="{Binding ViewData.MaxWok_Process_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
ItemsSource="{Binding ProcessModel2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" > | |||
<ListBox.ItemsPanel> | |||
<ItemsPanelTemplate> | |||
@@ -291,12 +319,19 @@ | |||
<DiscreteObjectKeyFrame KeyTime="00:00:2" Value="{x:Static Visibility.Visible}"/> | |||
</ObjectAnimationUsingKeyFrames> | |||
</Storyboard> | |||
<Storyboard RepeatBehavior="Forever" x:Key="csd_kaishi"> | |||
<ThicknessAnimationUsingKeyFrames Storyboard.TargetName="kaishi" Storyboard.TargetProperty="Margin" BeginTime="00:00:00"> | |||
<SplineThicknessKeyFrame KeyTime="00:00:00" Value="0" /> | |||
<SplineThicknessKeyFrame KeyTime="00:00:2" Value="-30" /> | |||
</ThicknessAnimationUsingKeyFrames> | |||
</Storyboard> | |||
</DataTemplate.Resources> | |||
<Grid Margin="0,10,0,0" Height="100" Width="130" VerticalAlignment="Top" HorizontalAlignment="Left"> | |||
<Grid.ColumnDefinitions> | |||
<ColumnDefinition Width="*"/> | |||
<ColumnDefinition Width="30"/> | |||
</Grid.ColumnDefinitions> | |||
<Border x:Name="kaishi" Background="{DynamicResource 椭圆}" BorderBrush="Aqua" Margin="60"/> | |||
<Border Background="{DynamicResource 椭圆}" > | |||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> | |||
<TextBlock x:Name="wb" FontSize="32" Text="{Binding Name}"></TextBlock> | |||
@@ -311,11 +346,13 @@ | |||
<Setter TargetName="wb" Property="Foreground" Value="lime"/> | |||
<DataTrigger.EnterActions> | |||
<BeginStoryboard x:Name="begin_name" Storyboard="{StaticResource csd_dh}"/> | |||
<BeginStoryboard x:Name="begin_dh" Storyboard="{StaticResource csd_kaishi}"/> | |||
</DataTrigger.EnterActions> | |||
</DataTrigger> | |||
<DataTrigger Binding="{Binding Status}" Value="执行完成"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#FFD2C106"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#FFD2C106"/> | |||
@@ -323,11 +360,12 @@ | |||
<DataTrigger Binding="{Binding Status}" Value="未执行"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#a2c2e8"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#a2c2e8"/> | |||
</DataTrigger> | |||
<DataTrigger Binding="{Binding Id}" Value="4"> | |||
<DataTrigger Binding="{Binding IsLast}" Value="1"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
</DataTrigger.EnterActions> | |||
@@ -1,6 +1,7 @@ | |||
using BPA.Helper; | |||
using BPA.Message; | |||
using BPA.Message.Enum; | |||
using Newtonsoft.Json; | |||
using System; | |||
using System.Collections.Generic; | |||
using System.Collections.ObjectModel; | |||
@@ -19,6 +20,7 @@ namespace BPASmartClient.ScreenLib | |||
/// </summary> | |||
public Uri GgAdder { get { return _GgAdder; } set { _GgAdder = value; OnPropertyChanged(); } } | |||
private Uri _GgAdder = new Uri(System.Configuration.ConfigurationManager.AppSettings["GgAdder"].ToString()); | |||
/// <summary> | |||
/// 界面数据绑定 | |||
/// </summary> | |||
@@ -33,6 +35,34 @@ namespace BPASmartClient.ScreenLib | |||
} | |||
private ScreenModelMaxWok _ViewData = new ScreenModelMaxWok(); | |||
/// <summary> | |||
/// 1号炒锅流程 | |||
/// </summary> | |||
public ObservableCollection<ProcessModelForm> ProcessModel1 | |||
{ | |||
get { return _ProcessModel1; } | |||
set | |||
{ | |||
_ProcessModel1 = value; | |||
OnPropertyChanged(); | |||
} | |||
} | |||
private ObservableCollection<ProcessModelForm> _ProcessModel1 = new ObservableCollection<ProcessModelForm>(); | |||
/// <summary> | |||
/// 2号炒锅流程 | |||
/// </summary> | |||
public ObservableCollection<ProcessModelForm> ProcessModel2 | |||
{ | |||
get { return _ProcessModel2; } | |||
set | |||
{ | |||
_ProcessModel2 = value; | |||
OnPropertyChanged(); | |||
} | |||
} | |||
private ObservableCollection<ProcessModelForm> _ProcessModel2 = new ObservableCollection<ProcessModelForm>(); | |||
/// <summary> | |||
/// 当前刷新数据类型 | |||
/// </summary> | |||
@@ -50,6 +80,11 @@ namespace BPASmartClient.ScreenLib | |||
ScreenModelMaxWok modelMaxWok= Main.GetInstance.mqttDatasDic[type] as ScreenModelMaxWok; | |||
if(modelMaxWok != null && modelMaxWok.Alarm!=null) | |||
modelMaxWok.Alarm= modelMaxWok.Alarm?.OrderByDescending(k =>DateTime.Parse(k.AlarmTime)).ToList(); | |||
ProcessModel1=JsonConvert.DeserializeObject<ObservableCollection<ProcessModelForm>>(JsonConvert.SerializeObject(modelMaxWok.MaxWok_Process_1)); | |||
ProcessModel2 = JsonConvert.DeserializeObject<ObservableCollection<ProcessModelForm>>(JsonConvert.SerializeObject(modelMaxWok.MaxWok_Process_2)); | |||
ProcessModel1?.ToList().ForEach(par => { if (par.Id+1 == ProcessModel1.Count) { par.IsLast = 1; } else { par.IsLast = 0; } }); | |||
ProcessModel2?.ToList().ForEach(par => { if (par.Id+1 == ProcessModel2.Count) { par.IsLast = 1; } else { par.IsLast = 0; } }); | |||
ViewData = modelMaxWok; | |||
} | |||
})); | |||
@@ -57,4 +92,16 @@ namespace BPASmartClient.ScreenLib | |||
}), $"{DateTime.Now},线程服务"); | |||
} | |||
} | |||
/// <summary> | |||
/// 是否最后 | |||
/// </summary> | |||
public class ProcessModelForm: ProcessModel | |||
{ | |||
public int IsLast | |||
{ | |||
get; | |||
set; | |||
} | |||
} | |||
} |
@@ -78,7 +78,7 @@ | |||
<GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程" Style="{DynamicResource from}" Tag="Start"> | |||
<Grid> | |||
<ListBox x:Name="PageList" BorderThickness="0" Margin="0,-20,0,0" Height="270" HorizontalAlignment="Stretch" VerticalAlignment="Top" | |||
ItemsSource="{Binding ViewData.MinWok_Process_1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
ItemsSource="{Binding ProcessModel1,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" > | |||
<ListBox.ItemsPanel> | |||
<ItemsPanelTemplate> | |||
@@ -97,12 +97,19 @@ | |||
<DiscreteObjectKeyFrame KeyTime="00:00:2" Value="{x:Static Visibility.Visible}"/> | |||
</ObjectAnimationUsingKeyFrames> | |||
</Storyboard> | |||
<Storyboard RepeatBehavior="Forever" x:Key="csd_kaishi"> | |||
<ThicknessAnimationUsingKeyFrames Storyboard.TargetName="kaishi" Storyboard.TargetProperty="Margin" BeginTime="00:00:00"> | |||
<SplineThicknessKeyFrame KeyTime="00:00:00" Value="0" /> | |||
<SplineThicknessKeyFrame KeyTime="00:00:2" Value="-30" /> | |||
</ThicknessAnimationUsingKeyFrames> | |||
</Storyboard> | |||
</DataTemplate.Resources> | |||
<Grid Margin="0,10,0,0" Height="100" Width="130" VerticalAlignment="Top" HorizontalAlignment="Left"> | |||
<Grid.ColumnDefinitions> | |||
<ColumnDefinition Width="*"/> | |||
<ColumnDefinition Width="30"/> | |||
</Grid.ColumnDefinitions> | |||
<Border x:Name="kaishi" Background="{DynamicResource 椭圆}" BorderBrush="Aqua" Margin="60"/> | |||
<Border Background="{DynamicResource 椭圆}" > | |||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> | |||
<TextBlock x:Name="wb" FontSize="32" Text="{Binding Name}"></TextBlock> | |||
@@ -117,11 +124,13 @@ | |||
<Setter TargetName="wb" Property="Foreground" Value="lime"/> | |||
<DataTrigger.EnterActions> | |||
<BeginStoryboard x:Name="begin_name" Storyboard="{StaticResource csd_dh}"/> | |||
<BeginStoryboard x:Name="begin_dh" Storyboard="{StaticResource csd_kaishi}"/> | |||
</DataTrigger.EnterActions> | |||
</DataTrigger> | |||
<DataTrigger Binding="{Binding Status}" Value="执行完成"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#FFD2C106"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#FFD2C106"/> | |||
@@ -129,17 +138,17 @@ | |||
<DataTrigger Binding="{Binding Status}" Value="未执行"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#a2c2e8"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#a2c2e8"/> | |||
</DataTrigger> | |||
<!--<DataTrigger Binding="{Binding Id}" Value="{Binding DataContext.Count, RelativeSource={RelativeSource AncestorType=ListBox,Mode=FindAncestor}}"> | |||
<DataTrigger Binding="{Binding IsLast}" Value="1"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="image" Property="Visibility" Value="Collapsed"/> | |||
</DataTrigger>--> | |||
</DataTrigger> | |||
</DataTemplate.Triggers> | |||
</DataTemplate> | |||
</ListBox.ItemTemplate> | |||
@@ -273,7 +282,7 @@ | |||
<GroupBox Margin="10,20,10,0" Height="275" Width="450" Header="设备当前流程" Style="{DynamicResource from}" Tag="Start"> | |||
<Grid> | |||
<ListBox BorderThickness="0" Margin="0,-20,0,0" Height="270" HorizontalAlignment="Stretch" VerticalAlignment="Top" | |||
ItemsSource="{Binding ViewData.MinWok_Process_2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
ItemsSource="{Binding ProcessModel2,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" | |||
Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" > | |||
<ListBox.ItemsPanel> | |||
<ItemsPanelTemplate> | |||
@@ -292,12 +301,19 @@ | |||
<DiscreteObjectKeyFrame KeyTime="00:00:2" Value="{x:Static Visibility.Visible}"/> | |||
</ObjectAnimationUsingKeyFrames> | |||
</Storyboard> | |||
<Storyboard RepeatBehavior="Forever" x:Key="csd_kaishi"> | |||
<ThicknessAnimationUsingKeyFrames Storyboard.TargetName="kaishi" Storyboard.TargetProperty="Margin" BeginTime="00:00:00"> | |||
<SplineThicknessKeyFrame KeyTime="00:00:00" Value="0" /> | |||
<SplineThicknessKeyFrame KeyTime="00:00:2" Value="-30" /> | |||
</ThicknessAnimationUsingKeyFrames> | |||
</Storyboard> | |||
</DataTemplate.Resources> | |||
<Grid Margin="0,10,0,0" Height="100" Width="130" VerticalAlignment="Top" HorizontalAlignment="Left"> | |||
<Grid.ColumnDefinitions> | |||
<ColumnDefinition Width="*"/> | |||
<ColumnDefinition Width="30"/> | |||
</Grid.ColumnDefinitions> | |||
<Border x:Name="kaishi" Background="{DynamicResource 椭圆}" BorderBrush="Aqua" Margin="60"/> | |||
<Border Background="{DynamicResource 椭圆}" > | |||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> | |||
<TextBlock x:Name="wb" FontSize="32" Text="{Binding Name}"></TextBlock> | |||
@@ -312,11 +328,13 @@ | |||
<Setter TargetName="wb" Property="Foreground" Value="lime"/> | |||
<DataTrigger.EnterActions> | |||
<BeginStoryboard x:Name="begin_name" Storyboard="{StaticResource csd_dh}"/> | |||
<BeginStoryboard x:Name="begin_dh" Storyboard="{StaticResource csd_kaishi}"/> | |||
</DataTrigger.EnterActions> | |||
</DataTrigger> | |||
<DataTrigger Binding="{Binding Status}" Value="执行完成"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#FFD2C106"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#FFD2C106"/> | |||
@@ -324,11 +342,12 @@ | |||
<DataTrigger Binding="{Binding Status}" Value="未执行"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
<StopStoryboard BeginStoryboardName="begin_dh"/> | |||
</DataTrigger.EnterActions> | |||
<Setter TargetName="xs" Property="Foreground" Value="#a2c2e8"/> | |||
<Setter TargetName="wb" Property="Foreground" Value="#a2c2e8"/> | |||
</DataTrigger> | |||
<DataTrigger Binding="{Binding Id}" Value="4"> | |||
<DataTrigger Binding="{Binding IsLast}" Value="1"> | |||
<DataTrigger.EnterActions> | |||
<StopStoryboard BeginStoryboardName="begin_name"/> | |||
</DataTrigger.EnterActions> | |||
@@ -1,6 +1,7 @@ | |||
using BPA.Helper; | |||
using BPA.Message; | |||
using BPA.Message.Enum; | |||
using Newtonsoft.Json; | |||
using System; | |||
using System.Collections.Generic; | |||
using System.Collections.ObjectModel; | |||
@@ -19,6 +20,7 @@ namespace BPASmartClient.ScreenLib | |||
/// </summary> | |||
public Uri GgAdder { get { return _GgAdder; } set { _GgAdder = value; OnPropertyChanged(); } } | |||
private Uri _GgAdder = new Uri(System.Configuration.ConfigurationManager.AppSettings["GgAdder"].ToString()); | |||
/// <summary> | |||
/// 界面数据绑定 | |||
/// </summary> | |||
@@ -32,7 +34,34 @@ namespace BPASmartClient.ScreenLib | |||
} | |||
} | |||
private ScreenModelMinWok _ViewData = new ScreenModelMinWok(); | |||
/// <summary> | |||
/// 1号炒锅流程 | |||
/// </summary> | |||
public ObservableCollection<ProcessModelForm> ProcessModel1 | |||
{ | |||
get { return _ProcessModel1; } | |||
set | |||
{ | |||
_ProcessModel1 = value; | |||
OnPropertyChanged(); | |||
} | |||
} | |||
private ObservableCollection<ProcessModelForm> _ProcessModel1 = new ObservableCollection<ProcessModelForm>(); | |||
/// <summary> | |||
/// 2号炒锅流程 | |||
/// </summary> | |||
public ObservableCollection<ProcessModelForm> ProcessModel2 | |||
{ | |||
get { return _ProcessModel2; } | |||
set | |||
{ | |||
_ProcessModel2 = value; | |||
OnPropertyChanged(); | |||
} | |||
} | |||
private ObservableCollection<ProcessModelForm> _ProcessModel2 = new ObservableCollection<ProcessModelForm>(); | |||
/// <summary> | |||
/// 当前刷新数据类型 | |||
/// </summary> | |||
@@ -50,6 +79,10 @@ namespace BPASmartClient.ScreenLib | |||
ScreenModelMinWok modelMaxWok = Main.GetInstance.mqttDatasDic[type] as ScreenModelMinWok; | |||
if (modelMaxWok != null && modelMaxWok.Alarm != null) | |||
modelMaxWok.Alarm = modelMaxWok.Alarm?.OrderByDescending(k => DateTime.Parse(k.AlarmTime)).ToList(); | |||
ProcessModel1 = JsonConvert.DeserializeObject<ObservableCollection<ProcessModelForm>>(JsonConvert.SerializeObject(modelMaxWok.MinWok_Process_1)); | |||
ProcessModel2 = JsonConvert.DeserializeObject<ObservableCollection<ProcessModelForm>>(JsonConvert.SerializeObject(modelMaxWok.MinWok_Process_2)); | |||
ProcessModel1?.ToList().ForEach(par => { if (par.Id + 1 == ProcessModel1.Count) { par.IsLast = 1; } else { par.IsLast = 0; } }); | |||
ProcessModel2?.ToList().ForEach(par => { if (par.Id + 1 == ProcessModel2.Count) { par.IsLast = 1; } else { par.IsLast = 0; } }); | |||
ViewData = modelMaxWok; | |||
} | |||
})); | |||
@@ -194,11 +194,11 @@ | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#FFD2C106"></Setter> | |||
<Setter Property="Text" Value="下降"></Setter> | |||
<Setter Property="Text" Value="空闲"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_1}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="上升"></Setter> | |||
<Setter Property="Text" Value="煮面"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</Style> | |||
@@ -211,11 +211,11 @@ | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#FFD2C106"></Setter> | |||
<Setter Property="Text" Value="下降"></Setter> | |||
<Setter Property="Text" Value="空闲"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_2}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="上升"></Setter> | |||
<Setter Property="Text" Value="煮面"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</Style> | |||
@@ -235,11 +235,11 @@ | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#FFD2C106"></Setter> | |||
<Setter Property="Text" Value="下降"></Setter> | |||
<Setter Property="Text" Value="空闲"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_3}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="上升"></Setter> | |||
<Setter Property="Text" Value="煮面"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</Style> | |||
@@ -252,11 +252,11 @@ | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#FFD2C106"></Setter> | |||
<Setter Property="Text" Value="下降"></Setter> | |||
<Setter Property="Text" Value="空闲"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_4}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="上升"></Setter> | |||
<Setter Property="Text" Value="煮面"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</Style> | |||
@@ -276,11 +276,11 @@ | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#FFD2C106"></Setter> | |||
<Setter Property="Text" Value="下降"></Setter> | |||
<Setter Property="Text" Value="空闲"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_5}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="上升"></Setter> | |||
<Setter Property="Text" Value="煮面"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</Style> | |||
@@ -293,11 +293,11 @@ | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#FFD2C106"></Setter> | |||
<Setter Property="Text" Value="下降"></Setter> | |||
<Setter Property="Text" Value="空闲"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoodleUpOrDown_6}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="上升"></Setter> | |||
<Setter Property="Text" Value="煮面"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</Style> | |||
@@ -323,7 +323,7 @@ | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_Temp}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="已开"></Setter> | |||
<Setter Property="Text" Value="100°C"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</Style> | |||
@@ -332,49 +332,51 @@ | |||
<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 ViewData.MorkS_BinLocation}"/> | |||
<TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">料仓位置</TextBlock> | |||
</StackPanel> | |||
</Grid> | |||
<Grid Height="100" Margin="0,10,0,0"> | |||
<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" > | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#a70909"></Setter> | |||
<Setter Property="Text" Value="物料缺失"></Setter> | |||
<Setter Property="Text" Value="缺碗"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_SiloMeas}" Value="true"> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoBowMeas}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="物料充足"></Setter> | |||
<Setter Property="Text" Value="充足"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</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> | |||
<Grid Height="100" Margin="0,10,0,0"> | |||
<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 ViewData.MorkS_BinLocation,StringFormat={}{0} 号}"/> | |||
<TextBlock Style="{DynamicResource textms}" Margin="0,10,0,0">料仓位置</TextBlock> | |||
</StackPanel> | |||
<StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||
<TextBlock HorizontalAlignment="Center" FontSize="42" > | |||
<TextBlock.Style> | |||
<Style TargetType="TextBlock"> | |||
<Setter Property="Foreground" Value="#a70909"></Setter> | |||
<Setter Property="Text" Value="无碗"></Setter> | |||
<Setter Property="Text" Value="缺面"></Setter> | |||
<Style.Triggers> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_NoBowMeas}" Value="true"> | |||
<DataTrigger Binding="{Binding ViewData.MorkS_SiloMeas}" Value="true"> | |||
<Setter Property="Foreground" Value="Lime"/> | |||
<Setter Property="Text" Value="有碗"></Setter> | |||
<Setter Property="Text" Value="充足"></Setter> | |||
</DataTrigger> | |||
</Style.Triggers> | |||
</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> | |||
</StackPanel> | |||