From c592bcd2729aa878b39c22c9ec90498d1f0648cb Mon Sep 17 00:00:00 2001 From: hsc Date: Thu, 23 Jul 2026 10:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ADP.sln | 7 ++ ADP/ADP.csproj | 2 + ADP/ViewModels/ShellViewModel.cs | 8 ++- ADP/Views/ShellView.xaml | 6 ++ ExportModule/ExportModule.cs | 20 ++++++ ExportModule/ExportModule.csproj | 16 +++++ ExportModule/ViewModels/ExportViewModel.cs | 68 +++++++++++++++++++ ExportModule/Views/ExportView.xaml | 14 ++++ ExportModule/Views/ExportView.xaml.cs | 28 ++++++++ Model/Entity/TestReportEntity.cs | 64 +++++++++++++++++ .../ViewModels/StepsManagerViewModel.cs | 1 + TestingModule/Views/StepsManager.xaml | 2 +- UIShare/GlobalVariable/StepRunning.cs | 64 ++++++++++++++++- UIShare/UIShare.csproj | 1 + 14 files changed, 297 insertions(+), 4 deletions(-) create mode 100644 ExportModule/ExportModule.cs create mode 100644 ExportModule/ExportModule.csproj create mode 100644 ExportModule/ViewModels/ExportViewModel.cs create mode 100644 ExportModule/Views/ExportView.xaml create mode 100644 ExportModule/Views/ExportView.xaml.cs create mode 100644 Model/Entity/TestReportEntity.cs diff --git a/ADP.sln b/ADP.sln index e751402..a0933b1 100644 --- a/ADP.sln +++ b/ADP.sln @@ -47,6 +47,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "加密狗", "加密狗\加 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurveModule", "CurveModule\CurveModule.csproj", "{84006890-9288-44C4-9D17-FA88F3FDECFA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExportModule", "ExportModule\ExportModule.csproj", "{8923122F-F7D3-4AE7-9E86-9E78F1296A11}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -137,6 +139,10 @@ Global {84006890-9288-44C4-9D17-FA88F3FDECFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {84006890-9288-44C4-9D17-FA88F3FDECFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {84006890-9288-44C4-9D17-FA88F3FDECFA}.Release|Any CPU.Build.0 = Release|Any CPU + {8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8923122F-F7D3-4AE7-9E86-9E78F1296A11}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -152,5 +158,6 @@ Global {31F84D0E-3634-4C70-A830-21AF412E3BBF} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} {AF2533DD-599D-49D7-942B-B0C26534D15F} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} {84006890-9288-44C4-9D17-FA88F3FDECFA} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} + {8923122F-F7D3-4AE7-9E86-9E78F1296A11} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} EndGlobalSection EndGlobal diff --git a/ADP/ADP.csproj b/ADP/ADP.csproj index 9b029e8..d830b54 100644 --- a/ADP/ADP.csproj +++ b/ADP/ADP.csproj @@ -22,8 +22,10 @@ + + diff --git a/ADP/ViewModels/ShellViewModel.cs b/ADP/ViewModels/ShellViewModel.cs index b87f74d..a514b55 100644 --- a/ADP/ViewModels/ShellViewModel.cs +++ b/ADP/ViewModels/ShellViewModel.cs @@ -12,12 +12,12 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Input; using System.Windows.Media; -using System.Windows.Threading; // 💡 新增:引入定时器命名空间 +using System.Windows.Threading; using UIShare; using UIShare.GlobalVariable; using UIShare.PubEvent; using UIShare.UIViewModel; -using ZLGUSBCANFD; +using SqlSugar; namespace ADP.ViewModels { @@ -845,6 +845,10 @@ namespace ADP.ViewModels _regionManager.RequestNavigate("ShellViewManager", "BenchMovementView"); break; case "曲线回读界面": + if (_globalInfo.CurrentScope != "default") return; + _regionManager.RequestNavigate("ShellViewManager", "CurveRecallView"); + break; + case "测试报告导出界面": if (_globalInfo.CurrentScope != "default") return; _regionManager.RequestNavigate("ShellViewManager", "CurveRecallView"); break; diff --git a/ADP/Views/ShellView.xaml b/ADP/Views/ShellView.xaml index 119d1e3..88df17c 100644 --- a/ADP/Views/ShellView.xaml +++ b/ADP/Views/ShellView.xaml @@ -71,6 +71,11 @@ CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}" Style="{StaticResource MaterialDesignFlatButton}" Margin="8" /> +