更新CAN的配置和CAN和实时数据的连接

CapMachine.Wpf/Views/CANConfigView.xaml

@@ -420,6 +420,33 @@
                                 <TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding SelectedCANConfigExdDto.Cycle}" />
                             </StackPanel>
 
+                            <StackPanel
+                                Grid.Row="2"
+                                Grid.Column="2"
+                                Orientation="Horizontal">
+                                <TextBlock
+                                    Margin="10,0,5,0"
+                                    VerticalAlignment="Center"
+                                    FontFamily="/Assets/Fonts/#iconfont"
+                                    FontSize="18"
+                                    Text="&#xe9f8;" />
+                                <TextBlock
+                                    Width="90"
+                                    Style="{StaticResource TextBlockStyle}"
+                                    Text="转速(rpm)" />
+                                <TextBox
+                                    Margin="5,0"
+                                    Style="{StaticResource TextBoxStyle}"
+                                    Text="{Binding HandSpeed}" />
+
+                                <Button
+                                    Margin="5,0"
+                                    Command="{Binding CanOpCmd}"
+                                    CommandParameter="HandSend"
+                                    Content="手动发送"
+                                    Foreground="White" />
+                            </StackPanel>
+
                             <StackPanel
                                 Grid.Row="2"
                                 Grid.ColumnSpan="3"
@@ -496,11 +523,7 @@
                                     </Button.Style>
                                 </Button>
 
-                                <Button
-                                    Margin="5,0"
-                                    Command="{Binding CanOpCmd}"
-                                    CommandParameter="HandSend"
-                                    Content="手动发送" />
+
 
                             </StackPanel>
 

CapMachine.Wpf/Views/MonitorView.xaml

@@ -1059,7 +1059,7 @@
                             Canvas.Top="4"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            Content="工艺图流程图"
+                            Content="工艺流程图"
                             FontSize="30"
                             FontWeight="Bold"
                             Foreground="Gray" />