|
@@ -437,19 +437,19 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.DataHistory
|
|
|
try
|
|
|
{
|
|
|
//! 按时间分段查询,解决查询速度慢导致卡后台业务的问题。
|
|
|
- var ts = SearchEndTime - SearchBeginTime;
|
|
|
- if (ts.Days <= 1)
|
|
|
- {
|
|
|
+ //var ts = SearchEndTime - SearchBeginTime;
|
|
|
+ //if (ts.Days <= 1)
|
|
|
+ //{
|
|
|
|
|
|
- Query(pipeline, selectedModules, dataSeriesList, view.dataGrid1, SearchBeginTime, SearchEndTime,
|
|
|
+ // Query(pipeline, selectedModules, dataSeriesList, view.dataGrid1, SearchBeginTime, SearchEndTime,
|
|
|
|
|
|
- _cancellationTokenSource, _progQueryUpdate);
|
|
|
+ // _cancellationTokenSource, _progQueryUpdate);
|
|
|
|
|
|
- // 结束流水线
|
|
|
- pipeline.AppendFunc1(null);
|
|
|
- pipeline.AppendFunc2(null);
|
|
|
- }
|
|
|
- else
|
|
|
+ // // 结束流水线
|
|
|
+ // pipeline.AppendFunc1(null);
|
|
|
+ // pipeline.AppendFunc2(null);
|
|
|
+ //}
|
|
|
+ //else
|
|
|
{
|
|
|
var daySlices =
|
|
|
DateRangeHelper.SplitInToHours(new DateRangeHelper(SearchBeginTime, SearchEndTime), 12);
|