diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 3b67156..9ccc0a0 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -868,7 +868,7 @@
监控
- 设备
+ 机台
设备组
diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml
index 9761d21..948c4f8 100644
--- a/View/MonitorView.xaml
+++ b/View/MonitorView.xaml
@@ -123,7 +123,8 @@
-
+
+
diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs
index 6715842..36cd38f 100644
--- a/View/MonitorView.xaml.cs
+++ b/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;
}
}