|
@@ -100,8 +100,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
DeviceKindName = "---";
|
|
|
TestName = string.Empty;
|
|
|
SelectTest = string.Empty;
|
|
|
- StartTime = DateTime.MinValue;
|
|
|
- EndTime = DateTime.MinValue;
|
|
|
+ StartTime = string.Empty;
|
|
|
+ EndTime = string.Empty;
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 查询
|
|
@@ -110,19 +110,23 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
private void Query(object obj)
|
|
|
{
|
|
|
|
|
|
- if (StartTime > EndTime)
|
|
|
+ if ((!string.IsNullOrEmpty(StartTime)) && (!string.IsNullOrEmpty(EndTime)))
|
|
|
{
|
|
|
- MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
|
|
|
- return;
|
|
|
+ if (Convert.ToDateTime(StartTime) > Convert.ToDateTime(EndTime))
|
|
|
+ {
|
|
|
+ MessageBox.Show("起始时间大于结束时间,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
- //if (Convert.ToDateTime(StartTime).AddDays(2) < Convert.ToDateTime(EndTime))
|
|
|
- //{
|
|
|
- // MessageBox.Show("起始时间和结束时间间隔不能大于2天,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
|
|
|
- // return;
|
|
|
- //}
|
|
|
-
|
|
|
+ //if (Convert.ToDateTime(StartTime).AddDays(2) < Convert.ToDateTime(EndTime))
|
|
|
+ //{
|
|
|
+ // MessageBox.Show("起始时间和结束时间间隔不能大于2天,请重新输入", "确认", MessageBoxButton.OK, MessageBoxImage.Warning);
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
+
|
|
|
conditionConfig = (from a in allConfigList
|
|
|
- where (EndTime == DateTime.MinValue ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
|
|
|
+ where (EndTime == string.Empty ? true : (a.CreateTime < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < a.CreateTime))
|
|
|
&& (string.IsNullOrEmpty(ScheduleName) ? true : (a.SchemeName == ScheduleName))
|
|
|
&& (DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName)
|
|
|
select a).ToList();
|
|
@@ -405,14 +409,14 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
set { selectTest = value; RaisePropertyChanged(); }
|
|
|
}
|
|
|
|
|
|
- private DateTime startTime = DateTime.Now;
|
|
|
- public DateTime StartTime
|
|
|
+ private string startTime = DateTime.Now.AddHours(-1).ToString();
|
|
|
+ public string StartTime
|
|
|
{
|
|
|
get { return startTime; }
|
|
|
set { startTime = value; RaisePropertyChanged(); }
|
|
|
}
|
|
|
- private DateTime endTime =DateTime.Now;
|
|
|
- public DateTime EndTime
|
|
|
+ private string endTime =DateTime.Now.ToString();
|
|
|
+ public string EndTime
|
|
|
{
|
|
|
get { return endTime; }
|
|
|
set { endTime = value; RaisePropertyChanged(); }
|