错误修正
This commit is contained in:
commit
7d1c20b414
2 files changed
+14
-14
No files matched your search
@@ -158,10 +158,10 @@ namespace DyeingComputer.View
|
|||||||
dr["StepName"] = e.StepNAME;
|
dr["StepName"] = e.StepNAME;
|
||||||
dr["ParameterName"] = e.PNAME;
|
dr["ParameterName"] = e.PNAME;
|
||||||
dr["Parameter1"] = e.Row_DAT.Field<double>("Parameter1");
|
dr["Parameter1"] = e.Row_DAT.Field<double>("Parameter1");
|
||||||
dr["Parameter2"] = e.Row_DAT.Field<double>("Parameter1");
|
dr["Parameter2"] = e.Row_DAT.Field<double>("Parameter2");
|
||||||
dr["Parameter3"] = e.Row_DAT.Field<double>("Parameter1");
|
dr["Parameter3"] = e.Row_DAT.Field<double>("Parameter3");
|
||||||
dr["Parameter4"] = e.Row_DAT.Field<double>("Parameter1");
|
dr["Parameter4"] = e.Row_DAT.Field<double>("Parameter4");
|
||||||
dr["Parameter5"] = e.Row_DAT.Field<double>("Parameter1");
|
dr["Parameter5"] = e.Row_DAT.Field<double>("Parameter5");
|
||||||
dr["Parameter1_S1"] = e.Row_DAT.Field<double>("Parameter1_S1");
|
dr["Parameter1_S1"] = e.Row_DAT.Field<double>("Parameter1_S1");
|
||||||
dr["Parameter2_S1"] = e.Row_DAT.Field<double>("Parameter2_S1");
|
dr["Parameter2_S1"] = e.Row_DAT.Field<double>("Parameter2_S1");
|
||||||
dr["Parameter3_S1"] = e.Row_DAT.Field<double>("Parameter3_S1");
|
dr["Parameter3_S1"] = e.Row_DAT.Field<double>("Parameter3_S1");
|
||||||
|
|||||||
@@ -109,18 +109,18 @@ namespace DyeingComputer.ViewModel
|
|||||||
private ObservableCollection<DateTimePoint> STTC_values;
|
private ObservableCollection<DateTimePoint> STTC_values;
|
||||||
private ObservableCollection<DateTimePoint> STLC_values;
|
private ObservableCollection<DateTimePoint> STLC_values;
|
||||||
|
|
||||||
private SQLiteHelper SQLiteHelpers = null; //定义数据库
|
// private SQLiteHelper SQLiteHelpers = null; //定义数据库
|
||||||
private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径
|
// private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径
|
||||||
public DataTable CDB = new DataTable();
|
public DataTable CDB = new DataTable();
|
||||||
private int CDB_Count;//长度
|
private int CDB_Count;//长度
|
||||||
|
|
||||||
public HistoryRecordsViewModel()
|
public HistoryRecordsViewModel()
|
||||||
{
|
{
|
||||||
string Sys_Time = DateTime.Now.AddDays(-2).ToString("yyyy/MM/dd HH:mm:ss");
|
string Sys_Time = DateTime.Now.AddDays(-2).ToString("yyyy/MM/dd HH:mm:ss");
|
||||||
SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
|
// SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
|
||||||
SQLiteHelpers.Open(); //打开数据库
|
// SQLiteHelpers.Open(); //打开数据库
|
||||||
CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where Time > '" + Sys_Time + "'order by Time", null).Tables[0];
|
CDB = MainWindow.SQLiteChartAdress.ExecuteDataSet("select * from Chart where Time > '" + Sys_Time + "'order by Time", null).Tables[0];
|
||||||
SQLiteHelpers.Close();
|
// SQLiteHelpers.Close();
|
||||||
CDB_Count = CDB.Rows.Count;
|
CDB_Count = CDB.Rows.Count;
|
||||||
|
|
||||||
Chart_View();
|
Chart_View();
|
||||||
@@ -132,10 +132,10 @@ namespace DyeingComputer.ViewModel
|
|||||||
public static string etime;
|
public static string etime;
|
||||||
public void History()
|
public void History()
|
||||||
{
|
{
|
||||||
SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
|
// SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
|
||||||
SQLiteHelpers.Open(); //打开数据库
|
// SQLiteHelpers.Open(); //打开数据库
|
||||||
CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where DYELOT = '" + name + "'order by Time", null).Tables[0];
|
CDB = MainWindow.SQLiteChartAdress.ExecuteDataSet("select * from Chart where DYELOT = '" + name + "'order by Time", null).Tables[0];
|
||||||
SQLiteHelpers.Close();
|
// SQLiteHelpers.Close();
|
||||||
CDB_Count = CDB.Rows.Count;
|
CDB_Count = CDB.Rows.Count;
|
||||||
|
|
||||||
Chart_View();
|
Chart_View();
|
||||||
|
|||||||
Reference in new issue
Block a user