From 27bb2e3dcc7a0c1ffdc2cc351c6c5690e87e3fc7 Mon Sep 17 00:00:00 2001 From: Kimdiego2098 <2248356998@qq.com> Date: Fri, 18 Aug 2023 09:57:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=96=87=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E7=BB=9F=E4=B8=80utf-8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/AppBarItems.razor.cs | 22 +++++----- .../Components/AppListGroup.razor.cs | 16 +++---- .../Components/Breadcrumb.razor.cs | 16 +++---- .../Components/EnableChip.razor.cs | 20 ++++----- .../Components/Favorite.razor.cs | 18 ++++---- .../Components/Foter.razor.cs | 22 +++++----- .../Components/Logo.razor.cs | 24 +++++------ .../Components/PageTabs.razor.cs | 20 ++++----- .../Components/Search.razor.cs | 16 +++---- .../Components/UserMenu.razor.cs | 20 ++++----- .../Page/Base.razor.cs | 16 +++---- .../Page/Index.razor.cs | 18 ++++---- .../Page/UserCenter.razor.cs | 28 ++++++------- .../Components/ImportExcel.razor.cs | 28 ++++++------- .../DebugPage/DefalutDebugDriverPage.razor.cs | 24 +++++------ .../DebugPage/SerialClientPage.razor.cs | 22 +++++----- .../DebugPage/TcpClientPage.razor.cs | 24 +++++------ .../DebugPage/TcpServerPage.razor.cs | 22 +++++----- .../DebugPage/UdpSessionPage.razor.cs | 22 +++++----- .../Page/DeviceStatusPage.razor.cs | 36 ++++++++-------- .../Page/DeviceVariableRunTimePage.razor.cs | 24 +++++------ .../Page/HardwareInfoPage.razor.cs | 18 ++++---- .../Page/HistoryAlarmPage.razor.cs | 20 ++++----- .../Page/HistoryValuePage.razor.cs | 20 ++++----- .../Page/RealAlarmPage.razor.cs | 18 ++++---- .../ModbusDemo/ModbusDemo.csproj | 20 ++++----- .../ImportVariable.razor.cs | 24 +++++------ .../OPCDAClientDebugDriverPage.razor.cs | 32 +++++++------- .../OPCDAClientPage.razor.cs | 22 +++++----- .../OPCUAClient/ImportVariable.razor.cs | 24 +++++------ .../OPCUAClientDebugDriverPage.razor.cs | 42 +++++++++---------- .../OPCUAClient/OPCUAClientPage.razor.cs | 18 ++++---- 32 files changed, 358 insertions(+), 358 deletions(-) diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/AppBarItems.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/AppBarItems.razor.cs index c44b23442..9b26c3487 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/AppBarItems.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/AppBarItems.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -20,19 +20,19 @@ namespace ThingsGateway.Admin.Blazor.Core; public partial class AppBarItems { /// - /// + /// 链接 /// [Parameter] public string CONFIG_COPYRIGHT_URL { get; set; } /// - /// Ȩ + /// 版权 /// [Parameter] public string CONFIG_COPYRIGHT { get; set; } /// - /// + /// 标题 /// [Parameter] public string CONFIG_TITLE { get; set; } diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/AppListGroup.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/AppListGroup.razor.cs index 24a6b2605..860271e38 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/AppListGroup.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/AppListGroup.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/Breadcrumb.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/Breadcrumb.razor.cs index 278f1ef03..140b509ca 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Breadcrumb.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Breadcrumb.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/EnableChip.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/EnableChip.razor.cs index 598cad347..2643732a5 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/EnableChip.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/EnableChip.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Components; namespace ThingsGateway.Admin.Blazor.Core; /// -/// /ͣ ıʾ +/// 启用/停用 文本提示 /// public partial class EnableChip { @@ -46,5 +46,5 @@ public partial class EnableChip private string TextColor => Value ? "green" : "error"; private string Color => Value ? "green-lighten" : "warning-lighten"; - private string Label => Value ? EnabledLabel ?? "" : DisabledLabel ?? "ͣ"; + private string Label => Value ? EnabledLabel ?? "启用" : DisabledLabel ?? "停用"; } \ No newline at end of file diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/Favorite.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/Favorite.razor.cs index 89f4650dd..76e7c6cdf 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Favorite.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Favorite.razor.cs @@ -1,18 +1,18 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion namespace ThingsGateway.Admin.Blazor.Core; /// -/// ղ/ݷʽ +/// 收藏/快捷方式 /// public partial class Favorite { diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor.cs index 47b5d0a36..0da9b54f0 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Foter.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -22,17 +22,17 @@ public partial class Foter { private string Version = ""; /// - /// + /// 链接 /// [Parameter] public string CONFIG_COPYRIGHT_URL { get; set; } /// - /// Ȩ + /// 版权 /// [Parameter] public string CONFIG_COPYRIGHT { get; set; } /// - /// + /// 标题 /// [Parameter] public string CONFIG_TITLE { get; set; } diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/Logo.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/Logo.razor.cs index 7835725ce..fcaaaeadf 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Logo.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Logo.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -20,23 +20,23 @@ namespace ThingsGateway.Admin.Blazor.Core; public partial class Logo { /// - /// Logo߶ + /// Logo高度 /// [Parameter] public int HeightInt { get; set; } /// - /// + /// 链接 /// [Parameter] public string CONFIG_COPYRIGHT_URL { get; set; } /// - /// Ȩ + /// 版权 /// [Parameter] public string CONFIG_COPYRIGHT { get; set; } /// - /// + /// 标题 /// [Parameter] public string CONFIG_TITLE { get; set; } diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/PageTabs.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/PageTabs.razor.cs index ef8dc98d0..07c48530a 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/PageTabs.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/PageTabs.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -34,7 +34,7 @@ public partial class PageTabs return op; } /// - /// Tabsʵ + /// Tabs实例 /// public PPageTabs PPageTabs { get; private set; } @@ -46,7 +46,7 @@ public partial class PageTabs [Parameter] public IEnumerable SelfPatterns { get; set; } /// - /// + /// 子组件 /// [Parameter] public RenderFragment ChildContent { get; set; } diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/Search.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/Search.razor.cs index 6b196738b..56d8e224c 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/Search.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/Search.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion diff --git a/framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs b/framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs index 48a983ed9..003bc02e1 100644 --- a/framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor.Core/Components/UserMenu.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -49,11 +49,11 @@ public partial class UserMenu var ret = str?.ToJsonWithT>(); if (ret?.Code != 200) { - await PopupService.EnqueueSnackbarAsync("עʧ", AlertTypes.Error); + await PopupService.EnqueueSnackbarAsync("注销失败", AlertTypes.Error); } else { - await PopupService.EnqueueSnackbarAsync("עɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("注销成功", AlertTypes.Success); await Task.Delay(500); NavigationManager.NavigateTo(NavigationManager.Uri); } diff --git a/framework/ThingsGateway.Admin.Blazor/Page/Base.razor.cs b/framework/ThingsGateway.Admin.Blazor/Page/Base.razor.cs index 052aeb028..4b0ab68dc 100644 --- a/framework/ThingsGateway.Admin.Blazor/Page/Base.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor/Page/Base.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion diff --git a/framework/ThingsGateway.Admin.Blazor/Page/Index.razor.cs b/framework/ThingsGateway.Admin.Blazor/Page/Index.razor.cs index e07499697..028dfcfac 100644 --- a/framework/ThingsGateway.Admin.Blazor/Page/Index.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor/Page/Index.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -18,7 +18,7 @@ using ThingsGateway.Admin.Core; namespace ThingsGateway.Admin.Blazor; /// -/// ҳ +/// 首页 /// public partial class Index { diff --git a/framework/ThingsGateway.Admin.Blazor/Page/UserCenter.razor.cs b/framework/ThingsGateway.Admin.Blazor/Page/UserCenter.razor.cs index 4133cdb56..80f7eacae 100644 --- a/framework/ThingsGateway.Admin.Blazor/Page/UserCenter.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor/Page/UserCenter.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -18,7 +18,7 @@ using ThingsGateway.Admin.Core; namespace ThingsGateway.Admin.Blazor; /// -/// +/// 个人设置 /// public partial class UserCenter { @@ -50,25 +50,25 @@ public partial class UserCenter { await UserCenterService.UpdateUserDefaultRazorAsync(UserManager.UserId, DefaultMenuId); await MainLayout.StateHasChangedAsync(); - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } async Task OnShortcutSaveAsync() { await UserCenterService.UpdateWorkbenchAsync(_menusChoice); await MainLayout.StateHasChangedAsync(); - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } async Task OnUpdatePasswordInfoAsync(FormContext context) { var success = context.Validate(); if (success) { - //֤ɹҵ + //验证成功，操作业务 _passwordInfoInput.Id = UserResoures.CurrentUser.Id; await UserCenterService.EditPasswordAsync(_passwordInfoInput); await MainLayout.StateHasChangedAsync(); - await PopupService.EnqueueSnackbarAsync("ɹµ¼", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功，将重新登录", AlertTypes.Success); await Task.Delay(2000); NavigationManager.NavigateTo(NavigationManager.Uri); } @@ -78,6 +78,6 @@ public partial class UserCenter { await UserCenterService.UpdateUserInfoAsync(_updateInfoInput); await MainLayout.StateHasChangedAsync(); - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } } \ No newline at end of file diff --git a/framework/ThingsGateway.Blazor/Components/ImportExcel.razor.cs b/framework/ThingsGateway.Blazor/Components/ImportExcel.razor.cs index 8545f0605..54d7fc8de 100644 --- a/framework/ThingsGateway.Blazor/Components/ImportExcel.razor.cs +++ b/framework/ThingsGateway.Blazor/Components/ImportExcel.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -21,7 +21,7 @@ using ThingsGateway.Application; namespace ThingsGateway.Blazor; /// -/// excel +/// 导入excel /// public partial class ImportExcel { @@ -33,21 +33,21 @@ public partial class ImportExcel bool isSaveImport; /// - /// + /// 导入 /// [Parameter] public Func, Task> Import { get; set; } /// - /// Ƿʾ + /// 是否显示 /// public bool IsShowImport { get; set; } /// - /// Ԥ + /// 预览 /// [Parameter] public Func>> Preview { get; set; } /// - /// ǰ + /// 当前步数 /// public int Step { get; set; } @@ -75,7 +75,7 @@ public partial class ImportExcel StateHasChanged(); await Import.Invoke(ImportPreviews); _importFile = null; - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } finally { diff --git a/framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor.cs b/framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor.cs index c0650ab79..12561ef5e 100644 --- a/framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor.cs +++ b/framework/ThingsGateway.Blazor/DebugPage/DefalutDebugDriverPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -54,7 +54,7 @@ public partial class DefalutDebugDriverPage : DriverDebugUIBase /// public UdpSessionPage UdpSessionPage; /// - /// ѡ1-TCPCLIENT2-ڣ3-UDP4-TCPServer + /// 选择，1-TCPCLIENT，2-串口，3-UDP，4-TCPServer /// [Parameter] public ChannelEnum Channel { get; set; } @@ -65,12 +65,12 @@ public partial class DefalutDebugDriverPage : DriverDebugUIBase public override ThingsGateway.Foundation.IReadWriteDevice Plc { get; set; } /// - /// ģ + /// 模板 /// [Parameter] public RenderFragment ChildContent { get; set; } /// - /// Զģ + /// 自定义模板 /// [Parameter] public RenderFragment OtherContent { get; set; } @@ -100,7 +100,7 @@ public partial class DefalutDebugDriverPage : DriverDebugUIBase TcpServerPage.LogAction = LogOut; if (UdpSessionPage != null) UdpSessionPage.LogAction = LogOut; - // + //载入配置 StateHasChanged(); } diff --git a/framework/ThingsGateway.Blazor/DebugPage/SerialClientPage.razor.cs b/framework/ThingsGateway.Blazor/DebugPage/SerialClientPage.razor.cs index 1d26ae1ec..33ffdaa48 100644 --- a/framework/ThingsGateway.Blazor/DebugPage/SerialClientPage.razor.cs +++ b/framework/ThingsGateway.Blazor/DebugPage/SerialClientPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -20,7 +20,7 @@ namespace ThingsGateway.Blazor; public partial class SerialClientPage { /// - /// ־ + /// 日志输出 /// public Action LogAction; @@ -36,7 +36,7 @@ public partial class SerialClientPage SerialClient.SafeDispose(); } /// - /// ȡ + /// 获取对象 /// /// public SerialClient GetSerialClient() @@ -47,7 +47,7 @@ public partial class SerialClientPage LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace }); config.ConfigureContainer(a => a.RegisterSingleton(LogMessage)); config.SetSerialProperty(serialProperty); - // + //载入配置 SerialClient.Setup(config); return SerialClient; } diff --git a/framework/ThingsGateway.Blazor/DebugPage/TcpClientPage.razor.cs b/framework/ThingsGateway.Blazor/DebugPage/TcpClientPage.razor.cs index 7ab168d46..f27dc598b 100644 --- a/framework/ThingsGateway.Blazor/DebugPage/TcpClientPage.razor.cs +++ b/framework/ThingsGateway.Blazor/DebugPage/TcpClientPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -23,7 +23,7 @@ namespace ThingsGateway.Blazor; public partial class TcpClientPage { /// - /// ־ + /// 日志输出 /// public Action LogAction; @@ -33,7 +33,7 @@ public partial class TcpClientPage /// private string IP = "127.0.0.1"; /// - /// ˿ + /// 端口 /// [Parameter] public int Port { get; set; } = 502; @@ -73,7 +73,7 @@ public partial class TcpClientPage } } /// - /// ȡ + /// 获取对象 /// /// public TcpClientEx GetTcpClient() @@ -83,7 +83,7 @@ public partial class TcpClientPage LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace }); config.ConfigureContainer(a => a.RegisterSingleton(LogMessage)); config.SetRemoteIPHost(new IPHost(IP + ":" + Port)).SetBufferLength(300); - // + //载入配置 TcpClientEx.Setup(config); return TcpClientEx; } diff --git a/framework/ThingsGateway.Blazor/DebugPage/TcpServerPage.razor.cs b/framework/ThingsGateway.Blazor/DebugPage/TcpServerPage.razor.cs index ca6b6af92..b3c5683f6 100644 --- a/framework/ThingsGateway.Blazor/DebugPage/TcpServerPage.razor.cs +++ b/framework/ThingsGateway.Blazor/DebugPage/TcpServerPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -19,7 +19,7 @@ namespace ThingsGateway.Blazor; public partial class TcpServerPage { /// - /// ־ + /// 日志输出 /// public Action LogAction; @@ -62,7 +62,7 @@ public partial class TcpServerPage } } /// - /// ȡ + /// 获取对象 /// /// public TcpService GetTcpServer() @@ -73,7 +73,7 @@ public partial class TcpServerPage config.ConfigureContainer(a => a.RegisterSingleton(LogMessage)); config.SetListenIPHosts(new IPHost[] { new IPHost(ip + ":" + port) }); config.SetBufferLength(300); - // + //载入配置 TcpServer.Setup(config); return TcpServer; } diff --git a/framework/ThingsGateway.Blazor/DebugPage/UdpSessionPage.razor.cs b/framework/ThingsGateway.Blazor/DebugPage/UdpSessionPage.razor.cs index 6b9d45570..8230af8e5 100644 --- a/framework/ThingsGateway.Blazor/DebugPage/UdpSessionPage.razor.cs +++ b/framework/ThingsGateway.Blazor/DebugPage/UdpSessionPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -19,7 +19,7 @@ namespace ThingsGateway.Blazor; public partial class UdpSessionPage : IDisposable { /// - /// ־ + /// 日志输出 /// public Action LogAction; @@ -62,7 +62,7 @@ public partial class UdpSessionPage : IDisposable } } /// - /// ȡ + /// 获取对象 /// /// public UdpSession GetUdpSession() @@ -73,7 +73,7 @@ public partial class UdpSessionPage : IDisposable config.ConfigureContainer(a => a.RegisterSingleton(LogMessage)); config.SetRemoteIPHost(new IPHost(ip + ":" + port)).SetBufferLength(300); config.SetBindIPHost(new IPHost(0)); - // + //载入配置 UdpSession.Setup(config); return UdpSession; } diff --git a/framework/ThingsGateway.Blazor/Page/DeviceStatusPage.razor.cs b/framework/ThingsGateway.Blazor/Page/DeviceStatusPage.razor.cs index 462403c56..e4e45f158 100644 --- a/framework/ThingsGateway.Blazor/Page/DeviceStatusPage.razor.cs +++ b/framework/ThingsGateway.Blazor/Page/DeviceStatusPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -32,7 +32,7 @@ using ThingsGateway.Application; namespace ThingsGateway.Blazor; /// -/// 豸״̬ҳ +/// 设备状态页面 /// public partial class DeviceStatusPage : IDisposable { @@ -110,7 +110,7 @@ public partial class DeviceStatusPage : IDisposable { try { - var confirm = await PopupService.OpenConfirmDialogAsync("", "ȷ?"); + var confirm = await PopupService.OpenConfirmDialogAsync("重启", "确定重启?"); if (confirm) { isAllRestart = true; @@ -142,8 +142,8 @@ public partial class DeviceStatusPage : IDisposable } async Task ConfigAsync(long devId, bool? isStart) { - var str = isStart == true ? "" : "ͣ"; - var confirm = await PopupService.OpenConfirmDialogAsync(str, $"ȷ{str}?"); + var str = isStart == true ? "启动" : "暂停"; + var confirm = await PopupService.OpenConfirmDialogAsync(str, $"确定{str}?"); if (confirm) { CollectDeviceHostService.ConfigDeviceThread(devId, isStart == true); @@ -167,19 +167,19 @@ public partial class DeviceStatusPage : IDisposable memoryStream.Seek(0, SeekOrigin.Begin); using var streamRef = new DotNetStreamReference(stream: memoryStream); Helper ??= await JS.InvokeAsync("import", $"/_content/ThingsGateway.Admin.Blazor.Core/js/downloadFileFromStream.js"); - await Helper.InvokeVoidAsync("downloadFileFromStream", $"ĵ{SysDateTimeExtensions.CurrentDateTime.ToFileDateTimeFormat()}.txt", streamRef); + await Helper.InvokeVoidAsync("downloadFileFromStream", $"报文导出{SysDateTimeExtensions.CurrentDateTime.ToFileDateTimeFormat()}.txt", streamRef); } finally { isDownExport = false; } } - //ȥɼ + //去除单个采集重启 //async Task RestartAsync(long devId) //{ // try // { - // var confirm = await PopupService.OpenConfirmDialogAsync("", "ȷ?"); + // var confirm = await PopupService.OpenConfirmDialogAsync("重启", "确定重启?"); // if (confirm) // { // isRestart = true; @@ -231,8 +231,8 @@ public partial class DeviceStatusPage : IDisposable async Task UpConfigAsync(long devId, bool? isStart) { - var str = isStart == true ? "" : "ͣ"; - var confirm = await PopupService.OpenConfirmDialogAsync(str, $"ȷ{str}?"); + var str = isStart == true ? "启动" : "暂停"; + var confirm = await PopupService.OpenConfirmDialogAsync(str, $"确定{str}?"); if (confirm) { UploadDeviceHostService.ConfigDeviceThread(devId, isStart == true); @@ -253,7 +253,7 @@ public partial class DeviceStatusPage : IDisposable { try { - var confirm = await PopupService.OpenConfirmDialogAsync("", "ȷ?"); + var confirm = await PopupService.OpenConfirmDialogAsync("重启", "确定重启?"); if (confirm) { isRestart = true; diff --git a/framework/ThingsGateway.Blazor/Page/DeviceVariableRunTimePage.razor.cs b/framework/ThingsGateway.Blazor/Page/DeviceVariableRunTimePage.razor.cs index 86738c6e7..8ccb3d194 100644 --- a/framework/ThingsGateway.Blazor/Page/DeviceVariableRunTimePage.razor.cs +++ b/framework/ThingsGateway.Blazor/Page/DeviceVariableRunTimePage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -28,7 +28,7 @@ using ThingsGateway.Application; namespace ThingsGateway.Blazor; /// -/// ʵʱҳ +/// 实时数据页 /// public partial class DeviceVariableRunTimePage { @@ -37,13 +37,13 @@ public partial class DeviceVariableRunTimePage List _deviceGroups = new(); string _searchName; /// - /// 豸 + /// 设备名称 /// [Parameter] [SupplyParameterFromQuery] public string DeviceName { get; set; } /// - /// ϴ豸 + /// 上传设备名称 /// [Parameter] [SupplyParameterFromQuery] @@ -157,7 +157,7 @@ public partial class DeviceVariableRunTimePage } private async Task WriteAsync(DeviceVariableRunTime collectVariableRunTime) { - // 첽ӵ¼ص + // 将异步方法添加到事件回调上 WriteValueAsync = EventCallback.Factory.Create(this, value => OnWriteValueAsync(collectVariableRunTime, value)); await PopupService.OpenAsync(typeof(WriteValue), new Dictionary() { diff --git a/framework/ThingsGateway.Blazor/Page/HardwareInfoPage.razor.cs b/framework/ThingsGateway.Blazor/Page/HardwareInfoPage.razor.cs index e6492419e..3e558b706 100644 --- a/framework/ThingsGateway.Blazor/Page/HardwareInfoPage.razor.cs +++ b/framework/ThingsGateway.Blazor/Page/HardwareInfoPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -19,7 +19,7 @@ using ThingsGateway.Application; namespace ThingsGateway.Blazor; /// -/// ӲϢҳ +/// 硬件信息页面 /// public partial class HardwareInfoPage { diff --git a/framework/ThingsGateway.Blazor/Page/HistoryAlarmPage.razor.cs b/framework/ThingsGateway.Blazor/Page/HistoryAlarmPage.razor.cs index b25c03ca1..c2e3c1d76 100644 --- a/framework/ThingsGateway.Blazor/Page/HistoryAlarmPage.razor.cs +++ b/framework/ThingsGateway.Blazor/Page/HistoryAlarmPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -25,7 +25,7 @@ using ThingsGateway.Application; namespace ThingsGateway.Blazor; /// -/// ʷҳ +/// 历史报警页面 /// public partial class HistoryAlarmPage { @@ -75,7 +75,7 @@ public partial class HistoryAlarmPage } catch (Exception ex) { - await InvokeAsync(async () => await PopupService.EnqueueSnackbarAsync("ѯʧܣӣ" + ex.Message, AlertTypes.Warning)); + await InvokeAsync(async () => await PopupService.EnqueueSnackbarAsync("查询失败，请检查网络连接：" + ex.Message, AlertTypes.Warning)); return new() { Current = 1, diff --git a/framework/ThingsGateway.Blazor/Page/HistoryValuePage.razor.cs b/framework/ThingsGateway.Blazor/Page/HistoryValuePage.razor.cs index c13b7a586..e5cbb532a 100644 --- a/framework/ThingsGateway.Blazor/Page/HistoryValuePage.razor.cs +++ b/framework/ThingsGateway.Blazor/Page/HistoryValuePage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -23,7 +23,7 @@ using ThingsGateway.Application; namespace ThingsGateway.Blazor; /// -/// ʱҳ +/// 时序库页面 /// public partial class HistoryValuePage { @@ -74,7 +74,7 @@ public partial class HistoryValuePage } catch (Exception ex) { - await InvokeAsync(async () => await PopupService.EnqueueSnackbarAsync("ѯʧܣӣ" + ex.Message, AlertTypes.Warning)); + await InvokeAsync(async () => await PopupService.EnqueueSnackbarAsync("查询失败，请检查网络连接：" + ex.Message, AlertTypes.Warning)); return new() { Current = 1, diff --git a/framework/ThingsGateway.Blazor/Page/RealAlarmPage.razor.cs b/framework/ThingsGateway.Blazor/Page/RealAlarmPage.razor.cs index 5b539d5dc..7ea92b141 100644 --- a/framework/ThingsGateway.Blazor/Page/RealAlarmPage.razor.cs +++ b/framework/ThingsGateway.Blazor/Page/RealAlarmPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -22,7 +22,7 @@ using ThingsGateway.Application; namespace ThingsGateway.Blazor; /// -/// ʵʱ +/// 实时报警 /// public partial class RealAlarmPage { diff --git a/framework/ThingsGateway.Plugin/Foundataion.Demo/ModbusDemo/ModbusDemo.csproj b/framework/ThingsGateway.Plugin/Foundataion.Demo/ModbusDemo/ModbusDemo.csproj index 9837db52f..e64c2a4d5 100644 --- a/framework/ThingsGateway.Plugin/Foundataion.Demo/ModbusDemo/ModbusDemo.csproj +++ b/framework/ThingsGateway.Plugin/Foundataion.Demo/ModbusDemo/ModbusDemo.csproj @@ -1,14 +1,14 @@ - + - - Exe - net6.0 - enable - enable - + + Exe + net6.0 + enable + enable + - - - + + + diff --git a/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/ImportVariable.razor.cs b/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/ImportVariable.razor.cs index ba22e2da1..f885abef1 100644 --- a/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/ImportVariable.razor.cs +++ b/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/ImportVariable.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -25,7 +25,7 @@ using Yitter.IdGenerator; namespace ThingsGateway.OPCDA; /// -/// +/// 导入变量 /// public partial class ImportVariable { @@ -38,7 +38,7 @@ public partial class ImportVariable private bool overlay = true; /// - /// opc + /// opc对象 /// [Parameter] public ThingsGateway.Foundation.Adapter.OPCDA.OPCDAClient PLC { get; set; } @@ -62,7 +62,7 @@ public partial class ImportVariable private List Selected { get; set; } = new(); /// - /// ȡ豸б + /// 获取设备与变量列表 /// /// public (CollectDevice, List) GetImportVariableList() @@ -145,7 +145,7 @@ public partial class ImportVariable { new() { - Name = "δ", + Name = "未完成连接", Tag = new(), Nodes = null } diff --git a/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientDebugDriverPage.razor.cs b/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientDebugDriverPage.razor.cs index 727f6c51c..6d1ac7a41 100644 --- a/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientDebugDriverPage.razor.cs +++ b/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientDebugDriverPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -32,7 +32,7 @@ using Yitter.IdGenerator; namespace ThingsGateway.OPCDA; /// -/// OPCDAҳ +/// OPCDA调试页面 /// public partial class OPCDAClientDebugDriverPage : IDisposable { @@ -64,7 +64,7 @@ public partial class OPCDAClientDebugDriverPage : IDisposable { opcDAClientPage.LogAction = defalutDebugDriverPage.LogOut; opcDAClientPage.ValueAction = ValueOut; - // + //载入配置 _plc = opcDAClientPage.OPC; StateHasChanged(); } @@ -92,12 +92,12 @@ public partial class OPCDAClientDebugDriverPage : IDisposable { if (data?.Item2?.Count == 0) { - await PopupService.EnqueueSnackbarAsync("޿ñ", AlertTypes.Warning); + await PopupService.EnqueueSnackbarAsync("无可用变量", AlertTypes.Warning); return; } await defalutDebugDriverPage.DownDeviceExportAsync(data?.Item1); await defalutDebugDriverPage.DownDeviceVariableExportAsync(data?.Item2, data?.Item1.Name); - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } } private async Task DeviceImport() @@ -107,12 +107,12 @@ public partial class OPCDAClientDebugDriverPage : IDisposable { if (data?.Item2?.Count == 0) { - await PopupService.EnqueueSnackbarAsync("޿ñ", AlertTypes.Warning); + await PopupService.EnqueueSnackbarAsync("无可用变量", AlertTypes.Warning); return; } await defalutDebugDriverPage.DeviceImportAsync(data?.Item1); await defalutDebugDriverPage.DeviceVariableImportAsync(data?.Item2); - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } } @@ -150,7 +150,7 @@ public partial class OPCDAClientDebugDriverPage : IDisposable var data = _plc.WriteItem(defalutDebugDriverPage.Address, defalutDebugDriverPage.WriteValue); if (data.IsSuccess) { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Information, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - д" + data.Message)); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Information, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - 写入" + data.Message)); } else { @@ -159,7 +159,7 @@ public partial class OPCDAClientDebugDriverPage : IDisposable } catch (Exception ex) { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Error, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "дʧܣ" + ex.Message)); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Error, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "写入失败：" + ex.Message)); } return Task.CompletedTask; diff --git a/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientPage.razor.cs b/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientPage.razor.cs index 3554654b3..506feeacc 100644 --- a/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientPage.razor.cs +++ b/framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/OPCDAClientPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -25,7 +25,7 @@ namespace ThingsGateway.OPCDA; public partial class OPCDAClientPage { /// - /// ־ + /// 日志输出 /// public Action LogAction; @@ -35,7 +35,7 @@ public partial class OPCDAClientPage public ThingsGateway.Foundation.Adapter.OPCDA.OPCDAClient OPC; /// - /// ־ + /// 日志输出 /// public Action> ValueAction; @@ -85,7 +85,7 @@ public partial class OPCDAClientPage } private ThingsGateway.Foundation.Adapter.OPCDA.OPCDAClient GetOPCClient() { - // + //载入配置 OPC.Init(node); return OPC; } diff --git a/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/ImportVariable.razor.cs b/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/ImportVariable.razor.cs index ae37ffcff..1e53894f8 100644 --- a/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/ImportVariable.razor.cs +++ b/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/ImportVariable.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -29,7 +29,7 @@ using Yitter.IdGenerator; namespace ThingsGateway.OPCUA; /// -/// +/// 导入变量 /// public partial class ImportVariable { @@ -41,7 +41,7 @@ public partial class ImportVariable private bool overlay = true; /// - /// opc + /// opc对象 /// [Parameter] public ThingsGateway.Foundation.Adapter.OPCUA.OPCUAClient PLC { get; set; } @@ -67,7 +67,7 @@ public partial class ImportVariable private List Selected { get; set; } = new(); /// - /// ȡ豸б + /// 获取设备与变量列表 /// /// public async Task<(CollectDevice, List)> GetImportVariableListAsync() @@ -202,7 +202,7 @@ public partial class ImportVariable { if (!PLC.Connected) { - return new() { new() { Name = "δ", Tag = new(), Nodes = null } }; + return new() { new() { Name = "未完成连接", Tag = new(), Nodes = null } }; } List nodes = new() { diff --git a/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientDebugDriverPage.razor.cs b/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientDebugDriverPage.razor.cs index 4fe0e174d..7a63a2149 100644 --- a/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientDebugDriverPage.razor.cs +++ b/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientDebugDriverPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -33,7 +33,7 @@ using Yitter.IdGenerator; namespace ThingsGateway.OPCUA; /// -/// OPCUAҳ +/// OPCUA调试页面 /// public partial class OPCUAClientDebugDriverPage { @@ -69,7 +69,7 @@ public partial class OPCUAClientDebugDriverPage if (firstRender) { opcUAClientPage.LogAction = defalutDebugDriverPage.LogOut; - // + //载入配置 _plc = opcUAClientPage.OPC; _plc.DataChangedHandler += Plc_DataChangedHandler; StateHasChanged(); @@ -83,7 +83,7 @@ public partial class OPCUAClientDebugDriverPage await _plc.AddSubscriptionAsync(YitIdHelper.NextId().ToString(), new[] { defalutDebugDriverPage.Address }); else { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Debug, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "δ")); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Debug, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "未连接")); } } private async Task DownDeviceExport() @@ -91,12 +91,12 @@ public partial class OPCUAClientDebugDriverPage var data = await ImportVariable?.GetImportVariableListAsync(); if (data.Item2?.Count == 0) { - await PopupService.EnqueueSnackbarAsync("޿ñ", AlertTypes.Warning); + await PopupService.EnqueueSnackbarAsync("无可用变量", AlertTypes.Warning); return; } await defalutDebugDriverPage.DownDeviceExportAsync(data.Item1); await defalutDebugDriverPage.DownDeviceVariableExportAsync(data.Item2, data.Item1.Name); - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } private async Task DeviceImport() @@ -104,12 +104,12 @@ public partial class OPCUAClientDebugDriverPage var data = await ImportVariable?.GetImportVariableListAsync(); if (data.Item2?.Count == 0) { - await PopupService.EnqueueSnackbarAsync("޿ñ", AlertTypes.Warning); + await PopupService.EnqueueSnackbarAsync("无可用变量", AlertTypes.Warning); return; } await defalutDebugDriverPage.DeviceImportAsync(data.Item1); await defalutDebugDriverPage.DeviceVariableImportAsync(data.Item2); - await PopupService.EnqueueSnackbarAsync("ɹ", AlertTypes.Success); + await PopupService.EnqueueSnackbarAsync("成功", AlertTypes.Success); } private void Plc_DataChangedHandler((VariableNode variableNode, DataValue dataValue, Newtonsoft.Json.Linq.JToken jToken) item) @@ -138,7 +138,7 @@ public partial class OPCUAClientDebugDriverPage } else { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "δ")); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "未连接")); } } private void Remove() @@ -147,7 +147,7 @@ public partial class OPCUAClientDebugDriverPage _plc.RemoveSubscription(""); else { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "δ")); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "未连接")); } } @@ -160,21 +160,21 @@ public partial class OPCUAClientDebugDriverPage var data = await _plc.WriteNodeAsync(defalutDebugDriverPage.Address, JToken.Parse(defalutDebugDriverPage.WriteValue)); if (data.IsSuccess) { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Information, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + " - дɹ")); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Information, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + " - 写入成功")); } else { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + " - дʧ " + data.Message)); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + " - 写入失败 " + data.Message)); } } else { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "δ")); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Warning, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + "未连接")); } } catch (Exception ex) { - defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Error, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + " - " + "дʧܣ" + ex.Message)); + defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Error, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + " - " + "写入失败：" + ex.Message)); } } } \ No newline at end of file diff --git a/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientPage.razor.cs b/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientPage.razor.cs index ecd69742c..916de9f16 100644 --- a/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientPage.razor.cs +++ b/framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientPage.razor.cs @@ -1,12 +1,12 @@ -#region copyright +#region copyright //------------------------------------------------------------------------------ -// ˴ȨΪȫļǣԭر·ֶ -// ˴ȨرĴ룩߱Diego -// ԴʹЭѭֿĿԴЭ鼰Э -// GiteeԴֿ⣺https://gitee.com/diego2098/ThingsGateway -// GithubԴֿ⣺https://github.com/kimdiego2098/ThingsGateway -// ʹĵhttps://diego2098.gitee.io/thingsgateway-docs/ -// QQȺ605534569 +// 此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充 +// 此代码版权（除特别声明外的代码）归作者本人Diego所有 +// 源代码使用协议遵循本仓库的开源协议及附加协议 +// Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway +// Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway +// 使用文档：https://diego2098.gitee.io/thingsgateway-docs/ +// QQ群：605534569 //------------------------------------------------------------------------------ #endregion @@ -25,7 +25,7 @@ namespace ThingsGateway.OPCUA; public partial class OPCUAClientPage { /// - /// ־ + /// 日志输出 /// public Action LogAction; ///