diff --git a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
index 7c643bb..4aaf9e4 100644
--- a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
+++ b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
@@ -27,7 +27,6 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
public SysSequentialDetails SysSequentialdata { get; set; }
-
public string? workTime { get; set; }
public long? workInt { get; set; }
@@ -43,6 +42,16 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
///
public DateTime? endTime { get; set; }
+ ///
+ /// 序号
+ ///
+ public int Number { get; set; }
+
+ ///
+ /// 时序类别
+ ///
+ public string kind { get; set; }
+
///
/// 配置
///
@@ -54,6 +63,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
set
{
_sequenceGroup = value;
+
SysSequentialdata = _sequentialService.GetSequentialSequenceGroup(SequenceGroup, kind);
if (SysSequentialdata != null)
{
@@ -67,11 +77,6 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
}
}
- ///
- /// 序号
- ///
- public int Number { get; set; }
-
///
/// 传感器设备
///
@@ -155,41 +160,6 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
}
}
- ///
- /// 循环时长
- ///
- private string _durationTime;
-
- public string DurationTime
- {
- get { return _durationTime; }
- set
- {
- _durationTime = value;
- ErrorList.Remove("DurationTime");
- if (SequenceGroup != null)
- {
- if (SysSequentialdata != null)
- {
- if (_durationTime != SysSequentialdata.DurationTime)
- {
- ErrorList.Add("DurationTime", new List { "当前配置已存在循环时长:" + SysSequentialdata.DurationTime +"s"+",无法修改" });
- }
- else
- {
- ErrorList.Remove("DurationTime");
- }
- this.RaiseErrorsChanged("DurationTime");
- }
- }
- }
- }
-
-
- ///
- /// 时序类别
- ///
- public string kind { get; set; }
private string _workTime;
///
@@ -276,6 +246,37 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
}
}
+ ///
+ /// 循环时长
+ ///
+ private string _durationTime;
+
+ public string DurationTime
+ {
+ get { return _durationTime; }
+ set
+ {
+ _durationTime = value;
+ ErrorList.Remove("DurationTime");
+ if (SequenceGroup != null)
+ {
+ if (SysSequentialdata != null)
+ {
+ if (_durationTime != SysSequentialdata.DurationTime)
+ {
+ ErrorList.Add("DurationTime", new List { "当前配置已存在循环时长:" + SysSequentialdata.DurationTime +"s"+",无法修改" });
+ }
+ else
+ {
+ ErrorList.Remove("DurationTime");
+ }
+ this.RaiseErrorsChanged("DurationTime");
+ }
+ }
+ }
+ }
+
+
#endregion
ISysSequentialService _sequentialService;