From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
Plugin.DataBoard/DataBoard.xaml.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Plugin.DataBoard/DataBoard.xaml.cs b/Plugin.DataBoard/DataBoard.xaml.cs
index 941dc5c..ad70928 100644
--- a/Plugin.DataBoard/DataBoard.xaml.cs
+++ b/Plugin.DataBoard/DataBoard.xaml.cs
@@ -1,6 +1,7 @@
锘縰sing HMI.Base;
using HMI.Core.Entity;
using HMI.Core.Manager;
+using HMI.Core.Setting;
using HMI.Core.Util;
using HMI.UI.Util;
using HMI.Util;
@@ -43,7 +44,9 @@
set { Set(ref _options, value); }
}
+
private string iniFile;
+ private string DataFolder;
public override void InitFinish()
{
iniFile = Path.Combine(BaseFolder, "Config.ini");
@@ -51,6 +54,7 @@
{
File.Create(iniFile);
}
+ DataFolder = ParamSetting.DataLogFolder;
LoadProduct();
}
@@ -151,15 +155,15 @@
}
}
- public static string[] GetDbFiles(string folderPath, DateTime startTime, DateTime endTime)
+ public string[] GetDbFiles(DateTime startTime, DateTime endTime)
{
- if (!Directory.Exists(folderPath))
+ if (!Directory.Exists(DataFolder))
{
return new string[0];
}
string startName = $"Data_{startTime.ToString("yyyyMMdd")}";
string endName = $"Data_{endTime.ToString("yyyyMMdd")}";
- var oldFiles = Directory.GetFiles(folderPath, "Data_*.db");
+ var oldFiles = Directory.GetFiles(DataFolder, "Data_*.db");
oldFiles = oldFiles.Where(file =>
{
var fileName = Path.GetFileNameWithoutExtension(file);
@@ -176,7 +180,7 @@
private List<SerialData> SelectSerialDataByTime(string model, DateTime start, DateTime end)
{
var s1 = DateTime.Now;
- string[] files = GetDbFiles(BaseFolder, start, end);
+ string[] files = GetDbFiles(start, end);
if (files == null || files.Length <= 0)
{
return new List<SerialData>();
@@ -207,7 +211,7 @@
private List<SerialData> SelectResultDataByTime(string model, DateTime start, DateTime end)
{
- string[] files = GetDbFiles(BaseFolder, start, end);
+ string[] files = GetDbFiles(start, end);
if (files == null || files.Length <= 0)
{
return new List<SerialData>();
--
Gitblit v1.9.1