diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs index 10831d8..7a9b1ac 100644 --- a/View/ProgramstepsView .xaml.cs +++ b/View/ProgramstepsView .xaml.cs @@ -158,10 +158,10 @@ namespace DyeingComputer.View dr["StepName"] = e.StepNAME; dr["ParameterName"] = e.PNAME; dr["Parameter1"] = e.Row_DAT.Field("Parameter1"); - dr["Parameter2"] = e.Row_DAT.Field("Parameter1"); - dr["Parameter3"] = e.Row_DAT.Field("Parameter1"); - dr["Parameter4"] = e.Row_DAT.Field("Parameter1"); - dr["Parameter5"] = e.Row_DAT.Field("Parameter1"); + dr["Parameter2"] = e.Row_DAT.Field("Parameter2"); + dr["Parameter3"] = e.Row_DAT.Field("Parameter3"); + dr["Parameter4"] = e.Row_DAT.Field("Parameter4"); + dr["Parameter5"] = e.Row_DAT.Field("Parameter5"); dr["Parameter1_S1"] = e.Row_DAT.Field("Parameter1_S1"); dr["Parameter2_S1"] = e.Row_DAT.Field("Parameter2_S1"); dr["Parameter3_S1"] = e.Row_DAT.Field("Parameter3_S1"); diff --git a/ViewModel/HistoryRecordsViewModel.cs b/ViewModel/HistoryRecordsViewModel.cs index 76f32a7..2656c65 100644 --- a/ViewModel/HistoryRecordsViewModel.cs +++ b/ViewModel/HistoryRecordsViewModel.cs @@ -109,18 +109,18 @@ namespace DyeingComputer.ViewModel private ObservableCollection STTC_values; private ObservableCollection STLC_values; - private SQLiteHelper SQLiteHelpers = null; //定义数据库 - private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径 + // private SQLiteHelper SQLiteHelpers = null; //定义数据库 + // private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径 public DataTable CDB = new DataTable(); private int CDB_Count;//长度 public HistoryRecordsViewModel() { string Sys_Time = DateTime.Now.AddDays(-2).ToString("yyyy/MM/dd HH:mm:ss"); - SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where Time > '" + Sys_Time + "'order by Time", null).Tables[0]; - SQLiteHelpers.Close(); + // SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + CDB = MainWindow.SQLiteChartAdress.ExecuteDataSet("select * from Chart where Time > '" + Sys_Time + "'order by Time", null).Tables[0]; + // SQLiteHelpers.Close(); CDB_Count = CDB.Rows.Count; Chart_View(); @@ -132,10 +132,10 @@ namespace DyeingComputer.ViewModel public static string etime; public void History() { - SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径 - SQLiteHelpers.Open(); //打开数据库 - CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where DYELOT = '" + name + "'order by Time", null).Tables[0]; - SQLiteHelpers.Close(); + // SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径 + // SQLiteHelpers.Open(); //打开数据库 + CDB = MainWindow.SQLiteChartAdress.ExecuteDataSet("select * from Chart where DYELOT = '" + name + "'order by Time", null).Tables[0]; + // SQLiteHelpers.Close(); CDB_Count = CDB.Rows.Count; Chart_View();