Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
sc committed
commit
d5042d92ff
1 file changed
+89
-46
+89
-46
@@ -147,12 +147,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
||||||
if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
|
if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
|
||||||
{
|
{
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
if (drEmployee.Field<bool>("Type"))//
|
||||||
{
|
{//网络
|
||||||
ID = index,
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
DAT = "SC859" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
{
|
||||||
+dat_859.ToJsonString()
|
ID = index,
|
||||||
});
|
DAT = "SC859" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
||||||
|
+ dat_859.ToJsonString()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{//串口
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -238,11 +244,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
|
|
||||||
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
||||||
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
if (drEmployee.Field<bool>("Type"))//
|
||||||
{
|
{//网络
|
||||||
ID = index,
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
DAT = "SC862" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
|
{
|
||||||
});//发送862指令修改系统设置
|
ID = index,
|
||||||
|
DAT = "SC862" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
|
||||||
|
});//发送862指令修改系统设置
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{//串口
|
||||||
|
}
|
||||||
}
|
}
|
||||||
SysSet_view = true;
|
SysSet_view = true;
|
||||||
}
|
}
|
||||||
@@ -252,7 +264,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
string newValue = (e.EditingElement as TextBox).Text;//获得输入单元格信息
|
string newValue = (e.EditingElement as TextBox).Text;//获得输入单元格信息
|
||||||
int rownum = SET_Grid.SelectedIndex;//获取鼠标选中行并定义变量
|
int rownum = SET_Grid.SelectedIndex;//获取鼠标选中行并定义变量
|
||||||
if (rownum != -1)//判断鼠标定位是否有效
|
if (rownum != -1)//判断鼠标定位是否有效
|
||||||
{
|
{
|
||||||
string ID = (SET_Grid.Columns[1].GetCellContent(SET_Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
|
string ID = (SET_Grid.Columns[1].GetCellContent(SET_Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
|
||||||
|
|
||||||
Dictionary<string, object> datagrid_v = new Dictionary<string, object>();//缓存函数
|
Dictionary<string, object> datagrid_v = new Dictionary<string, object>();//缓存函数
|
||||||
@@ -261,11 +273,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
|
|
||||||
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
||||||
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
if (drEmployee.Field<bool>("Type"))//
|
||||||
{
|
{//网络
|
||||||
ID = index,
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
DAT = "SC861" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") +datagrid_v.ToJsonString()
|
{
|
||||||
});//发送861指令修改程序设置
|
ID = index,
|
||||||
|
DAT = "SC861" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
|
||||||
|
});//发送861指令修改程序设置
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{//串口
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ParameterSet_view = true;
|
ParameterSet_view = true;
|
||||||
}
|
}
|
||||||
@@ -286,42 +304,67 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
if (!string.IsNullOrEmpty(machine))
|
if (!string.IsNullOrEmpty(machine))
|
||||||
{
|
{
|
||||||
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
||||||
int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
|
|
||||||
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
if (drEmployee.Field<bool>("Type"))//
|
||||||
if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
|
{//网络
|
||||||
{
|
int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
|
||||||
if (view == 0)
|
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
||||||
|
if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
|
||||||
{
|
{
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
if (view == 0)
|
||||||
{
|
{
|
||||||
ID = index,
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
DAT = "SC851" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
{
|
||||||
});
|
ID = index,
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
DAT = "SC851" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
||||||
|
});
|
||||||
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
|
{
|
||||||
|
ID = index,
|
||||||
|
DAT = "SC852" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
||||||
|
});
|
||||||
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
|
{
|
||||||
|
ID = index,
|
||||||
|
DAT = "SC853" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if (view == 1)
|
||||||
{
|
{
|
||||||
ID = index,
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
DAT = "SC852" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
{
|
||||||
});
|
ID = index,
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
DAT = "SC854" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if (view == 2)
|
||||||
{
|
{
|
||||||
ID = index,
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
||||||
DAT = "SC853" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
{
|
||||||
});
|
ID = index,
|
||||||
} else if (view==1)
|
DAT = "SC855" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
||||||
{
|
});
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
}
|
||||||
{
|
|
||||||
ID = index,
|
|
||||||
DAT = "SC854" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
else if (view == 2)
|
}
|
||||||
|
else
|
||||||
|
{//串口
|
||||||
|
int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
|
||||||
|
int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
|
||||||
|
if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
|
||||||
{
|
{
|
||||||
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
|
if (view == 0)
|
||||||
{
|
{
|
||||||
ID = index,
|
|
||||||
DAT = "SC855" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
|
}
|
||||||
});
|
else if (view == 1)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (view == 2)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user