Zhou/20230201_145_upperpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
MoYue 2024-07-01 18:12:44 +08:00
parent e44b29cf11
commit 66cf7d3bbc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
View File

@ -170,12 +170,12 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
//非空校验 //非空校验
if (string.IsNullOrEmpty(SequenceGroup)) if (string.IsNullOrEmpty(SequenceGroup))
{ {
System.Windows.Forms.MessageBox.Show("配置不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); System.Windows.Forms.MessageBox.Show("子时序号不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
return; return;
} }
else if (string.IsNullOrEmpty(SensorID)) else if (string.IsNullOrEmpty(SensorID))
{ {
System.Windows.Forms.MessageBox.Show("传感器设备不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); System.Windows.Forms.MessageBox.Show("设备编号不能为空", "提示", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
return; return;
} }
else if (WorkTime == null || WorkTime == 0) else if (WorkTime == null || WorkTime == 0)
@ -185,7 +185,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
} }
else if (DurationTime == null || DurationTime == 0) 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; return;
} }
var data = _sequentialService.GetSequentials(kind).ToList(); var data = _sequentialService.GetSequentials(kind).ToList();
@ -205,7 +205,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
{ {
foreach (var item in selectFirst) 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; return;
} }
} }
@ -219,7 +219,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
{ {
foreach (var item in select) 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; return;
} }
} }
@ -234,7 +234,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
{ {
if (DurationTime != SysSequentialdata1.DurationTime) 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; return;
} }
} }

10
InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
View File

@ -186,7 +186,7 @@
<TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="子序列循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
@ -307,7 +307,7 @@
<TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="子序列循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
@ -427,7 +427,7 @@
<TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="子序列循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
@ -547,7 +547,7 @@
<TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="子序列循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>
@ -667,7 +667,7 @@
<TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序号" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备编号(以下设备同一配置依次运行)" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="设备工作时长(min)" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="子序列循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="子时序循环间隔时长(min)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="操作" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Grid>