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

Properties/Resources.zh-CN.resx

@@ -868,7 +868,7 @@
     <value>监控</value>
   </data>
   <data name="Machine" xml:space="preserve">
-    <value>设备</value>
+    <value>机台</value>
   </data>
   <data name="MachineGroup" xml:space="preserve">
     <value>设备组</value>

View/MonitorView.xaml

@@ -123,7 +123,8 @@
                 <DataGridTextColumn Binding="{Binding DYELOT}" Width="0" MinWidth="0" MaxWidth="0"/>
             </DataGrid.Columns>
             </DataGrid>
-            <TextBlock Grid.Column="0" x:Name="log" TextWrapping="Wrap" FontSize="25" Background="White"/>
+            <TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/>
+            <TextBlock Grid.Column="0" x:Name="log" TextWrapping="Wrap" FontSize="25" Background="White" Margin="0,40,0,0"/>
             <GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="#FF00204E"/>
         </Grid>
         <StackPanel Grid.Row="3" x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">

View/MonitorView.xaml.cs

@@ -41,12 +41,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表
         {
+            Gridstep.ItemsSource = null; log.Text = null;
+
             int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量
             if (rownum != -1)//判断鼠标定位是否有效
             {
                 machine = (Griddata.Columns[0].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第1列，
                 workOrder = (Griddata.Columns[1].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
                 dyelot = (Griddata.Columns[2].GetCellContent(Griddata.Items[rownum]) as TextBlock).Text;//定位第列，
+
+                machin_LOG.Text = Properties.Resources.Machine+":"+machine+"     "+Properties.Resources.WorkOrder+":"+workOrder;
             }
         }