Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
ab5dfa85e1
1 file changed
+4
-3
@@ -107,8 +107,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
|||||||
SN_ID = Configini.IniReadvalue("SN", "SN2");
|
SN_ID = Configini.IniReadvalue("SN", "SN2");
|
||||||
SN_KEY = Configini.IniReadvalue("SN", "SN1");
|
SN_KEY = Configini.IniReadvalue("SN", "SN1");
|
||||||
DyelotsDispenser = Convert.ToBoolean(Configini.IniReadvalue("SYS", "DyelotsDispenser"));
|
DyelotsDispenser = Convert.ToBoolean(Configini.IniReadvalue("SYS", "DyelotsDispenser"));
|
||||||
}
|
|
||||||
catch (Exception ex) { LogGing.ERRDATA(ex); }
|
|
||||||
|
|
||||||
SQLiteChartAdress = new SQLiteHelper(ChartAdress); //数据库连接路径
|
SQLiteChartAdress = new SQLiteHelper(ChartAdress); //数据库连接路径
|
||||||
SQLiteChartAdress.Open(); //打开数据库
|
SQLiteChartAdress.Open(); //打开数据库
|
||||||
@@ -118,9 +116,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
|||||||
USER_data = SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0];
|
USER_data = SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0];
|
||||||
Dyelot_CALL = SQLiteHelpers.ExecuteDataSet("select * from Dyelot", null).Tables[0].Clone();
|
Dyelot_CALL = SQLiteHelpers.ExecuteDataSet("select * from Dyelot", null).Tables[0].Clone();
|
||||||
|
|
||||||
Whole_dat.Columns.Add("Machine", Type.GetType("System.String"));
|
Whole_dat.Columns.Add("Machine", Type.GetType("System.String"));
|
||||||
Whole_dat.Columns.Add("DateTime", Type.GetType("System.DateTime"));
|
Whole_dat.Columns.Add("DateTime", Type.GetType("System.DateTime"));
|
||||||
Whole_dat.Columns.Add("DAT", Type.GetType("System.Double"));
|
Whole_dat.Columns.Add("DAT", Type.GetType("System.Double"));
|
||||||
|
}
|
||||||
|
catch (Exception ex) { LogGing.ERRDATA(ex);
|
||||||
|
}
|
||||||
|
|
||||||
USERCapacity(App.USER_Purview);//App.USER_Purview);
|
USERCapacity(App.USER_Purview);//App.USER_Purview);
|
||||||
ClientNEW();
|
ClientNEW();
|
||||||
|
|||||||
Reference in new issue
Block a user