|
|
@@ -11,7 +11,7 @@
|
|
|
xmlns:converterTime="clr-namespace:MECF.Framework.UI.Client.Converter;assembly=MECF.Framework.UI.Client"
|
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
Width="1000"
|
|
|
- Height="780"
|
|
|
+ Height="820"
|
|
|
Background="White"
|
|
|
FontFamily="Segoe"
|
|
|
FontSize="20"
|
|
|
@@ -442,14 +442,7 @@ Text="{Binding DataContext.EditModel.CurrentValue, Mode=TwoWay, RelativeSource={
|
|
|
HorizontalAlignment="Right"
|
|
|
VerticalAlignment="Center"
|
|
|
Text="Maintenance Processing" />
|
|
|
- <!--<TextBox
|
|
|
- Grid.Row="0"
|
|
|
- Grid.Column="1"
|
|
|
- Height="40"
|
|
|
- Margin="5,0"
|
|
|
- FontSize="20"
|
|
|
- Tag="Number"
|
|
|
- Text="{Binding EditModel.StartValue, StringFormat={}{0:000.000}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />-->
|
|
|
+
|
|
|
<StackPanel Grid.Row="0" Grid.Column="1" Height="40" Margin="5,0">
|
|
|
<ContentControl>
|
|
|
<ContentControl.Resources>
|
|
|
@@ -522,7 +515,7 @@ Grid.Column="1"
|
|
|
Height="40"
|
|
|
Margin="5,0"
|
|
|
FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}" SelectedItem="{Binding EditModel.MaintenanceProcessing, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" >
|
|
|
-
|
|
|
+
|
|
|
</ComboBox>
|
|
|
<Button Grid.Row="1" Grid.Column="2" Visibility="{Binding JobAutoStartCommandVisibility,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" Grid.ColumnSpan="2" Width="auto" Content="{Binding EditModel.AssociationProcessRecipeName,UpdateSourceTrigger=PropertyChanged}">
|
|
|
<i:Interaction.Triggers>
|
|
|
@@ -533,13 +526,7 @@ FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}" SelectedItem="{
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</Button>
|
|
|
- <!--<TextBox
|
|
|
- Grid.Row="1"
|
|
|
- Grid.Column="1"
|
|
|
- Height="40"
|
|
|
- Margin="5,0"
|
|
|
- FontSize="20"
|
|
|
- Text="{Binding EditModel.MaintenanceProcessing, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />-->
|
|
|
+
|
|
|
<TextBox
|
|
|
Grid.Row="0"
|
|
|
Grid.Column="2"
|
|
|
@@ -563,6 +550,12 @@ FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}" SelectedItem="{
|
|
|
Padding="5,5,5,0"
|
|
|
Header="Maintenance Limit Value information">
|
|
|
<Grid>
|
|
|
+ <Grid.RowDefinitions>
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="40" />
|
|
|
+ <RowDefinition />
|
|
|
+ <RowDefinition />
|
|
|
+ </Grid.RowDefinitions>
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition Width="240" />
|
|
|
<ColumnDefinition Width="200" />
|
|
|
@@ -570,17 +563,18 @@ FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}" SelectedItem="{
|
|
|
<ColumnDefinition />
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<TextBlock
|
|
|
- Margin="5,0"
|
|
|
- HorizontalAlignment="Right"
|
|
|
- VerticalAlignment="Center"
|
|
|
+ Grid.Row="0"
|
|
|
+Margin="5,0"
|
|
|
+HorizontalAlignment="Right"
|
|
|
+VerticalAlignment="Center"
|
|
|
Text="Maintenance Limit Value" />
|
|
|
- <!--<TextBox
|
|
|
- Grid.Column="1"
|
|
|
- Height="40"
|
|
|
- Margin="5,0"
|
|
|
- FontSize="20"
|
|
|
- Tag="Number"
|
|
|
- Text="{Binding EditModel.LimitValue, StringFormat={}{0:000.000}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />-->
|
|
|
+
|
|
|
+ <TextBlock
|
|
|
+ Grid.Row="1"
|
|
|
+ Margin="5,0"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ Text="Maintenance Processing" />
|
|
|
<StackPanel Grid.Row="0" Grid.Column="1" Height="40" Margin="5,0">
|
|
|
<ContentControl>
|
|
|
<ContentControl.Resources>
|
|
|
@@ -647,6 +641,22 @@ Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={Re
|
|
|
</ContentControl.Style>
|
|
|
</ContentControl>
|
|
|
</StackPanel>
|
|
|
+ <ComboBox x:Name="alarmComBox" Grid.Row="1"
|
|
|
+Grid.Column="1"
|
|
|
+Height="40"
|
|
|
+Margin="5,5,0,0"
|
|
|
+FontSize="20" ItemsSource="{Binding MaintenanceProcessingList}" SelectedItem="{Binding EditModel.MaintenanceProcessing, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" >
|
|
|
+
|
|
|
+ </ComboBox>
|
|
|
+ <Button Grid.Row="1" Grid.Column="2" Margin="5,5,0,0" Visibility="{Binding AlarmJobAutoStartCommandVisibility,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" Grid.ColumnSpan="2" Width="auto" Content="{Binding EditModel.AssociationProcessRecipeName,UpdateSourceTrigger=PropertyChanged}">
|
|
|
+ <i:Interaction.Triggers>
|
|
|
+ <i:EventTrigger EventName="Click">
|
|
|
+ <cal:ActionMessage MethodName="SelectJobRecipe">
|
|
|
+ <cal:Parameter Value="AssociationProcessRecipeName"/>
|
|
|
+ </cal:ActionMessage>
|
|
|
+ </i:EventTrigger>
|
|
|
+ </i:Interaction.Triggers>
|
|
|
+ </Button>
|
|
|
|
|
|
<TextBox
|
|
|
Grid.Column="2"
|
|
|
@@ -700,6 +710,7 @@ Text="{Binding DataContext.EditModel.LimitValue, Mode=TwoWay, RelativeSource={Re
|
|
|
</Style>
|
|
|
</TextBlock.Style>
|
|
|
</TextBlock>
|
|
|
+
|
|
|
</Grid>
|
|
|
</GroupBox>
|
|
|
<Border Grid.Row="5">
|