Merge branch 'KB-Mylar' of http://49.235.130.76/XXF_1122/DaisyNPILine into KB-Mylar

TeamAAS-VM/ViewModels/SettingViewModel.cs

@@ -1616,6 +1616,7 @@ namespace TeamAAS_VP.ViewModels
             {
                 try
                 {
+                    SavePressureConfig();
                     var sysConfig = _configService.GetSystemConfiguration();
                     sysConfig.WorkMode = WorkMode;
                     sysConfig.PickPointNum = PickPointNum;
@@ -1640,6 +1641,11 @@ namespace TeamAAS_VP.ViewModels
             }
         }
 
+        private void SavePressureConfig()
+        {
+            FileHelper.WriteJsonFile(DownPressureConfig, FilePath.PressureParamterConfigPath);
+        }
+
         /// <summary>
         /// 选择压力曲线保存路径
         /// </summary>

TeamAAS-VM/Views/HomeView.xaml

@@ -38,7 +38,7 @@
 
         <Grid Grid.Row="0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
+                <RowDefinition Height="2*" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <!--图像-->

TeamAAS-VM/Views/SettingView.xaml

@@ -2452,7 +2452,7 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition Height="40" />
+                                <RowDefinition Height="50" />
                             </Grid.RowDefinitions>
 
                             <!-- 相机拍照次数 -->
@@ -2917,7 +2917,7 @@
                                 </Grid>
                             </GroupBox>
 
-                            <GroupBox Header="A_Camera Assy配置"
+                            <GroupBox Header="组装保压配置"
                                       Margin="20,0"
                                       Width="200">
                                 <Grid Margin="10">