diff --git a/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs b/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs index 9f625f6..5e46f03 100644 --- a/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/RelayViewModel.cs @@ -956,22 +956,22 @@ namespace InSituLaboratory.ViewModels.Pages this.Refresh(); } - else if (s1 == DialogResult.No) - { - //非强制关闭 - byte[] byteaq = new byte[] { 0x93, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }; + //else if (s1 == DialogResult.No) + //{ + // //非强制关闭 + // byte[] byteaq = new byte[] { 0x93, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }; - List buffer = Escape(byteaq); - string list = tools.byteToHexStr(buffer.ToArray()); - byte[] bytea = tools.ConvertHexStringToBytes(list); - clientModel.SendData(bytea); + // List buffer = Escape(byteaq); + // string list = tools.byteToHexStr(buffer.ToArray()); + // byte[] bytea = tools.ConvertHexStringToBytes(list); + // clientModel.SendData(bytea); - logModel = new LogModel(); - logModel.CreateTime = DateTime.Now; - logModel.Remark = "一键还原指令已下发"; - _logService.Insert(logModel); - this.Refresh(); - } + // logModel = new LogModel(); + // logModel.CreateTime = DateTime.Now; + // logModel.Remark = "一键还原指令已下发"; + // _logService.Insert(logModel); + // this.Refresh(); + //} } else { diff --git a/InSituLaboratory/Views/MainView.xaml b/InSituLaboratory/Views/MainView.xaml index 52e146b..094bdd5 100644 --- a/InSituLaboratory/Views/MainView.xaml +++ b/InSituLaboratory/Views/MainView.xaml @@ -207,8 +207,10 @@ - - + + + @@ -549,8 +551,10 @@ - - + + +