Merge branch 'master' of http://49.235.130.76/XXF_1122/DaisyNPILine

TeamAAS-VM/App.config

@@ -127,7 +127,7 @@
     </appender>
     <!--信息日志附加介质-->
     <appender name="InfoAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="E:\\Data\\Log\\LogInfo\\" />
+      <param name="File" value="..\\Log\\LogInfo\\" />
       <param name="AppendToFile" value="true" />
       <param name="MaxFileSize" value="10240" />
       <param name="MaxSizeRollBackups" value="100" />
@@ -142,7 +142,7 @@
     </appender>
     <!--调试日志附加介质-->
     <appender name="DebugAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="E:\\Data\\Log\\LogDebug\\" />
+      <param name="File" value="..\\Log\\LogDebug\\" />
       <param name="AppendToFile" value="true" />
       <param name="MaxFileSize" value="10240" />
       <param name="MaxSizeRollBackups" value="100" />
@@ -157,7 +157,7 @@
     </appender>
     <!--警告日志附加介质-->
     <appender name="WarnAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="E:\\Data\\Log\\LogWarn\\" />
+      <param name="File" value="..\\Log\\LogWarn\\" />
       <param name="AppendToFile" value="true" />
       <param name="MaxFileSize" value="10240" />
       <param name="MaxSizeRollBackups" value="100" />
@@ -173,7 +173,7 @@
     <!--动态日志附加介质-->
     <appender name="DynamicAppender" type="log4net.Appender.RollingFileAppender">
       <!--输出日志文件的路径-->
-      <param name="File" value="E:\\Data\\Log\\LogOther\\" />
+      <param name="File" value="..\\Log\\LogOther\\" />
       <!--输出日志时自动向后追加-->
       <param name="AppendToFile" value="true" />
       <!--防止多线程时不能写Log,官方说线程非安全,但实际使用时,本地测试正常,部署后有不能写日志的情况-->
@@ -192,7 +192,7 @@
     </appender>
     <!--CT日志附加介质-->
     <appender name="CTAppender" type="log4net.Appender.RollingFileAppender">
-      <param name="File" value="E:\\Data\\Log\\LogCT\\" />
+      <param name="File" value="..\\Log\\LogCT\\" />
       <param name="AppendToFile" value="true" />
       <param name="MaxFileSize" value="10240" />
       <param name="MaxSizeRollBackups" value="100" />
@@ -208,7 +208,7 @@
 	  <!--mes日志-->
 	  <appender name="MesAppender" type="log4net.Appender.RollingFileAppender">
 		  <!--输出日志文件的路径-->
-		  <param name="File" value="E:\\Data\\Log\\LogMes\\" />
+		  <param name="File" value="..\\Log\\LogMes\\" />
 		  <!--输出日志时自动向后追加-->
 		  <param name="AppendToFile" value="true" />
 		  <!--防止多线程时不能写Log,官方说线程非安全,但实际使用时,本地测试正常,部署后有不能写日志的情况-->

TeamAAS-VM/Views/Product/PlcPointParams.xaml

@@ -526,6 +526,7 @@
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto" />
                                                     <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
                                                 </Grid.RowDefinitions>
                                                 <!--拍照1-->
                                                 <TextBlock Grid.Row="0"
@@ -662,6 +663,68 @@
                                                         materialDesign:ButtonAssist.CornerRadius="5"
                                                         Command="{Binding AutoCorrectLockPointCommand}" />
 
+                                                <StackPanel Orientation="Horizontal"
+                                                            HorizontalAlignment="Left"
+                                                            Grid.Row="2"
+                                                            Grid.ColumnSpan="9">
+                                                    <TextBlock Text="{lex:Loc 批量设置所有锁付点的各轴速度}"
+                                                               VerticalAlignment="Center" />
+                                                    <TextBlock Text="{lex:Loc X轴速度}"
+                                                               Margin="5,0,0,0"
+                                                               VerticalAlignment="Center" />
+                                                    <mah:NumericUpDown Value="{Binding LockXSpeed, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                       Minimum="0"
+                                                                       Maximum="20000"
+                                                                       Interval="1"
+                                                                       StringFormat="F1"
+                                                                       MinWidth="60"
+                                                                       HorizontalAlignment="Stretch"
+                                                                       VerticalAlignment="Center"
+                                                                       Margin="0"
+                                                                       Padding="2" />
+                                                    <TextBlock Margin="0"
+                                                               VerticalAlignment="Center"
+                                                               Text="mm/s" />
+                                                    <TextBlock Text="{lex:Loc Y轴速度}"
+                                                               Margin="5,0,0,0"
+                                                               VerticalAlignment="Center" />
+                                                    <mah:NumericUpDown Value="{Binding LockYSpeed, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                       Minimum="0"
+                                                                       Maximum="20000"
+                                                                       Interval="1"
+                                                                       StringFormat="F1"
+                                                                       MinWidth="60"
+                                                                       HorizontalAlignment="Stretch"
+                                                                       VerticalAlignment="Center"
+                                                                       Margin="0"
+                                                                       Padding="2" />
+                                                    <TextBlock Margin="0"
+                                                               VerticalAlignment="Center"
+                                                               Text="mm/s" />
+                                                    <TextBlock Text="{lex:Loc Z轴速度}"
+                                                               Margin="5,0,0,0"
+                                                               VerticalAlignment="Center" />
+                                                    <mah:NumericUpDown Value="{Binding LockZSpeed, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                       Minimum="0"
+                                                                       Maximum="20000"
+                                                                       Interval="1"
+                                                                       StringFormat="F1"
+                                                                       MinWidth="60"
+                                                                       HorizontalAlignment="Stretch"
+                                                                       VerticalAlignment="Center"
+                                                                       Margin="0"
+                                                                       Padding="2" />
+                                                    <TextBlock Margin="0"
+                                                               VerticalAlignment="Center"
+                                                               Text="mm/s" />
+                                                    <!--应用按钮-->
+                                                    <Button Content="{lex:Loc 应用}"
+                                                            Margin="10,0,0,0"
+                                                            MinWidth="60"
+                                                            HorizontalAlignment="Left"
+                                                            materialDesign:ButtonAssist.CornerRadius="5"
+                                                            Command="{Binding ApplyLockPointSpeedCommand}" />
+                                                </StackPanel>
                                             </Grid>
                                         </StackPanel>
                                     </ScrollViewer>