Explorar el Código

根据tin已修复bug:1.跨天但是间隔不满24小时数据查询时间段不对
2.触摸屏误触问题

huangping hace 1 semana
padre
commit
7a1731dfed

+ 10 - 10
FrameworkLocal/UIClient/CenterViews/DataLogs/DataHistory/DataViewModel.cs

@@ -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);

BIN
Furnace/FurnaceRT/Config/VIDs/Equipment_VIDs_20250527.xlsx


+ 3 - 0
Furnace/FurnaceUI/App.config

@@ -78,4 +78,7 @@
       </providers>
     </roleManager>
   </system.web>
+	<runtime>
+		<AppContextSwitchOverrides value="Switch.System.Windows.Input.Stylus.DisableStylusAndTouchSupport=true" />
+	</runtime>
 </configuration>