PM Heater界面的SCR Lower AE温度显示移至PSU Inner AE显示位置。
优化PM Heater界面布局，移除多余的项目。
This commit is contained in:
parent
d94f00a342
commit
c89c1ca41b
|
|
@ -50,6 +50,8 @@
|
|||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="0" />
|
||||
<RowDefinition Height="0" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
|
|
@ -57,7 +59,7 @@
|
|||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="0" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
|
|
@ -306,104 +308,6 @@
|
|||
FontSize="14" />
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="5"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content="SimVoltage (V)"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{Binding PSU1SimVoltageFeedBack}"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="5"
|
||||
Grid.Column="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{Binding PSU2SimVoltageFeedBack}"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="5"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{Binding PSU3SimVoltageFeedBack}"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content="SimCurrent (A)"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Column="1"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{Binding PSU1SimArmsFeedBack}"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Column="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{Binding PSU2SimArmsFeedBack}"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{Binding PSU3SimArmsFeedBack}"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="7"
|
||||
Grid.Column="0"
|
||||
|
|
@ -691,7 +595,7 @@
|
|||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="--" />
|
||||
<TextBlock Text="{Binding L3InputTemp2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
<!--<TextBlock Text="{Binding L1InputTemp, StringFormat=0.00}"-->
|
||||
</Border>
|
||||
|
|
@ -764,52 +668,6 @@
|
|||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="14"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content="VoltageLimited (V)"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="14"
|
||||
Grid.Column="1"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L1VoltageLimited, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="14"
|
||||
Grid.Column="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L2VoltageLimited, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="14"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L3VoltageLimited, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="15"
|
||||
Grid.Column="0"
|
||||
|
|
@ -835,6 +693,81 @@
|
|||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="16"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content=""
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="16"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="" />
|
||||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="17"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content=""
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="17"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="" />
|
||||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="18"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content=""
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="18"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="" />
|
||||
</Label>
|
||||
</Border>
|
||||
|
||||
|
||||
</Grid>
|
||||
|
||||
|
|
@ -1192,7 +1125,7 @@
|
|||
<Grid
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Margin="10,-262,0,0">
|
||||
Margin="10,-267,0,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1" />
|
||||
<RowDefinition Height="35" />
|
||||
|
|
@ -2028,10 +1961,7 @@
|
|||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="60" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="150" />
|
||||
|
|
@ -2597,146 +2527,9 @@
|
|||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content="AETemp (℃)"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Grid.Column="1"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L1InputTemp2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Grid.Column="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L2InputTemp2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L3InputTemp2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="11"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content="PV (℃)"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="11"
|
||||
Grid.Column="1"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L1PV2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="11"
|
||||
Grid.Column="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L2PV2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="11"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L3PV2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="12"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1">
|
||||
<Label
|
||||
HorizontalContentAlignment="Right"
|
||||
Content="VoltageLimited (V)"
|
||||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="12"
|
||||
Grid.Column="1"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L1VoltageLimited2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="12"
|
||||
Grid.Column="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L2VoltageLimited2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="12"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Label HorizontalContentAlignment="Center" FontSize="14">
|
||||
<TextBlock Text="{Binding L3VoltageLimited2, StringFormat=0.00}" />
|
||||
</Label>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="13"
|
||||
Grid.Row="10"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
|
|
@ -2748,7 +2541,7 @@
|
|||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="13"
|
||||
Grid.Row="10"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
Padding="5,1"
|
||||
|
|
@ -2761,14 +2554,14 @@
|
|||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="14"
|
||||
Grid.Row="11"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1" />
|
||||
<Border
|
||||
Grid.Row="14"
|
||||
Grid.Row="11"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
Padding="5,1"
|
||||
|
|
@ -2777,14 +2570,14 @@
|
|||
BorderThickness="0,0,1,1" />
|
||||
|
||||
<Border
|
||||
Grid.Row="15"
|
||||
Grid.Row="12"
|
||||
Grid.Column="0"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1" />
|
||||
<Border
|
||||
Grid.Row="15"
|
||||
Grid.Row="12"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
Padding="5,1"
|
||||
|
|
@ -2814,7 +2607,7 @@
|
|||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="0" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition Height="0" />
|
||||
|
|
@ -2884,7 +2677,7 @@
|
|||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="3"
|
||||
Grid.Row="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
|
|
@ -2895,7 +2688,7 @@
|
|||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="3"
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="2"
|
||||
Padding="5,1"
|
||||
|
|
@ -2909,22 +2702,7 @@
|
|||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="4"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1" />
|
||||
<Border
|
||||
Grid.Row="4"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1" />
|
||||
|
||||
<Border
|
||||
Grid.Row="3"
|
||||
Grid.Row="2"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
|
|
@ -2940,28 +2718,9 @@
|
|||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="4"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Button Content="Reset" IsEnabled="{Binding IsActionEnable}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<cal:ActionMessage MethodName="SetSCRReset">
|
||||
<cal:Parameter Value="SCR1" />
|
||||
</cal:ActionMessage>
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</Border>
|
||||
|
||||
|
||||
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Row="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
|
|
@ -2972,7 +2731,7 @@
|
|||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="2"
|
||||
Padding="5,1"
|
||||
|
|
@ -2986,22 +2745,7 @@
|
|||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="7"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1" />
|
||||
<Border
|
||||
Grid.Row="7"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1" />
|
||||
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
|
|
@ -3017,27 +2761,9 @@
|
|||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="7"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Button Content="Reset" IsEnabled="{Binding IsActionEnable}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<cal:ActionMessage MethodName="SetSCRReset">
|
||||
<cal:Parameter Value="SCR2" />
|
||||
</cal:ActionMessage>
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</Border>
|
||||
|
||||
|
||||
<Border
|
||||
Grid.Row="9"
|
||||
Grid.Row="4"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
|
|
@ -3048,7 +2774,7 @@
|
|||
FontSize="14" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="9"
|
||||
Grid.Row="4"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="2"
|
||||
Padding="5,1"
|
||||
|
|
@ -3062,26 +2788,7 @@
|
|||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Title}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="1,0,1,1" />
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="2"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1" />
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Border
|
||||
Grid.Row="9"
|
||||
Grid.Row="4"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
|
|
@ -3097,27 +2804,10 @@
|
|||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Grid.Column="3"
|
||||
Padding="5,1"
|
||||
Background="{DynamicResource Table_BG_Content}"
|
||||
BorderBrush="{DynamicResource Table_BD}"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Button Content="Reset" IsEnabled="{Binding IsActionEnable}">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<cal:ActionMessage MethodName="SetSCRReset">
|
||||
<cal:Parameter Value="SCR3" />
|
||||
</cal:ActionMessage>
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
|
||||
<Grid Margin="520,338,0,0">
|
||||
<Grid Margin="520,228,0,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1" />
|
||||
<RowDefinition Height="35" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue