From d66333989cb02b5f1957c2fbaab854750347be28 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 6 Sep 2024 15:50:23 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20Index=E9=A1=B5=E9=9D=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Page/IndexPage/IndexContent.xaml          | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml b/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml
index f1f76da..1a6ea71 100644
--- a/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml
+++ b/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml
@@ -12,18 +12,43 @@
         <DataTemplate x:Key="TaskTemplate">
             <Border BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Margin="2,5">
                 <StackPanel Margin="10,0,0,0">
-                    <TextBlock Text="{Binding conveyorno}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0"/>
-                    <TextBlock Text="{Binding taskno}" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
-                    <TextBlock Text="{Binding taskstate}" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="站台号：" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                        <TextBlock Text="{Binding conveyorno}" FontSize="18" Foreground="White"  Margin="0,10,0,0"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="航班号：" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                        <TextBlock Text="{Binding flightno}" FontSize="18" Foreground="White"  Margin="0,10,0,0"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="任务号：" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                        <TextBlock Text="{Binding taskno}" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="任务状态：" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                        <TextBlock Text="{Binding taskstate}" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="AGV编号：" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                        <TextBlock Text="{Binding agvno}" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="总行李筐数量：" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                        <TextBlock Text="{Binding totalcount}" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="已装载筐数量：" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                        <TextBlock Text="{Binding loadcount}" FontSize="18" Foreground="White" Margin="0,10,0,0"/>
+                    </StackPanel>
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,10,0,10">
                         <Button Content="待处理任务" FontSize="14" Style="{StaticResource  BUTTON_AGREE}" 
                                 Width="80" Height="30" Background="YellowGreen" BorderBrush="YellowGreen" Margin="40,0,0,0"
                                 Command="{Binding DataContext.HandleTaskCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
-                                CommandParameter="{Binding TaskCode}"/>
+                                CommandParameter="{Binding taskno}"/>
                         <Button Content="删除任务" FontSize="14" Style="{StaticResource  BUTTON_AGREE}" 
                                 Width="80" Height="30" Background="Red" BorderBrush="Red" Margin="20,0,0,0"
                                 Command="{Binding DataContext.DeleteTaskCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
-                                CommandParameter="{Binding TaskCode}"/>
+                                CommandParameter="{Binding taskno}"/>
                     </StackPanel>
                 </StackPanel>
             </Border>