Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal

InfoDetail.xaml

@@ -9,7 +9,7 @@
             <converters:StringToImageConverter x:Key="StringToImageConverter" />
         </ResourceDictionary>
     </ContentPage.Resources>
-    <Grid RowDefinitions="Auto, *, *" ColumnDefinitions="*, Auto" >
+    <Grid RowDefinitions="Auto, Auto, *" ColumnDefinitions="*, Auto" >
         <Grid BackgroundColor="#CCCCCC" Padding="10" Grid.Row="0" Grid.Column="0" >
             <HorizontalStackLayout>
                 <!-- 图片 -->
@@ -36,7 +36,7 @@
         </Grid>
         <!-- 选项 -->
         <Grid Grid.Row="1" Grid.Column="0" HeightRequest="50">
-            <HorizontalStackLayout BackgroundColor="#F0F0F0" HeightRequest="50">
+            <HorizontalStackLayout BackgroundColor="#F0F0F0">
                 <Button Text="实时信息" Clicked="Button_real"  BackgroundColor="Transparent" TextColor="Black"/>
                 <Button Text="设备信息" Clicked="Button_machine"  BackgroundColor="Transparent" TextColor="Black"/>
                 <Button Text="执行历史" Clicked="Button_history"  BackgroundColor="Transparent" TextColor="Black"/>
@@ -116,6 +116,14 @@
                                                        FontSize="22" TextColor="Black"/>
                                     <Label Text="{Binding Dyelot}" FontAttributes="Bold"                                         
                                                        FontSize="22" TextColor="Black"/>
+                                    <Label Text="@" FontAttributes="Bold"                                         
+                                                       FontSize="22" TextColor="Black"/>
+                                    <Label Text="{Binding ReDye}" FontAttributes="Bold"                                         
+                                                       FontSize="22" TextColor="Black"/>
+                                    <Label Text=" 步骤" FontAttributes="Bold"                                         
+                                                       FontSize="22" TextColor="Black"/>
+                                    <Label Text="{Binding Step}" FontAttributes="Bold"                                         
+                                                       FontSize="22" TextColor="Black"/>
                                 </HorizontalStackLayout>
                                 <HorizontalStackLayout>
                                     <Label Text="染机: " FontAttributes="Bold"                                                             

InfoDetail.xaml.cs

@@ -21,6 +21,8 @@ public partial class InfoDetail : ContentPage
 
 
         InfoDyelotItems.Add(new DyelotItem { Dyelot = "2134566", Machine = "g01", CreationTime = "", CallTime = "" ,
+            ReDye="0",
+            Step = "0",
             FabricName = "21345122343566",
             ColorName = "g01",
             CustomerName = "",
@@ -30,6 +32,7 @@ public partial class InfoDetail : ContentPage
         }); 
         InfoDyelotItems.Add(new DyelotItem
         {
+            Step = "3",
             Dyelot = "231423134566",
             Machine = "g01",
             CreationTime = "",
@@ -44,6 +47,7 @@ public partial class InfoDetail : ContentPage
 
         InfoDyelotItems.Add(new DyelotItem
         {
+            Step = "3",
             Dyelot = "2131324354566",
             Machine = "g01",
             CreationTime = "",

Models/DataSource.cs

@@ -52,6 +52,8 @@ namespace SunlightAggregationTerminal.Models
     public class DyelotItem
     {
         public string? Dyelot { get; set; }
+        public string? ReDye { get; set; }
+        public string? Step { get; set; }
         public string? Machine { get; set; }
         public string? CreationTime { get; set; }
         public string? CallTime { get; set; }