diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index b7add10..3d368e4 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -1059,6 +1059,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Jump 的本地化字符串。
+ ///
+ public static string Jump {
+ get {
+ return ResourceManager.GetString("Jump", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Language 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index dfcc2f1..be59ed9 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -939,4 +939,7 @@
Mode
+
+ Jump
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 9443815..be1fde9 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -939,4 +939,7 @@
Mode
+
+ Jump
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 4163f78..01214dd 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -939,4 +939,7 @@
模式
+
+ 跳步
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 479dcff..f664ce4 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -939,4 +939,7 @@
伺服器
+
+ 跳步
+
\ No newline at end of file
diff --git a/View/MonitorView.xaml b/View/MonitorView.xaml
index 948c4f8..3891f3e 100644
--- a/View/MonitorView.xaml
+++ b/View/MonitorView.xaml
@@ -124,7 +124,7 @@
-
+
@@ -186,6 +186,14 @@
+
+
+
+
+
+
+
+
diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs
index 596bc3f..214c280 100644
--- a/View/MonitorView.xaml.cs
+++ b/View/MonitorView.xaml.cs
@@ -16,6 +16,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Threading;
using System.Xml.Linq;
+using TouchSocket.Core;
using TouchSocket.Sockets;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Rebar;
@@ -42,6 +43,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表
{
Gridstep.ItemsSource = null; log.Text = null;
+ Stop.IsEnabled = true;
int rownum = Griddata.SelectedIndex;//获取鼠标选中行并定义变量
if (rownum != -1)//判断鼠标定位是否有效
@@ -56,7 +58,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private void Gridstep_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
- Delete.IsEnabled = true;
Insert.IsEnabled = true;
edit.IsEnabled = true;
Paused.IsEnabled = true;
@@ -66,31 +67,66 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
private void ListViewItem_DyeingMachine(object sender, MouseButtonEventArgs e)
{
machines_info = 0;
- }
+ }//信息
private void ListViewItem_Conveyor(object sender, MouseButtonEventArgs e)
{
machines_info = 1;
- }
+ }//输送
private void ListViewItem_Receipt(object sender, MouseButtonEventArgs e)
{
machines_info = 2;
- }
-
+ }//单据
private void ListViewItem_Resume(object sender, MouseButtonEventArgs e)
{
+ if (!string.IsNullOrEmpty(machine))
+ {
+ Dictionary dat_821 = new Dictionary();
+ dat_821.Clear();
+ dat_821.Add("INSTRUCTION", "CONTINUE");
+ DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+ int index = Convert.ToInt16(drEmployee.Field