修改nlog

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddOrEditSchViewModel.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using BizService;
+using Microsoft.Extensions.Logging;
 using Model.Dto;
 using Model.Entities;
 using Newtonsoft.Json;
-using NLog;
 using PLCTool.Common;
 using Prism.Commands;
 using Prism.Events;
@@ -29,7 +29,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private readonly IMapper _mapper;
         private readonly ILogger _logger;
         private List<OptionConfigDto> _optionConfigs;
-        public AddOrEditSchViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IMapper mapper)
+        public AddOrEditSchViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IMapper mapper,ILogger logger)
         {
             _dialog = dialog;
             _aggregator = aggregator;
@@ -37,7 +37,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             _basicPlcTestSchemeService = basicPlcTestSchemeService;
             _basicPlcTestSchemeDtlService = basicPlcTestSchemeDtlService;
             _mapper = mapper;
-            //_logger = logger;
+            _logger = logger;
             CloseCommand = new DelegateCommand(Close);
             SureCommand = new DelegateCommand<string>(Sure);
             ResetCommand = new DelegateCommand<string>(ResetMethod);
@@ -414,7 +414,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 bool isAddSucc = _basicPlcTestSchemeDtlService.Add(schDtlEntity);
                 if (isAddSucc)
                 {
-                    _logger.Info($"新增方案成功。方案名{ScheduleName}，测试项{TestName}");
+                    _logger.LogInformation($"新增方案成功。方案名{ScheduleName}，测试项{TestName}");
                     MessageBoxResult boxResult = MessageBox.Show("更新成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
                 }
                 else
@@ -436,7 +436,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         bool isSucc = _basicPlcTestSchemeDtlService.Edit(schDtlEntityEdit);
                         if (isSucc)
                         {
-                            _logger.Info($"更新方案成功。方案名{ScheduleName}，测试项{TestName}");
+                            _logger.LogInformation($"更新方案成功。方案名{ScheduleName}，测试项{TestName}");
                             MessageBoxResult boxResult = MessageBox.Show("更新成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
                         }
                         else

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/TestOperViewModel.cs

@@ -59,8 +59,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         #region 私有方法
         private void ManualTest(object obj)
         {
+             //测试方案明细主键ID
+            long id = Convert.ToInt64(obj);
+            DialogParameters parm = new DialogParameters();
+            parm.Add("Key", id);
+            //弹出详情对话框
             //弹出详情对话框
-            _dialog.ShowDialog("ManualTestView", async callback =>
+            _dialog.ShowDialog("ManualTestView", parm, async callback =>
             {
                 if (callback.Result == ButtonResult.OK)
                 {