diff --git a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
index d56d2cc..c046248 100644
--- a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
+++ b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
@@ -170,12 +170,12 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
//非空校验
if (string.IsNullOrEmpty(SequenceGroup))
{
- System.Windows.Forms.MessageBox.Show("配置不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+ System.Windows.Forms.MessageBox.Show("子时序号不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
return;
}
else if (string.IsNullOrEmpty(SensorID))
{
- System.Windows.Forms.MessageBox.Show("传感器设备不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+ System.Windows.Forms.MessageBox.Show("设备编号不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
return;
}
else if (WorkTime == null || WorkTime == 0)
@@ -185,7 +185,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
}
else if (DurationTime == null || DurationTime == 0)
{
- System.Windows.Forms.MessageBox.Show("循环时长不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+ System.Windows.Forms.MessageBox.Show("循环间隔时长不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
return;
}
var data = _sequentialService.GetSequentials(kind).ToList();
@@ -205,7 +205,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
{
foreach (var item in selectFirst)
{
- System.Windows.Forms.MessageBox.Show(kind + "- 配置" + item.SequenceGroup + "中,已配置" + SensorID + "!!!" + " 请重新配置。", "警告", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+ System.Windows.Forms.MessageBox.Show(kind + "- 子时序" + item.SequenceGroup + "中,已配置" + SensorID + "!!!" + " 请重新配置。", "警告", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
}
@@ -219,7 +219,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
{
foreach (var item in select)
{
- System.Windows.Forms.MessageBox.Show(kind + "- 配置" + item.SequenceGroup + "中,已配置" + SensorID + "!!!" + " 请重新配置。", "警告", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+ System.Windows.Forms.MessageBox.Show(kind + "- 子时序" + item.SequenceGroup + "中,已配置" + SensorID + "!!!" + " 请重新配置。", "警告", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
}
@@ -234,7 +234,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
{
if (DurationTime != SysSequentialdata1.DurationTime)
{
- System.Windows.Forms.MessageBox.Show(kind + "- 配置" + SequenceGroup + " 已存在循环时长:" + SysSequentialdata1.DurationTime + "分钟" + ",无法修改", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+ System.Windows.Forms.MessageBox.Show(kind + "- 子时序" + SequenceGroup + " 已存在循环时长:" + SysSequentialdata1.DurationTime + "分钟" + ",无法修改", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
return;
}
}
diff --git a/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
index 84c8986..d9f4ee8 100644
--- a/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
+++ b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
@@ -186,7 +186,7 @@
-
+
@@ -307,7 +307,7 @@
-
+
@@ -427,7 +427,7 @@
-
+
@@ -547,7 +547,7 @@
-
+
@@ -667,7 +667,7 @@
-
+