更改界面名称

BlankApp1/BlankApp1/App.xaml.cs

@@ -70,7 +70,7 @@ namespace BlankApp1
             containerRegistry.RegisterForNavigation<DeviceTestView, DeviceTestViewModel>();
             containerRegistry.RegisterForNavigation<ResultQueryView, ResultQueryViewModel>();
             containerRegistry.RegisterForNavigation<RetryTestView, RetryTestViewModel>();
-            containerRegistry.RegisterForNavigation<AddOrEditSchView, AddOrEditSchViewModel>();
+            containerRegistry.RegisterForNavigation<AddSchView, AddSchViewModel>();
 
             containerRegistry.RegisterForNavigation<DeviceTestCardView, DeviceTestCardViewModel>();
             containerRegistry.RegisterForNavigation<ProjectTestView, ProjectTestViewModel>();

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddOrEditSchViewModel.cs → BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddSchViewModel.cs

@@ -24,7 +24,7 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
 
 namespace PLCTool.ViewModels.BasicConfigViewModel
 {
-    public class AddOrEditSchViewModel  : BindableBase, INavigationAware
+    public class AddSchViewModel  : BindableBase, INavigationAware
     {
         private readonly IDialogService _dialog;
         private readonly IEventAggregator _aggregator;
@@ -39,7 +39,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private bas_plc_test_scheme bas_Plc_Test_Scheme;//测试方案
         private int schDtlMainId = 0;//测试方案明细主键id
         public event Action<NavigationResult> RequestClose;
-        public AddOrEditSchViewModel(IDialogService dialog, IEventAggregator aggregator, IRegionManager regionManager,IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBasicDeviceKindService iBasicDeviceKindService, IMapper mapper,ILogger logger)
+        public AddSchViewModel(IDialogService dialog, IEventAggregator aggregator, IRegionManager regionManager,IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBasicDeviceKindService iBasicDeviceKindService, IMapper mapper,ILogger logger)
         {
             _dialog = dialog;
             _aggregator = aggregator;

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/BaseConfigViewModel.cs

@@ -175,7 +175,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             parm.Add("Key", schemeName);
             parm.Add("Key2", deviceKindName);
 
-            _regionManager.Regions["ContentRegion"].RequestNavigate("AddOrEditSchView", async callback =>
+            _regionManager.Regions["ContentRegion"].RequestNavigate("EditSchView", async callback =>
             {
                 if (callback.Result == true)
                 {
@@ -237,7 +237,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <param name="obj"></param>
         private void AddPlan(string obj)
         {
-            _regionManager.Regions["ContentRegion"].RequestNavigate("AddOrEditSchView");
+            _regionManager.Regions["ContentRegion"].RequestNavigate("AddSchView");
             //弹出详情对话框
             //_dialog.ShowDialog("AddOrEditSchView", async callback =>
             //{

BlankApp1/BlankApp1/Views/BasicConfigView/AddOrEditSchView.xaml → BlankApp1/BlankApp1/Views/BasicConfigView/AddSchView.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="PLCTool.Views.BasicConfigView.AddOrEditSchView"
+<UserControl x:Class="PLCTool.Views.BasicConfigView.AddSchView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

BlankApp1/BlankApp1/Views/BasicConfigView/AddOrEditSchView.xaml.cs → BlankApp1/BlankApp1/Views/BasicConfigView/AddSchView.xaml.cs

@@ -19,9 +19,9 @@ namespace PLCTool.Views.BasicConfigView
     /// <summary>
     /// AddOrEditSchView.xaml 的交互逻辑
     /// </summary>
-    public partial class AddOrEditSchView : UserControl
+    public partial class AddSchView : UserControl
     {
-        public AddOrEditSchView()
+        public AddSchView()
         {
             InitializeComponent();
         }