844184169 vor 5 Monaten
Ursprung
Commit
477a64aaf2
1 geänderte Dateien mit 108 neuen und 107 gelöschten Zeilen
  1. 108 107
      TeamAAS-VM/Views/SettingView.xaml

+ 108 - 107
TeamAAS-VM/Views/SettingView.xaml

@@ -944,25 +944,25 @@
                                        Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
                                        FontSize="{DynamicResource Font.Size.Body3}"
                                        HorizontalAlignment="Right"
-                                       VerticalAlignment="Center"/>
+                                       VerticalAlignment="Center" />
                             <TextBox Text="{Binding SelectRobot.SafeZ,Mode=TwoWay}"
-                                      Grid.Row="8"
-                                      Grid.Column="1"
-                                      Margin="10,0"
-                                      Width="{Binding ElementName=txt_Id,Path=ActualWidth}"
-                                      MinWidth="80"
-                                      FontSize="{DynamicResource Font.Size.Body3}"
-                                      HorizontalContentAlignment="Center"
-                                      HorizontalAlignment="Left"
-                                      VerticalAlignment="Center"
-                                      />
+                                     Grid.Row="8"
+                                     Grid.Column="1"
+                                     Margin="10,0"
+                                     Width="{Binding ElementName=txt_Id,Path=ActualWidth}"
+                                     MinWidth="80"
+                                     FontSize="{DynamicResource Font.Size.Body3}"
+                                     HorizontalContentAlignment="Center"
+                                     HorizontalAlignment="Left"
+                                     VerticalAlignment="Center" />
                             <TextBlock Grid.Row="8"
                                        Grid.Column="1"
                                        Text="mm"
                                        Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
                                        FontSize="{DynamicResource Font.Size.Body3}"
                                        HorizontalAlignment="Right"
-                                       VerticalAlignment="Center" Margin="0,0,-20,0"/>
+                                       VerticalAlignment="Center"
+                                       Margin="0,0,-20,0" />
                             <!--PLC-->
                             <TextBlock Grid.Row="3"
                                        Grid.Column="0"
@@ -1774,7 +1774,8 @@
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="*"  MinWidth="200"/>
+                                <ColumnDefinition Width="*"
+                                                  MinWidth="200" />
                             </Grid.ColumnDefinitions>
 
                             <!-- Id -->
@@ -1924,7 +1925,7 @@
                                     <ComboBox Grid.Row="2"
                                               Grid.Column="1"
                                               SelectedItem="{Binding SelectLightController.SerialPortConfig.Parity,Mode=TwoWay}"
-                                              ItemsSource="{Binding Source={StaticResource Parity}}"/>
+                                              ItemsSource="{Binding Source={StaticResource Parity}}" />
                                     <TextBlock Text="StopBits:"
                                                Grid.Row="3"
                                                Grid.Column="0"
@@ -2091,7 +2092,7 @@
                                                        Margin="10,0,0,0" />
                                             <CheckBox IsChecked="{Binding LowLevelAlarmEnabled,Mode=TwoWay}"
                                                       IsEnabled="False"
-                                                       FontSize="{DynamicResource Font.Size.Captions3}" />
+                                                      FontSize="{DynamicResource Font.Size.Captions3}" />
                                         </StackPanel>
                                         <Border Height="2"
                                                 Margin="0"
@@ -2888,23 +2889,23 @@
                 <TabItem.Header>
                     <StackPanel HorizontalAlignment="Stretch">
                         <materialDesign:PackIcon Width="24"
-                                     Height="24"
-                                     HorizontalAlignment="Center"
-                                     Kind="BallotOutline" />
+                                                 Height="24"
+                                                 HorizontalAlignment="Center"
+                                                 Kind="BallotOutline" />
                         <TextBlock Style="{StaticResource TabHeaderTextBlockStyle}"
-                       FontSize="{DynamicResource Font.Size.Body2}"
-                       Text="产品信息"
-                       HorizontalAlignment="Stretch" />
+                                   FontSize="{DynamicResource Font.Size.Body2}"
+                                   Text="产品信息"
+                                   HorizontalAlignment="Stretch" />
                     </StackPanel>
                 </TabItem.Header>
 
                 <StackPanel Margin="16">
 
                     <GroupBox HorizontalAlignment="Left"
-                  Margin="10,5"
-                  Header="产品与mes参数绑定设置"
-                  Width="400"
-                  FontSize="{DynamicResource Font.Size.Title4}">
+                              Margin="10,5"
+                              Header="产品与mes参数绑定设置"
+                              Width="400"
+                              FontSize="{DynamicResource Font.Size.Title4}">
                         <Grid Margin="20">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="auto" />
@@ -2919,19 +2920,19 @@
                             </Grid.RowDefinitions>
 
                             <TextBlock Margin="0,0,0,8"
-                           Text="产品名称:"
-                           VerticalAlignment="Center"
-                           FontSize="{DynamicResource Font.Size.Body3}"
-                           HorizontalAlignment="Right" />
+                                       Text="产品名称:"
+                                       VerticalAlignment="Center"
+                                       FontSize="{DynamicResource Font.Size.Body3}"
+                                       HorizontalAlignment="Right" />
                             <ComboBox x:Name="selectProduct"
-                          Grid.Column="1"
-                          Width="100"
-                          Margin="10,4"
-                          FontSize="14"
-                          materialDesign:HintAssist.Hint="{lex:Loc 选择产品}"
-                          SelectedItem="{Binding SelectProduct,Mode=TwoWay}"
-                          ItemsSource="{Binding ProductList,Mode=TwoWay}"
-                          HorizontalAlignment="Left">
+                                      Grid.Column="1"
+                                      Width="100"
+                                      Margin="10,4"
+                                      FontSize="14"
+                                      materialDesign:HintAssist.Hint="{lex:Loc 选择产品}"
+                                      SelectedItem="{Binding SelectProduct,Mode=TwoWay}"
+                                      ItemsSource="{Binding ProductList,Mode=TwoWay}"
+                                      HorizontalAlignment="Left">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
                                         <StackPanel Orientation="Vertical">
@@ -2940,121 +2941,121 @@
                                                 <TextBlock Text="{Binding Name}" />
                                             </StackPanel>
                                             <TextBlock Text="{Binding Description}"
-                                           MinHeight="0"
-                                           MaxWidth="300"
-                                           Foreground="Gray"
-                                           TextTrimming="CharacterEllipsis"
-                                           FontSize="{DynamicResource Font.Size.Captions4}"
-                                           TextWrapping="Wrap" />
+                                                       MinHeight="0"
+                                                       MaxWidth="300"
+                                                       Foreground="Gray"
+                                                       TextTrimming="CharacterEllipsis"
+                                                       FontSize="{DynamicResource Font.Size.Captions4}"
+                                                       TextWrapping="Wrap" />
                                         </StackPanel>
                                     </DataTemplate>
                                 </ComboBox.ItemTemplate>
                             </ComboBox>
                             <TextBlock Margin="0,0,0,8"
-                           Grid.Row="1"
-                           Text="产品编码(model):"
-                           VerticalAlignment="Center"
-                           FontSize="{DynamicResource Font.Size.Body3}"
-                           HorizontalAlignment="Right" />
+                                       Grid.Row="1"
+                                       Text="产品编码(model):"
+                                       VerticalAlignment="Center"
+                                       FontSize="{DynamicResource Font.Size.Body3}"
+                                       HorizontalAlignment="Right" />
                             <TextBox Grid.Row="1"
-                         Grid.Column="1"
-                         Margin="10,4"
-                         MinWidth="100"
-                         FontSize="{DynamicResource Font.Size.Body3}"
-                         TextAlignment="Center"
-                         HorizontalAlignment="Left"
-                         VerticalAlignment="Center">
+                                     Grid.Column="1"
+                                     Margin="10,4"
+                                     MinWidth="100"
+                                     FontSize="{DynamicResource Font.Size.Body3}"
+                                     TextAlignment="Center"
+                                     HorizontalAlignment="Left"
+                                     VerticalAlignment="Center">
                                 <TextBox.Text>
                                     <Binding Path="ProMesInfo.ProductCode"
-                                 Mode="TwoWay">
+                                             Mode="TwoWay">
                                     </Binding>
                                 </TextBox.Text>
                             </TextBox>
 
                             <TextBlock Margin="0,0,0,8"
-                           Grid.Row="2"
-                           VerticalAlignment="Center"
-                           Text="产品颜色:"
-                           FontSize="{DynamicResource Font.Size.Body3}"
-                           HorizontalAlignment="Right" />
+                                       Grid.Row="2"
+                                       VerticalAlignment="Center"
+                                       Text="产品颜色:"
+                                       FontSize="{DynamicResource Font.Size.Body3}"
+                                       HorizontalAlignment="Right" />
                             <TextBox Grid.Row="2"
-                         Grid.Column="1"
-                         Margin="10,4"
-                         MinWidth="100"
-                         FontSize="{DynamicResource Font.Size.Body3}"
-                         TextAlignment="Center"
-                         HorizontalAlignment="Left"
-                         VerticalAlignment="Center">
+                                     Grid.Column="1"
+                                     Margin="10,4"
+                                     MinWidth="100"
+                                     FontSize="{DynamicResource Font.Size.Body3}"
+                                     TextAlignment="Center"
+                                     HorizontalAlignment="Left"
+                                     VerticalAlignment="Center">
                                 <TextBox.Text>
                                     <Binding Path="ProMesInfo.ProductColor"
-                                 Mode="TwoWay">
+                                             Mode="TwoWay">
                                     </Binding>
                                 </TextBox.Text>
                             </TextBox>
 
                             <TextBlock Margin="0,0,0,8"
-                                  Grid.Row="3"
-                                  VerticalAlignment="Center"
-                                  Text="产品类型:"
-                                  FontSize="{DynamicResource Font.Size.Body3}"
-                                  HorizontalAlignment="Right" />
+                                       Grid.Row="3"
+                                       VerticalAlignment="Center"
+                                       Text="产品类型:"
+                                       FontSize="{DynamicResource Font.Size.Body3}"
+                                       HorizontalAlignment="Right" />
                             <TextBox Grid.Row="3"
-                                Grid.Column="1"
-                                Margin="10,4"
-                                MinWidth="100"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                TextAlignment="Center"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center">
+                                     Grid.Column="1"
+                                     Margin="10,4"
+                                     MinWidth="100"
+                                     FontSize="{DynamicResource Font.Size.Body3}"
+                                     TextAlignment="Center"
+                                     HorizontalAlignment="Left"
+                                     VerticalAlignment="Center">
                                 <TextBox.Text>
                                     <Binding Path="ProMesInfo.ProductLoadMode"
-                                        Mode="TwoWay">
+                                             Mode="TwoWay">
                                     </Binding>
                                 </TextBox.Text>
                             </TextBox>
 
                             <StackPanel Grid.Row="6"
-                            Grid.ColumnSpan="2"
-                            Margin="0,6"
-                            Orientation="Horizontal"
-                            HorizontalAlignment="Center">
+                                        Grid.ColumnSpan="2"
+                                        Margin="0,6"
+                                        Orientation="Horizontal"
+                                        HorizontalAlignment="Center">
                                 <Button Margin="5"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            materialDesign:ButtonAssist.CornerRadius="10"
-                            MinWidth="100"
-                            Command="{Binding GetProWithMesCommand}">
+                                        Style="{StaticResource MaterialDesignRaisedButton}"
+                                        materialDesign:ButtonAssist.CornerRadius="10"
+                                        MinWidth="100"
+                                        Command="{Binding GetProWithMesCommand}">
                                     <StackPanel Orientation="Horizontal"
-                                    HorizontalAlignment="Center">
+                                                HorizontalAlignment="Center">
                                         <materialDesign:PackIcon Kind="PuzzleEditOutline"
-                                                     Margin="0,0,6,0" />
+                                                                 Margin="0,0,6,0" />
                                         <TextBlock VerticalAlignment="Center"
-                                       Text="获取" />
+                                                   Text="获取" />
                                     </StackPanel>
                                 </Button>
                                 <Button Margin="5"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            materialDesign:ButtonAssist.CornerRadius="10"
-                            MinWidth="100"
-                            Command="{Binding DeleteProWithMesCommand}">
+                                        Style="{StaticResource MaterialDesignRaisedButton}"
+                                        materialDesign:ButtonAssist.CornerRadius="10"
+                                        MinWidth="100"
+                                        Command="{Binding DeleteProWithMesCommand}">
                                     <StackPanel Orientation="Horizontal"
-                                    HorizontalAlignment="Center">
+                                                HorizontalAlignment="Center">
                                         <materialDesign:PackIcon Kind="DeleteForeverOutline"
-                                                     Margin="0,0,6,0" />
+                                                                 Margin="0,0,6,0" />
                                         <TextBlock VerticalAlignment="Center"
-                                       Text="删除" />
+                                                   Text="删除" />
                                     </StackPanel>
                                 </Button>
                                 <Button Margin="5"
-                            Style="{StaticResource MaterialDesignRaisedButton}"
-                            materialDesign:ButtonAssist.CornerRadius="10"
-                            MinWidth="100"
-                            Command="{Binding SaveProWithMesCommand}">
+                                        Style="{StaticResource MaterialDesignRaisedButton}"
+                                        materialDesign:ButtonAssist.CornerRadius="10"
+                                        MinWidth="100"
+                                        Command="{Binding SaveProWithMesCommand}">
                                     <StackPanel Orientation="Horizontal"
-                                    HorizontalAlignment="Center">
+                                                HorizontalAlignment="Center">
                                         <materialDesign:PackIcon Kind="ContentSaveCheck"
-                                                     Margin="0,0,6,0" />
+                                                                 Margin="0,0,6,0" />
                                         <TextBlock VerticalAlignment="Center"
-                                       Text="保存" />
+                                                   Text="保存" />
                                     </StackPanel>
                                 </Button>
                             </StackPanel>