diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/SetValueVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/SetValueVM.cs index 05d506b..62fe29b 100644 --- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/SetValueVM.cs +++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/SetValueVM.cs @@ -22,8 +22,18 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs { try { - var ids = (StringValues)FC["setValue.ID[]"]; - var values= (StringValues)FC["setValue.SetRawValue[]"]; + StringValues ids , values; + if (FC.ContainsKey("setValue.ID[]")) + { + ids = (StringValues)FC["setValue.ID[]"]; + values = (StringValues)FC["setValue.SetRawValue[]"]; + } + else + { + ids = (StringValues)FC["setValue.ID"]; + values = (StringValues)FC["setValue.SetRawValue"]; + } + Dictionary kv = new(0); for (int i = 0; i < ids.Count; i++) { @@ -87,6 +97,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs StringValues ids; if (FC.ContainsKey("setValue.ID[]")) ids = (StringValues)FC["setValue.ID[]"]; + else if (FC.ContainsKey("setValue.ID")) + ids = (StringValues)FC["setValue.ID"]; else ids = (StringValues)FC["Ids[]"]; diff --git a/IoTGateway/Areas/BasicData/Controllers/DeviceVariableController.cs b/IoTGateway/Areas/BasicData/Controllers/DeviceVariableController.cs index 0414edf..74f3072 100644 --- a/IoTGateway/Areas/BasicData/Controllers/DeviceVariableController.cs +++ b/IoTGateway/Areas/BasicData/Controllers/DeviceVariableController.cs @@ -216,7 +216,7 @@ namespace IoTGateway.Controllers return vm.GetExportData(); } #region 下发写入 - [ActionDescription("下发写入")] + [ActionDescription("下发页面")] [HttpPost] public ActionResult SetValue(string[] IDs) { @@ -225,11 +225,16 @@ namespace IoTGateway.Controllers } [HttpPost] - [ActionDescription("下发写入")] + [ActionDescription("下发确认按钮")] public ActionResult DoSetValue() { var ids = Request.Form["setValue.ID[]"].ToArray(); var values = Request.Form["setValue.SetRawValue[]"].ToArray(); + if (ids.Length == 0) + { + ids = Request.Form["setValue.ID"].ToArray(); + values = Request.Form["setValue.SetRawValue"].ToArray(); + } var vm = Wtm.CreateVM(Ids: ids); if (!ModelState.IsValid)