From 252c70ef05b2f6572de0ca8150cd396abc0888cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chsc=E2=80=9D?= <“huangsucan@kaiyili-lab.com”> Date: Wed, 29 Jul 2026 16:54:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8D=95=E7=8B=AC=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ACP/ViewModels/ShellViewModel.cs | 5 +- ACP/Views/ShellView.xaml | 6 +- DeviceCommand/Devices/IT6015C.cs | 300 +++++++++++++++++ .../Devices/{IT6000C.cs => IT6036C .cs} | 4 +- .../ViewModels/DG1000ZViewModel.cs | 147 +++++++++ .../ViewModels/IT6015CViewModel.cs | 147 +++++++++ .../ViewModels/IT6036CViewModel.cs | 147 +++++++++ .../ViewModels/IT6720ViewModel.cs | 147 +++++++++ .../ViewModels/IT7800EViewModel.cs | 310 ++++++++++++++++++ .../ViewModels/PW8001ViewModel.cs | 148 +++++++++ .../ViewModels/TektronixMSOViewModel.cs | 148 +++++++++ DeviceEditModule/Views/DG1000ZView.xaml | 15 + DeviceEditModule/Views/DG1000ZView.xaml.cs | 28 ++ DeviceEditModule/Views/IT6015CView.xaml | 15 + DeviceEditModule/Views/IT6015CView.xaml.cs | 28 ++ DeviceEditModule/Views/IT6036CView.xaml | 16 + DeviceEditModule/Views/IT6036CView.xaml.cs | 28 ++ DeviceEditModule/Views/IT6720View.xaml | 15 + DeviceEditModule/Views/IT6720View.xaml.cs | 28 ++ DeviceEditModule/Views/IT7800EView.xaml | 272 +++++++++++++++ DeviceEditModule/Views/IT7800EView.xaml.cs | 28 ++ DeviceEditModule/Views/PW8001View.xaml | 15 + DeviceEditModule/Views/PW8001View.xaml.cs | 28 ++ DeviceEditModule/Views/TektronixMSOView.xaml | 15 + .../Views/TektronixMSOView.xaml.cs | 28 ++ 25 files changed, 2057 insertions(+), 11 deletions(-) create mode 100644 DeviceCommand/Devices/IT6015C.cs rename DeviceCommand/Devices/{IT6000C.cs => IT6036C .cs} (99%) create mode 100644 DeviceEditModule/ViewModels/DG1000ZViewModel.cs create mode 100644 DeviceEditModule/ViewModels/IT6015CViewModel.cs create mode 100644 DeviceEditModule/ViewModels/IT6036CViewModel.cs create mode 100644 DeviceEditModule/ViewModels/IT6720ViewModel.cs create mode 100644 DeviceEditModule/ViewModels/IT7800EViewModel.cs create mode 100644 DeviceEditModule/ViewModels/PW8001ViewModel.cs create mode 100644 DeviceEditModule/ViewModels/TektronixMSOViewModel.cs create mode 100644 DeviceEditModule/Views/DG1000ZView.xaml create mode 100644 DeviceEditModule/Views/DG1000ZView.xaml.cs create mode 100644 DeviceEditModule/Views/IT6015CView.xaml create mode 100644 DeviceEditModule/Views/IT6015CView.xaml.cs create mode 100644 DeviceEditModule/Views/IT6036CView.xaml create mode 100644 DeviceEditModule/Views/IT6036CView.xaml.cs create mode 100644 DeviceEditModule/Views/IT6720View.xaml create mode 100644 DeviceEditModule/Views/IT6720View.xaml.cs create mode 100644 DeviceEditModule/Views/IT7800EView.xaml create mode 100644 DeviceEditModule/Views/IT7800EView.xaml.cs create mode 100644 DeviceEditModule/Views/PW8001View.xaml create mode 100644 DeviceEditModule/Views/PW8001View.xaml.cs create mode 100644 DeviceEditModule/Views/TektronixMSOView.xaml create mode 100644 DeviceEditModule/Views/TektronixMSOView.xaml.cs diff --git a/ACP/ViewModels/ShellViewModel.cs b/ACP/ViewModels/ShellViewModel.cs index 7929ab4..8474c62 100644 --- a/ACP/ViewModels/ShellViewModel.cs +++ b/ACP/ViewModels/ShellViewModel.cs @@ -841,10 +841,7 @@ namespace ACP.ViewModels _regionManager.RequestNavigate(settingRegion, "SettingView", settingParameters); IsLeftDrawerOpen = false; break; - case "台架移动界面": - if (_globalInfo.CurrentScope != "default") return; - _regionManager.RequestNavigate("ShellViewManager", "BenchMovementView"); - break; + case "曲线回读界面": if (_globalInfo.CurrentScope != "default") return; _regionManager.RequestNavigate("ShellViewManager", "CurveRecallView"); diff --git a/ACP/Views/ShellView.xaml b/ACP/Views/ShellView.xaml index a44c3d8..de8ebda 100644 --- a/ACP/Views/ShellView.xaml +++ b/ACP/Views/ShellView.xaml @@ -61,11 +61,7 @@ Style="{StaticResource MaterialDesignFlatButton}" Margin="8" /> -