1

2 years ago · 9f2bfe2d6b
--- a/FryPot_DosingSystem/View/AgvView.xaml
+++ b/FryPot_DosingSystem/View/AgvView.xaml
@@ -1101,46 +1101,52 @@
    <Grid>

        <!--#region 测试按钮-->
        <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,100,0" Orientation="Horizontal">
            <StackPanel>
                <TextBlock Margin="5">停车桩测试</TextBlock>
                <TextBox x:Name="tcz_text" Margin="5">1</TextBox>
                <Button Margin="5" Click="Button_Click" Tag="设置有车" Cursor="Hand">设置有车</Button>
                <Button Margin="5" Click="Button_Click" Tag="设置无车" Cursor="Hand">设置无车</Button>
            </StackPanel>
        <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="100,0,100,80" Grid.Column="2">
            <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="0"/>
            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,20,0" Orientation="Horizontal">
                <TextBlock Style="{DynamicResource 80号字体样式}"  Text="AGV模拟测试" Margin="20,20,20,5" Width="35" FontSize="20"  Foreground="#FFFCD5B5" />
                <StackPanel>
                    <TextBlock Margin="5">停车桩测试</TextBlock>
                    <TextBox x:Name="tcz_text" Margin="5">1</TextBox>
                    <Button Margin="5" Click="Button_Click" Tag="设置有车" Cursor="Hand">设置有车</Button>
                    <Button Margin="5" Click="Button_Click" Tag="设置无车" Cursor="Hand">设置无车</Button>
                </StackPanel>

            <StackPanel>
                <TextBlock Margin="5">料筒控制</TextBlock>
                <TextBox x:Name="liaotong_text" Margin="5">1</TextBox>
                <Button Margin="5" Click="Button_Click" Tag="启动" Cursor="Hand">启动</Button>
                <Button Margin="5" Click="Button_Click" Tag="停止" Cursor="Hand">停止</Button>
            </StackPanel>
                <StackPanel>
                    <TextBlock Margin="5">料筒控制</TextBlock>
                    <TextBox x:Name="liaotong_text" Margin="5">1</TextBox>
                    <Button Margin="5" Click="Button_Click" Tag="启动" Cursor="Hand">启动</Button>
                    <Button Margin="5" Click="Button_Click" Tag="停止" Cursor="Hand">停止</Button>
                </StackPanel>

            <StackPanel>
                <TextBlock Margin="5">设置物料</TextBlock>
                <TextBox x:Name="liaotongwuliao_text" Margin="5">1</TextBox>
                <TextBox x:Name="liaotongwuliaoshuliang_text" Margin="5">1</TextBox>
                <StackPanel>
                    <TextBlock Margin="5">设置物料</TextBlock>
                    <TextBox x:Name="liaotongwuliao_text" Margin="5">1</TextBox>
                    <TextBox x:Name="liaotongwuliaoshuliang_text" Margin="5">1</TextBox>

                <Button Margin="5" Click="Button_Click" Tag="设置物料" Cursor="Hand">设置物料</Button>
            </StackPanel>
                    <Button Margin="5" Click="Button_Click" Tag="设置物料" Cursor="Hand">设置物料</Button>
                </StackPanel>

            <StackPanel>
                <TextBlock Margin="5">小车测试</TextBlock>
                <TextBox x:Name="xiaoche_text" Margin="5">1</TextBox>
                <Button Margin="5" Click="Button_Click" Tag="小车停止" Cursor="Hand">小车停止</Button>
                <ComboBox x:Name="控制命令"  HorizontalAlignment="Left"  Width="100"/>
                <Button Margin="5" Click="Button_Click" Tag="运行小车" Cursor="Hand">运行小车</Button>
            </StackPanel>
                <StackPanel>
                    <TextBlock Margin="5">小车测试</TextBlock>
                    <TextBox x:Name="xiaoche_text" Margin="5">1</TextBox>
                    <Button Margin="5" Click="Button_Click" Tag="小车停止" Cursor="Hand">小车停止</Button>
                    <ComboBox x:Name="控制命令"  HorizontalAlignment="Left"  Width="100"/>
                    <Button Margin="5" Click="Button_Click" Tag="运行小车" Cursor="Hand">运行小车</Button>
                </StackPanel>

            <StackPanel>
                <TextBlock Margin="5">小车?物品</TextBlock>
                <TextBox x:Name="xiaochewuping_text" Margin="5">1</TextBox>
                <Button Margin="5" Click="Button_Click" Tag="有物品" Cursor="Hand">有物品</Button>
                <Button Margin="5" Click="Button_Click" Tag="无物品" Cursor="Hand">无物品</Button>
                <StackPanel>
                    <TextBlock Margin="5">小车?物品</TextBlock>
                    <TextBox x:Name="xiaochewuping_text" Margin="5">1</TextBox>
                    <Button Margin="5" Click="Button_Click" Tag="有物品" Cursor="Hand">有物品</Button>
                    <Button Margin="5" Click="Button_Click" Tag="无物品" Cursor="Hand">无物品</Button>


                </StackPanel>
            </StackPanel>
        </StackPanel>
        </Grid>

       
        <!--#endregion-->

        <!--#region 墙体-->
--- a/FryPot_DosingSystem/ViewModel/AgvViewModel.cs
+++ b/FryPot_DosingSystem/ViewModel/AgvViewModel.cs
@@ -300,7 +300,9 @@ namespace FryPot_DosingSystem.ViewModel

            }
        }
        #endregion

        #region 其他函数
        /// <summary>
        /// 获取所有命令
        /// </summary>