Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager
This commit is contained in:
commit
683f8ac880
3 files changed
+119
-7
No files matched your search
@@ -1,4 +1,5 @@
|
||||
using SunlightAggregationManager.ViewModel;
|
||||
using SunlightAggregationManager.UserWindow;
|
||||
using SunlightAggregationManager.ViewModel;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
@@ -199,11 +200,21 @@ namespace SunlightAggregationManager.UserClass
|
||||
data_.Add("UserName", _user?.Field<object>("Name") ?? "");
|
||||
ret = JsonSerializer.Serialize(data_);
|
||||
}
|
||||
if (Command == "SysData")//回复请求的信息
|
||||
{
|
||||
// data_.Add("SysData", MainWindowViewModel.MachineVer);
|
||||
// data_.Add("ChemicalStatistics", MainWindowViewModel.ChemicalStatistics.ToJsonString());
|
||||
ret = JsonSerializer.Serialize(data_);
|
||||
}
|
||||
if (Command == "Info")//回复info请求的信息
|
||||
{
|
||||
var t = ToList(MainWindowViewModel._machines).ToJsonString();
|
||||
//格式化返回信息
|
||||
data_.Add("Info", t);
|
||||
data_.Add("DyeMeasurementNumber", MainWindowViewModel.DyeMeasurementNumber.ToString());
|
||||
data_.Add("ChemicalNumber", MainWindowViewModel.ChemicalNumber.ToString());
|
||||
data_.Add("PowderNumber", MainWindowViewModel.PowderNumber.ToString());
|
||||
data_.Add("DyeDissolveNumber", MainWindowViewModel.DyeDissolveNumber.ToString());
|
||||
ret = JsonSerializer.Serialize(data_);
|
||||
}
|
||||
if (Command == "Query")//回复Query请求的信息
|
||||
|
||||
Reference in new issue
Block a user