diff --git a/ADP.sln b/ADP.sln
index 3a8a9fb..e751402 100644
--- a/ADP.sln
+++ b/ADP.sln
@@ -45,6 +45,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CANModule", "CANModule\CANM
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "加密狗", "加密狗\加密狗.csproj", "{A35CA316-7B5B-4183-8636-4ECA532B1489}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurveModule", "CurveModule\CurveModule.csproj", "{84006890-9288-44C4-9D17-FA88F3FDECFA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -131,6 +133,10 @@ Global
{A35CA316-7B5B-4183-8636-4ECA532B1489}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A35CA316-7B5B-4183-8636-4ECA532B1489}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A35CA316-7B5B-4183-8636-4ECA532B1489}.Release|Any CPU.Build.0 = Release|Any CPU
+ {84006890-9288-44C4-9D17-FA88F3FDECFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -145,5 +151,6 @@ Global
{170AD4C1-189D-4FBE-B10D-2A4304527834} = {1E92D601-68FC-45F6-8251-BD0F39226E5B}
{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}
EndGlobalSection
EndGlobal
diff --git a/ADP/ViewModels/ShellViewModel.cs b/ADP/ViewModels/ShellViewModel.cs
index 0ad9680..b87f74d 100644
--- a/ADP/ViewModels/ShellViewModel.cs
+++ b/ADP/ViewModels/ShellViewModel.cs
@@ -844,6 +844,10 @@ namespace ADP.ViewModels
if (_globalInfo.CurrentScope != "default") return;
_regionManager.RequestNavigate("ShellViewManager", "BenchMovementView");
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 db1c730..119d1e3 100644
--- a/ADP/Views/ShellView.xaml
+++ b/ADP/Views/ShellView.xaml
@@ -66,6 +66,11 @@
CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
Style="{StaticResource MaterialDesignFlatButton}"
Margin="8" />
+
diff --git a/CurveModule/CurveModule.cs b/CurveModule/CurveModule.cs
new file mode 100644
index 0000000..13243e7
--- /dev/null
+++ b/CurveModule/CurveModule.cs
@@ -0,0 +1,20 @@
+
+using CurveModule.Views;
+using System.Reflection;
+
+namespace CurveModule
+{
+ public class CurveModule: IModule
+ {
+ public void OnInitialized(IContainerProvider containerProvider)
+ {
+ IRegionManager regionManager = containerProvider.Resolve();
+ }
+
+ public void RegisterTypes(IContainerRegistry containerRegistry)
+ {
+ containerRegistry.RegisterForNavigation("CurveRecallView");
+ }
+ }
+
+}
diff --git a/CurveModule/CurveModule.csproj b/CurveModule/CurveModule.csproj
new file mode 100644
index 0000000..be2fb1b
--- /dev/null
+++ b/CurveModule/CurveModule.csproj
@@ -0,0 +1,20 @@
+
+
+
+ net8.0-windows
+ enable
+ true
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CurveModule/ViewModels/CurveRecallViewModel.cs b/CurveModule/ViewModels/CurveRecallViewModel.cs
new file mode 100644
index 0000000..2d5ff4d
--- /dev/null
+++ b/CurveModule/ViewModels/CurveRecallViewModel.cs
@@ -0,0 +1,68 @@
+using Logger;
+using MahApps.Metro.Controls;
+using Model.Entity;
+using Model.Models;
+using NLog.Targets;
+using OxyPlot;
+using Service.Interface;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using System.Windows.Threading;
+using UIShare.GlobalVariable;
+using UIShare.UIViewModel;
+using UIShare.ViewModelBase;
+
+namespace CurveModule.ViewModels
+{
+ public class CurveRecallViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
+ {
+ #region 属性
+ public bool KeepAlive => true;
+ #endregion
+
+ #region 命令
+
+ #endregion
+
+ #region 私有字段
+
+ #endregion
+ public CurveRecallViewModel(IContainerProvider containerProvider) : base(containerProvider)
+ {
+
+ }
+
+ #region 命令处理
+
+
+
+ #endregion
+
+ #region 辅助方法
+
+
+ #endregion
+ #region 生命周期
+
+ public override void OnNavigatedTo(NavigationContext navigationContext)
+ {
+
+ }
+
+ public void Dispose()
+ {
+
+ }
+
+ #endregion
+
+ }
+}
diff --git a/CurveModule/Views/CurveRecallView.xaml b/CurveModule/Views/CurveRecallView.xaml
new file mode 100644
index 0000000..8de793a
--- /dev/null
+++ b/CurveModule/Views/CurveRecallView.xaml
@@ -0,0 +1,14 @@
+
+
+
+
+
diff --git a/CurveModule/Views/CurveRecallView.xaml.cs b/CurveModule/Views/CurveRecallView.xaml.cs
new file mode 100644
index 0000000..0b28627
--- /dev/null
+++ b/CurveModule/Views/CurveRecallView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace CurveModule.Views
+{
+ ///
+ /// CurveRecallView.xaml 的交互逻辑
+ ///
+ public partial class CurveRecallView : UserControl
+ {
+ public CurveRecallView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/MonitorModule/MonitorModule.cs b/MonitorModule/MonitorModule.cs
index fb6d2f5..a931337 100644
--- a/MonitorModule/MonitorModule.cs
+++ b/MonitorModule/MonitorModule.cs
@@ -17,6 +17,7 @@ namespace MonitorModule
{
containerRegistry.RegisterForNavigation("MonitorView");
containerRegistry.RegisterForNavigation("RecordView");
+ containerRegistry.RegisterForNavigation("CurveRecallView");
containerRegistry.RegisterDialog("ValueLimitView");
}
}
diff --git a/MonitorModule/ViewModels/CurveRecallViewModel.cs b/MonitorModule/ViewModels/CurveRecallViewModel.cs
new file mode 100644
index 0000000..1d800ad
--- /dev/null
+++ b/MonitorModule/ViewModels/CurveRecallViewModel.cs
@@ -0,0 +1,68 @@
+using Logger;
+using MahApps.Metro.Controls;
+using Model.Entity;
+using Model.Models;
+using NLog.Targets;
+using OxyPlot;
+using Service.Interface;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using System.Windows.Threading;
+using UIShare.GlobalVariable;
+using UIShare.UIViewModel;
+using UIShare.ViewModelBase;
+
+namespace MonitorModule.ViewModels
+{
+ public class CurveRecallViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
+ {
+ #region 属性
+ public bool KeepAlive => true;
+ #endregion
+
+ #region 命令
+
+ #endregion
+
+ #region 私有字段
+
+ #endregion
+ public CurveRecallViewModel(IContainerProvider containerProvider) : base(containerProvider)
+ {
+
+ }
+
+ #region 命令处理
+
+
+
+ #endregion
+
+ #region 辅助方法
+
+
+ #endregion
+ #region 生命周期
+
+ public override void OnNavigatedTo(NavigationContext navigationContext)
+ {
+
+ }
+
+ public void Dispose()
+ {
+
+ }
+
+ #endregion
+
+ }
+}
diff --git a/MonitorModule/Views/CurveRecallView.xaml b/MonitorModule/Views/CurveRecallView.xaml
new file mode 100644
index 0000000..81f0933
--- /dev/null
+++ b/MonitorModule/Views/CurveRecallView.xaml
@@ -0,0 +1,14 @@
+
+
+
+
+
diff --git a/MonitorModule/Views/CurveRecallView.xaml.cs b/MonitorModule/Views/CurveRecallView.xaml.cs
new file mode 100644
index 0000000..8ba8774
--- /dev/null
+++ b/MonitorModule/Views/CurveRecallView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace MonitorModule.Views
+{
+ ///
+ /// CurveRecallView.xaml 的交互逻辑
+ ///
+ public partial class CurveRecallView : UserControl
+ {
+ public CurveRecallView()
+ {
+ InitializeComponent();
+ }
+ }
+}