batchDetail 页面，boat slot内容展示

FrameworkLocal/UIClient/CenterViews/DataLogs/ProcessHistory/BatchDetailView.xaml

@@ -83,31 +83,31 @@
                     </ListView>
                 </Border>
                 <Border Grid.Row="2" Grid.Column="0">
-                    <TextBlock Text="Production" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <TextBlock Text="P" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                 </Border>
                 <Border Grid.Row="2" Grid.Column="1">
                     <TextBox Text="{Binding ProductionCount}" FontSize="14" Width="280" Margin="3,3" IsEnabled="False"/>
                 </Border>
                 <Border Grid.Row="3" Grid.Column="0">
-                    <TextBlock Text="Monitor1" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <TextBlock Text="M1" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                 </Border>
                 <Border Grid.Row="3" Grid.Column="1">
                     <TextBox Text="{Binding Monitor1Count}" FontSize="14" Width="280" Margin="3,3" IsEnabled="False"/>
                 </Border>
                 <Border Grid.Row="4" Grid.Column="0">
-                    <TextBlock Text="Monitor2" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <TextBlock Text="M2" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                 </Border>
                 <Border Grid.Row="4" Grid.Column="1">
                     <TextBox Text="{Binding Monitor2Count}" FontSize="14" Width="280" Margin="3,3" IsEnabled="False"/>
                 </Border>
                 <Border Grid.Row="5" Grid.Column="0">
-                    <TextBlock Text="Dummy" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <TextBlock Text="SD" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                 </Border>
                 <Border Grid.Row="5" Grid.Column="1">
                     <TextBox Text="{Binding DummyCount}" FontSize="14" Width="280" Margin="3,3" IsEnabled="False"/>
                 </Border>
                 <Border Grid.Row="6" Grid.Column="0">
-                    <TextBlock Text="Extra Dummy" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <TextBlock Text="ED" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                 </Border>
                 <Border Grid.Row="6" Grid.Column="1">
                     <TextBox Text="{Binding ExtraDummyCount}" FontSize="14" Width="280" Margin="3,3" IsEnabled="False"/>
@@ -139,7 +139,7 @@
             </Grid>
         </Border>
         <Border Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Margin="5,5" BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,1,1,1" Background="{DynamicResource MainArea_BG}" Padding="1">
-            <!--<controls:PaginationList Height="650" Width="460" PageSize="50" Items="{Binding BoatWafers}"/>-->
+           <controls:PaginationList Height="650" Width="460" PageSize="50" Items="{Binding BoatWafers}"/>
         </Border>
         <DockPanel Grid.Row="1" Grid.Column="0" IsEnabled="{Binding IsEnable}">
             <Canvas>

FrameworkLocal/UIClient/CenterViews/DataLogs/ProcessHistory/BatchDetailViewModel.cs

@@ -21,17 +21,15 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
 
         private SolidColorBrush _DefaultdBk = new SolidColorBrush(Colors.White);
 
-        private SolidColorBrush _PBk = new SolidColorBrush(Colors.SkyBlue);
+        private SolidColorBrush _SDBk = new SolidColorBrush(Color.FromArgb(255, 251, 147, 85));
 
-        private SolidColorBrush _SDBk = new SolidColorBrush(Colors.White);
+        private SolidColorBrush _FDBk = new SolidColorBrush(Color.FromArgb(255, 170, 147, 255));
 
-        private SolidColorBrush _EDBk = new SolidColorBrush(Colors.Yellow);
+        private SolidColorBrush _PBk = new SolidColorBrush(Color.FromArgb(255, 2, 255, 255));
 
-        private SolidColorBrush _MBk = new SolidColorBrush(Colors.Pink);
+        private SolidColorBrush _M1Bk = new SolidColorBrush(Color.FromArgb(255, 3, 149, 255));
 
-        private SolidColorBrush _XDBk = new SolidColorBrush(Colors.White);
-
-        private SolidColorBrush _TBk = new SolidColorBrush(Colors.DarkGreen);
+        private SolidColorBrush _M2Bk = new SolidColorBrush(Color.FromArgb(255, 255, 111, 171));
 
         private string _batchId;
         public string BatchId
@@ -160,14 +158,17 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
                     case "P":
                         BoatWafers[i].BkColor = _PBk;
                         break;
-                    case "M":
-                        BoatWafers[i].BkColor = _MBk;
+                    case "M1":
+                        BoatWafers[i].BkColor = _M1Bk;
+                        break;
+                    case "M2":
+                        BoatWafers[i].BkColor = _M2Bk;
                         break;
                     case "SD":
                         BoatWafers[i].BkColor = _SDBk;
                         break;
                     case "ED":
-                        BoatWafers[i].BkColor = _EDBk;
+                        BoatWafers[i].BkColor = _FDBk;
                         break;
                     default:
                         BoatWafers[i].BkColor = _DefaultdBk;
@@ -175,7 +176,6 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
                 }
 
                 var description = BoatWafers[i].Description;
-                description = description.Substring(description.IndexOf('-') + 1);
                 BoatWafers[i].Description = description;
             }