Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

ViewModel/MainWindowViewModel.cs

@@ -1574,6 +1574,8 @@ namespace DyeingComputer.ViewModel
         public static DataTable dt_a = new DataTable("AIO");
         public static DataTable dt_m = new DataTable("M");
         public static DataTable dt_TP = new DataTable();
+        public static DataTable dt_ParameterSet = new DataTable();
+        public static DataTable dt_SysSet = new DataTable();
         public static void SQL_data()//获得io表
         {
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
@@ -1581,6 +1583,9 @@ namespace DyeingComputer.ViewModel
             dt_d = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='DO' OR type='DQ' order by ID", null).Tables[0];  //读取表写入缓存
             dt_a = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='AI' OR type='AO' order by ID", null).Tables[0];
             dt_m = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='M' order by ID", null).Tables[0];
+            dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0];
+            dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0];
+
             SQLiteHelpers.Close();
             //创建dt_d主建
             DataColumn[] dt_dcols =new DataColumn[] { dt_d.Columns["ID"] };