diff --git a/src/Plugins/ThingsGateway.Foundation.Tests/Modbus/ModbusServerTest.cs b/src/Plugins/ThingsGateway.Foundation.Tests/Modbus/ModbusServerTest.cs index 59a7bc0bf..67985fc2f 100644 --- a/src/Plugins/ThingsGateway.Foundation.Tests/Modbus/ModbusServerTest.cs +++ b/src/Plugins/ThingsGateway.Foundation.Tests/Modbus/ModbusServerTest.cs @@ -7,7 +7,7 @@ using Xunit.Abstractions; namespace ThingsGateway.Foundation.Tests { - public class ModbusServerTest:IDisposable + public class ModbusServerTest : IDisposable { private ModbusServer ModbusServer; private ITestOutputHelper _output; @@ -45,11 +45,11 @@ namespace ThingsGateway.Foundation.Tests private void ModbusServerClient(string url) { - var config = new TouchSocketConfig(); + var config = new TouchSocketConfig(); config.SetListenIPHosts(new IPHost[] { new IPHost(url) }) .SetBufferLength(300); //ÔØÈëÅäÖà - var service = config.Container.Resolve(); + var service = config.Container.Resolve(); service.Setup(config); ModbusServer = new(service); ModbusServer.ConnectTimeOut = 5000; diff --git a/src/Plugins/ThingsGateway.Foundation.Tests/Waiting/WaitingTest.cs b/src/Plugins/ThingsGateway.Foundation.Tests/Waiting/WaitingTest.cs index 5487d3302..de3fe0345 100644 --- a/src/Plugins/ThingsGateway.Foundation.Tests/Waiting/WaitingTest.cs +++ b/src/Plugins/ThingsGateway.Foundation.Tests/Waiting/WaitingTest.cs @@ -27,35 +27,35 @@ namespace ThingsGateway.Foundation.Tests List tasks = new List(); for (int i = 0; i < num; i++) { - tasks.Add( TestWaiting()); + tasks.Add(TestWaiting()); } _output.WriteLine(data.ToString("yyyy-MM-dd hh:mm:ss fff")); _output.WriteLine(DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss fff")); while (true) { - + } } int dd = 0; private Task TestWaiting() { - ////然åŽä½¿ç”¨SendThenReturn。 - return Task.Factory.StartNew(async () => - { - try - { - int i = Interlocked.Increment(ref dd); - IWaitingClient waitClient = list[i]; - var returnData = await waitClient.SendThenResponseAsync(new byte[] { 1, 2, 3, 4 }, 0, 4, 5000); - _output.WriteLine(DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss fff") + "----" + i); - } - catch (Exception ex) - { - _output.WriteLine(ex.Message); + ////然åŽä½¿ç”¨SendThenReturn。 + return Task.Factory.StartNew(async () => + { + try + { + int i = Interlocked.Increment(ref dd); + IWaitingClient waitClient = list[i]; + var returnData = await waitClient.SendThenResponseAsync(new byte[] { 1, 2, 3, 4 }, 0, 4, 5000); + _output.WriteLine(DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss fff") + "----" + i); + } + catch (Exception ex) + { + _output.WriteLine(ex.Message); - } - } - ); + } + } + ); } diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs b/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs index 8928b4a31..e481d6636 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusRtuOverTcp.cs @@ -78,9 +78,9 @@ namespace ThingsGateway.Modbus return await _plc.WriteAsync(deviceVariable.DataType, deviceVariable.VariableAddress, value); } - protected override Task> ReadAsync(string address, int length, CancellationToken cancellationToken) + protected override Task> ReadAsync(string address, int length, CancellationToken cancellationToken) { - return _plc.ReadAsync(address, length); + return _plc.ReadAsync(address, length); } } diff --git a/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs b/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs index 70149ba78..ab81177b5 100644 --- a/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs +++ b/src/Plugins/ThingsGateway.Modbus/ModbusServer.cs @@ -55,8 +55,8 @@ namespace ThingsGateway.Modbus public override void Dispose() { _ModbusTags?.Values?.ToList()?.ForEach(a => a.VariableValueChange -= VariableValueChange); - if(_plc!=null) - _plc.Write -= Write; + if (_plc != null) + _plc.Write -= Write; _plc?.Stop(); _plc?.Dispose(); } @@ -170,11 +170,9 @@ namespace ThingsGateway.Modbus IsFirst = false; var list = Values.ToListWithDequeue(); - await Task.Yield(); foreach (var item in list) { await _plc.WriteAsync(item.Item2.DataType, item.Item1, item.Item2.Value?.ToString()); - //直接异步等待1s } await Task.Delay(100, cancellationToken); } diff --git a/src/Plugins/ThingsGateway.OPCDA/OPCDA.cs b/src/Plugins/ThingsGateway.OPCDA/OPCDA.cs index bd0a74e7c..f8768a9da 100644 --- a/src/Plugins/ThingsGateway.OPCDA/OPCDA.cs +++ b/src/Plugins/ThingsGateway.OPCDA/OPCDA.cs @@ -44,8 +44,8 @@ namespace ThingsGateway.OPCDA public override void Dispose() { - if(PLC != null ) - PLC.DataChangedHandler -= dataChangedHandler; + if (PLC != null) + PLC.DataChangedHandler -= dataChangedHandler; PLC?.Disconnect(); PLC?.Dispose(); PLC = null; diff --git a/src/Plugins/ThingsGateway.OPCUA/OPCUA.cs b/src/Plugins/ThingsGateway.OPCUA/OPCUA.cs index 9db219616..3de483797 100644 --- a/src/Plugins/ThingsGateway.OPCUA/OPCUA.cs +++ b/src/Plugins/ThingsGateway.OPCUA/OPCUA.cs @@ -46,7 +46,7 @@ namespace ThingsGateway.OPCUA public override void Dispose() { - if(PLC != null) + if (PLC != null) { PLC.DataChangedHandler -= dataChangedHandler; PLC.OpcStatusChange -= opcStatusChange; @@ -102,7 +102,7 @@ namespace ThingsGateway.OPCUA public override async Task WriteValueAsync(CollectVariableRunTime deviceVariable, string value) { await Task.CompletedTask; - var result = PLC.WriteNode(deviceVariable.VariableAddress,Convert.ChangeType( value,deviceVariable.DataType)); + var result = PLC.WriteNode(deviceVariable.VariableAddress, Convert.ChangeType(value, deviceVariable.DataType)); return result ? OperResult.CreateSuccessResult() : new OperResult(); } diff --git a/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs b/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs index 145136c0d..b572c6345 100644 --- a/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs +++ b/src/Plugins/ThingsGateway.RabbitMQ/RabbitMQClient.cs @@ -76,7 +76,7 @@ namespace ThingsGateway.RabbitMQ protected override void Init(UploadDevice device) { _curDevice = device; - _connectionFactory = new ConnectionFactory + _connectionFactory = new ConnectionFactory { HostName = IP, Port = Port, @@ -132,7 +132,7 @@ namespace ThingsGateway.RabbitMQ { try { - if(_model==null) + if (_model == null) { try { @@ -154,7 +154,7 @@ namespace ThingsGateway.RabbitMQ _logger.LogWarning(ex, ToString()); } } - + ////å˜åŒ–æŽ¨é€ diff --git a/src/Plugins/ThingsGateway.Siemens/S7.cs b/src/Plugins/ThingsGateway.Siemens/S7.cs index f83e2cc87..546216f19 100644 --- a/src/Plugins/ThingsGateway.Siemens/S7.cs +++ b/src/Plugins/ThingsGateway.Siemens/S7.cs @@ -71,11 +71,11 @@ namespace ThingsGateway.Siemens { return true; } - public override OperResult> LoadSourceRead(List deviceVariables) + public override OperResult> LoadSourceRead(List deviceVariables) { Init(null); _plc.Connect(); - var data= deviceVariables.LoadSourceRead(_logger, ThingsGatewayBitConverter, _plc); + var data = deviceVariables.LoadSourceRead(_logger, ThingsGatewayBitConverter, _plc); _plc?.Disconnect(); return data; } diff --git a/src/Plugins/ThingsGateway.Siemens/S7_1200.cs b/src/Plugins/ThingsGateway.Siemens/S7_1200.cs index a47ea8f57..b8762df68 100644 --- a/src/Plugins/ThingsGateway.Siemens/S7_1200.cs +++ b/src/Plugins/ThingsGateway.Siemens/S7_1200.cs @@ -1,7 +1,4 @@ - -using ThingsGateway.Foundation; - -namespace ThingsGateway.Siemens +namespace ThingsGateway.Siemens { public class S7_1200 : S7 { @@ -23,11 +20,11 @@ namespace ThingsGateway.Siemens _plc.DataFormat = DataFormat; _plc.ConnectTimeOut = ConnectTimeOut; _plc.TimeOut = TimeOut; - if(LocalTSAP !=0) + if (LocalTSAP != 0) { _plc.LocalTSAP = LocalTSAP; } - if(DestTSAP!=0) + if (DestTSAP != 0) { _plc.DestTSAP = DestTSAP; } diff --git a/src/Plugins/ThingsGateway.Siemens/S7_1500.cs b/src/Plugins/ThingsGateway.Siemens/S7_1500.cs index e59c44965..47733d932 100644 --- a/src/Plugins/ThingsGateway.Siemens/S7_1500.cs +++ b/src/Plugins/ThingsGateway.Siemens/S7_1500.cs @@ -1,6 +1,4 @@ -using ThingsGateway.Foundation; - -namespace ThingsGateway.Siemens +namespace ThingsGateway.Siemens { public class S7_1500 : S7 { diff --git a/src/Plugins/ThingsGateway.Siemens/S7_200.cs b/src/Plugins/ThingsGateway.Siemens/S7_200.cs index 20da1d23d..ae6b8ff4e 100644 --- a/src/Plugins/ThingsGateway.Siemens/S7_200.cs +++ b/src/Plugins/ThingsGateway.Siemens/S7_200.cs @@ -1,6 +1,4 @@ -using ThingsGateway.Foundation; - -namespace ThingsGateway.Siemens +namespace ThingsGateway.Siemens { public class S7_200 : S7 { diff --git a/src/Plugins/ThingsGateway.Siemens/S7_200SMART.cs b/src/Plugins/ThingsGateway.Siemens/S7_200SMART.cs index 7c81623da..86666d355 100644 --- a/src/Plugins/ThingsGateway.Siemens/S7_200SMART.cs +++ b/src/Plugins/ThingsGateway.Siemens/S7_200SMART.cs @@ -1,6 +1,4 @@ -using ThingsGateway.Foundation; - -namespace ThingsGateway.Siemens +namespace ThingsGateway.Siemens { public class S7_200SMART : S7 { diff --git a/src/Plugins/ThingsGateway.Siemens/S7_300.cs b/src/Plugins/ThingsGateway.Siemens/S7_300.cs index c27cac5fe..b6794cd08 100644 --- a/src/Plugins/ThingsGateway.Siemens/S7_300.cs +++ b/src/Plugins/ThingsGateway.Siemens/S7_300.cs @@ -1,6 +1,4 @@ -using ThingsGateway.Foundation; - -namespace ThingsGateway.Siemens +namespace ThingsGateway.Siemens { public class S7_300 : S7 { diff --git a/src/Plugins/ThingsGateway.Siemens/S7_400.cs b/src/Plugins/ThingsGateway.Siemens/S7_400.cs index 1ebf532a9..36f4f332d 100644 --- a/src/Plugins/ThingsGateway.Siemens/S7_400.cs +++ b/src/Plugins/ThingsGateway.Siemens/S7_400.cs @@ -1,6 +1,4 @@ -using ThingsGateway.Foundation; - -namespace ThingsGateway.Siemens +namespace ThingsGateway.Siemens { public class S7_400 : S7 { diff --git a/src/ThingsGateway.Core/Components/LoggingFileComponent.cs b/src/ThingsGateway.Core/Components/LoggingFileComponent.cs index 344e96cf2..82fbe6e3b 100644 --- a/src/ThingsGateway.Core/Components/LoggingFileComponent.cs +++ b/src/ThingsGateway.Core/Components/LoggingFileComponent.cs @@ -70,7 +70,7 @@ namespace ThingsGateway.Core //如果é…ç½®ä¸å†™å…¥mongitor日志和日志å称为System.Logging.LoggingMonitor if (!WriteMonitor && logMsg.LogName == "System.Logging.LoggingMonitor") return false; - if(!logMsg.LogName.StartsWith("System") && + if (!logMsg.LogName.StartsWith("System") && !logMsg.LogName.StartsWith("Microsoft")) { return false; } return logMsg.LogLevel == logLevel; diff --git a/src/ThingsGateway.Foundation/Foundation/Extensions/ConcurrentQueueExtensions.cs b/src/ThingsGateway.Foundation/Foundation/Extensions/ConcurrentQueueExtensions.cs index 7866d9c9d..e6f1a42e3 100644 --- a/src/ThingsGateway.Foundation/Foundation/Extensions/ConcurrentQueueExtensions.cs +++ b/src/ThingsGateway.Foundation/Foundation/Extensions/ConcurrentQueueExtensions.cs @@ -7,9 +7,9 @@ namespace ThingsGateway.Foundation.Extension /// /// 批é‡å‡ºé˜Ÿ /// - public static List ToListWithDequeue(this ConcurrentQueue values, int conut=0) + public static List ToListWithDequeue(this ConcurrentQueue values, int conut = 0) { - if(conut==0) + if (conut == 0) { conut = values.Count; } diff --git a/src/ThingsGateway.Foundation/Serial/Serial/SerialProperty.cs b/src/ThingsGateway.Foundation/Serial/Serial/SerialProperty.cs index 35bfa8252..47ad447f1 100644 --- a/src/ThingsGateway.Foundation/Serial/Serial/SerialProperty.cs +++ b/src/ThingsGateway.Foundation/Serial/Serial/SerialProperty.cs @@ -16,8 +16,8 @@ namespace ThingsGateway.Foundation.Serial PortName = strs[0]; BaudRate = Convert.ToInt32(strs[1]); DataBits = Convert.ToInt32(strs[2]); - Parity = (Parity)Enum.Parse(typeof(Parity),strs[3]); - StopBits = (StopBits)Enum.Parse(typeof(StopBits),strs[4]); + Parity = (Parity)Enum.Parse(typeof(Parity), strs[3]); + StopBits = (StopBits)Enum.Parse(typeof(StopBits), strs[4]); return this; } public override string ToString() diff --git a/src/ThingsGateway.Foundation/TouchSocketEx/AsyncAutoResetEvent.cs b/src/ThingsGateway.Foundation/TouchSocketEx/AsyncAutoResetEvent.cs index b4da834c2..f5144e8a2 100644 --- a/src/ThingsGateway.Foundation/TouchSocketEx/AsyncAutoResetEvent.cs +++ b/src/ThingsGateway.Foundation/TouchSocketEx/AsyncAutoResetEvent.cs @@ -110,7 +110,7 @@ namespace ThingsGateway.Foundation while (true) { - _locker.Lock(); + _locker.Lock(); { if (_waitQueue.Count == 0) { @@ -125,7 +125,7 @@ namespace ThingsGateway.Foundation private bool _isDisposed; - private readonly EasyLock _locker = new (); + private readonly EasyLock _locker = new(); private readonly Queue> _waitQueue = new Queue>(); diff --git a/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs b/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs index 544d09ad2..da7949574 100644 --- a/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs +++ b/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitData.cs @@ -91,7 +91,7 @@ namespace ThingsGateway.Foundation /// 等待指定毫秒 /// /// - public WaitDataStatus Wait(int millisecond) + public WaitDataStatus Wait(int millisecond) { var task = m_waitHandle.WaitOneAsync(); @@ -123,7 +123,6 @@ namespace ThingsGateway.Foundation /// public async Task WaitAsync(int millisecond) { - await Task.Yield(); var task = m_waitHandle.WaitOneAsync(); if (await Task.WhenAny(task, Task.Delay(millisecond)) != task) { diff --git a/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitingClient.cs b/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitingClient.cs index 1018684e1..3557738fb 100644 --- a/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitingClient.cs +++ b/src/ThingsGateway.Foundation/TouchSocketEx/TGWaitingClient.cs @@ -7,7 +7,7 @@ namespace ThingsGateway.Foundation private readonly TGWaitData m_waitData; private volatile bool breaked; - + public TGWaitingClient(TClient client, WaitingOptions waitingOptions) { Client = client ?? throw new ArgumentNullException(nameof(client)); @@ -418,7 +418,7 @@ namespace ThingsGateway.Foundation { responsedData = new ResponsedData(null, requestInfo); } - m_waitData.Set(responsedData); + m_waitData.Set(responsedData); return false; } } diff --git a/src/ThingsGateway.Web.Foundation/Enums/DataTypeEnum.cs b/src/ThingsGateway.Web.Foundation/Enums/DataTypeEnum.cs index 76968b980..c1290bc98 100644 --- a/src/ThingsGateway.Web.Foundation/Enums/DataTypeEnum.cs +++ b/src/ThingsGateway.Web.Foundation/Enums/DataTypeEnum.cs @@ -60,7 +60,7 @@ public static class DataTypeExtension return typeof(ulong); case DataTypeEnum.Single: return typeof(float); - + case DataTypeEnum.Double: return typeof(double); default: diff --git a/src/ThingsGateway.Web.Foundation/HostServices/CollectDeviceCore.cs b/src/ThingsGateway.Web.Foundation/HostServices/CollectDeviceCore.cs index 9e6c0b42e..1150c2a15 100644 --- a/src/ThingsGateway.Web.Foundation/HostServices/CollectDeviceCore.cs +++ b/src/ThingsGateway.Web.Foundation/HostServices/CollectDeviceCore.cs @@ -166,7 +166,7 @@ public class CollectDeviceCore : DisposableObject try { await Task.Delay(100, StoppingToken.Token); - + if (_driver == null) continue; if (Device?.Enable == false) @@ -178,7 +178,7 @@ public class CollectDeviceCore : DisposableObject { if (Device.DeviceStatus != DeviceStatusEnum.OnLineButNoInitialValue && Device.DeviceStatus != DeviceStatusEnum.OnLine) Device.DeviceStatus = DeviceStatusEnum.OnLineButNoInitialValue; - if(DeviceVariableSourceReads.Count==0&&Device.DeviceVariableRunTimes.Where(a=>a.OtherMethod.IsNullOrEmpty()).Count()>0) + if (DeviceVariableSourceReads.Count == 0 && Device.DeviceVariableRunTimes.Where(a => a.OtherMethod.IsNullOrEmpty()).Count() > 0) { Device.DeviceStatus = DeviceStatusEnum.OnLineButNoInitialValue; Device.DeviceOffMsg = "分包失败，请检查å˜é‡åœ°å€æ˜¯å¦ç¬¦åˆè§„则"; @@ -249,11 +249,11 @@ public class CollectDeviceCore : DisposableObject } - if(deviceMedsVariableFailedNum == 0 && deviceSourceVariableFailedNum == 0) + if (deviceMedsVariableFailedNum == 0 && deviceSourceVariableFailedNum == 0) { Device.ActiveTime = DateTime.Now; } - if (deviceMedsVariableFailedNum == 0 && deviceSourceVariableFailedNum == 0&&(DeviceVariableSourceReads.Count != 0|| DeviceVariableMedReads.Count!=0)) + if (deviceMedsVariableFailedNum == 0 && deviceSourceVariableFailedNum == 0 && (DeviceVariableSourceReads.Count != 0 || DeviceVariableMedReads.Count != 0)) { Device.DeviceStatus = DeviceStatusEnum.OnLine; diff --git a/src/ThingsGateway.Web.Foundation/HostServices/CollectMulDeviceCore.cs b/src/ThingsGateway.Web.Foundation/HostServices/CollectMulDeviceCore.cs index f9b04ae73..8cef7ddd5 100644 --- a/src/ThingsGateway.Web.Foundation/HostServices/CollectMulDeviceCore.cs +++ b/src/ThingsGateway.Web.Foundation/HostServices/CollectMulDeviceCore.cs @@ -3,11 +3,11 @@ public class CollectMulDeviceCore : CollectDeviceCore { - public CollectMulDeviceCore(IServiceScopeFactory scopeFactory):base(scopeFactory) + public CollectMulDeviceCore(IServiceScopeFactory scopeFactory) : base(scopeFactory) { } - + public override void StartThread() diff --git a/src/ThingsGateway.Web.Foundation/HostServices/Core/Plugin/DriverBase.cs b/src/ThingsGateway.Web.Foundation/HostServices/Core/Plugin/DriverBase.cs index c4f3c61e8..c86a5666e 100644 --- a/src/ThingsGateway.Web.Foundation/HostServices/Core/Plugin/DriverBase.cs +++ b/src/ThingsGateway.Web.Foundation/HostServices/Core/Plugin/DriverBase.cs @@ -3,10 +3,8 @@ using System.Threading; using ThingsGateway.Foundation; -using ThingsGateway.Foundation.Serial; using TouchSocket.Core; -using TouchSocket.Sockets; namespace ThingsGateway.Web.Foundation; /// diff --git a/src/ThingsGateway.Web.Foundation/Logging/TGRunTimeDatabaseLoggingWriter.cs b/src/ThingsGateway.Web.Foundation/Logging/TGRunTimeDatabaseLoggingWriter.cs index c2a50ae62..391fa4807 100644 --- a/src/ThingsGateway.Web.Foundation/Logging/TGRunTimeDatabaseLoggingWriter.cs +++ b/src/ThingsGateway.Web.Foundation/Logging/TGRunTimeDatabaseLoggingWriter.cs @@ -4,8 +4,6 @@ using System.Collections.Concurrent; using ThingsGateway.Core; -using TouchSocket.Core; - namespace ThingsGateway.Web.Foundation { /// diff --git a/src/ThingsGateway.Web.Foundation/Services/CollectDevice/CollectDeviceService.cs b/src/ThingsGateway.Web.Foundation/Services/CollectDevice/CollectDeviceService.cs index 4110f0c35..3a40ad1a8 100644 --- a/src/ThingsGateway.Web.Foundation/Services/CollectDevice/CollectDeviceService.cs +++ b/src/ThingsGateway.Web.Foundation/Services/CollectDevice/CollectDeviceService.cs @@ -231,7 +231,7 @@ namespace ThingsGateway.Web.Foundation foreach (var devData in devDatas) { var propertyExcels = devData.DevicePropertys.Adapt>(); - if(propertyExcels != null) + if (propertyExcels != null) { //需è¦æ‰‹åŠ¨æ”¹æ­£è®¾å¤‡å称 propertyExcels.ForEach(it => it.DeviceName = devData.Name); diff --git a/src/ThingsGateway.Web.Foundation/Services/UploadDevice/Dto/UploadDeviceInput.cs b/src/ThingsGateway.Web.Foundation/Services/UploadDevice/Dto/UploadDeviceInput.cs index 770b41624..0f8fe42ef 100644 --- a/src/ThingsGateway.Web.Foundation/Services/UploadDevice/Dto/UploadDeviceInput.cs +++ b/src/ThingsGateway.Web.Foundation/Services/UploadDevice/Dto/UploadDeviceInput.cs @@ -33,7 +33,7 @@ namespace ThingsGateway.Application [Description("设备å称")] public string Name { get; set; } [Description("æ’件å称")] - public string PluginName { get; set; } + public string PluginName { get; set; } [Description("设备组")] public string DeviceGroup { get; set; } } diff --git a/src/ThingsGateway.Web.Page/Page/DeviceStatusPage.razor b/src/ThingsGateway.Web.Page/Page/DeviceStatusPage.razor index 1508da0a1..c06605cab 100644 --- a/src/ThingsGateway.Web.Page/Page/DeviceStatusPage.razor +++ b/src/ThingsGateway.Web.Page/Page/DeviceStatusPage.razor @@ -55,12 +55,12 @@ - + - + { if(_collectDeviceGroup!=a.FirstOrDefault()) { @@ -114,12 +114,12 @@ - + - + { if(_uploadDeviceGroup!=a.FirstOrDefault()) { @@ -446,7 +446,7 @@ uploadDeviceInfoItem = item; isShowUploadDeviceInfo = true; } - } +} @code { StringNumber panel { get; set; } diff --git a/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor.cs b/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor.cs index 920866ebd..2043d54f1 100644 --- a/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor.cs +++ b/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor.cs @@ -192,7 +192,6 @@ namespace ThingsGateway.Web.Rcl.Core { QueryLoading = true; StateHasChanged(); - await Task.Yield(); PageItems = await QueryCall.Invoke(SearchModel); Items = PageItems.Records;