修改界面中datagrid边界距离

BlankApp1/BlankApp1/App.xaml.cs

@@ -52,7 +52,7 @@ namespace BlankApp1
             containerRegistry.RegisterSingleton<IAutoMapperProvider, AutoMapperProvider>();
             containerRegistry.Register(typeof(IMapper), GetMapper);
             containerRegistry.RegisterForNavigation<BaseConfigView, BaseConfigViewModel>();
-            containerRegistry.RegisterForNavigation<TestTwoView, TestTwoViewModel>();
+       
             containerRegistry.RegisterForNavigation<TestOperView, TestOperViewModel>();
             containerRegistry.RegisterForNavigation<QueryView, QueryViewModel>();
             containerRegistry.RegisterForNavigation<TreeMenuView, TreeMenuViewModel>();
@@ -61,11 +61,12 @@ namespace BlankApp1
             containerRegistry.RegisterForNavigation<PLCPointView, PLCPointViewModel>();
             containerRegistry.RegisterForNavigation<PLCReadView, PLCReadViewModel>();
             containerRegistry.RegisterForNavigation<PLCWriteView, PLCWriteViewModel>();
-            containerRegistry.RegisterDialog<PopView, PopViewModel>();
+           
             containerRegistry.RegisterDialog<AddOrEditSchView, AddOrEditSchViewModel>();
             containerRegistry.RegisterDialog<AddDetailView, AddDetailViewModel>();
             containerRegistry.RegisterDialog<AutoTestView, AutoTestViewModel>();
             containerRegistry.RegisterDialog<ManualTestView, ManualTestViewModel>();
+            containerRegistry.RegisterDialog<TestResultDetailView, TestResultDetailViewModel>();
         }
 
         private IMapper GetMapper(IContainerProvider container)

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/QueryViewModel.cs

@@ -47,16 +47,39 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             ResetCommand = new DelegateCommand<object>(Reset);
             ExportCommand = new DelegateCommand<string>(Export);
             OnLoadCommand = new DelegateCommand(OnLoad);
+            CheckDetailCommand = new DelegateCommand<object>(CheckDetail);
             GetConfigOption();
           
         }
 
 
 
+        #region 私有方法
+
+
+
+        private void CheckDetail(object obj)
+        {
+            //测试方案明细主键ID
+            long id = Convert.ToInt64(obj);
+            DialogParameters parm = new DialogParameters();
+            parm.Add("Key", id);
+            //弹出详情对话框
+            //弹出详情对话框
+            _dialog.ShowDialog("TestResultDetailView", parm, async callback =>
+            {
+                if (callback.Result == ButtonResult.OK)
+                {
+                    //更新表格，重新获取
+                    GetContent();
+                }
+
+            });
+        }
+
 
 
 
-        #region 私有方法
         /// <summary>
         /// 每次进入页面加载
         /// </summary>
@@ -276,8 +299,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         public DelegateCommand<string> ExportCommand { set; get; }
 
         public DelegateCommand OnLoadCommand { set; get; }
-        
 
+        public DelegateCommand<object> CheckDetailCommand { set; get; }
         #endregion
         #region 数据绑定
         /// <summary>

BlankApp1/BlankApp1/ViewModels/PopViewModel.cs

@@ -1,74 +0,0 @@
-using BlankApp1.Events;
-using Prism.Commands;
-using Prism.Events;
-using Prism.Mvvm;
-using Prism.Services.Dialogs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlankApp1.ViewModels
-{
-    public  class PopViewModel:BindableBase,IDialogAware
-    {
-        private readonly IEventAggregator _aggregator;
-        public PopViewModel(IEventAggregator aggregator)
-        {
-            this._aggregator = aggregator;  
-            SureCommand = new DelegateCommand<string>(Sure);
-            CloseCommand = new DelegateCommand(Close);
-        }
-
-        private void Close()
-        {
-            RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
-        }
-
-        private void Sure(string obj)
-        {
-            DialogParameters parm = new DialogParameters();
-            parm.Add("ReturnValue", DisContent);
-            //发布消息
-            _aggregator.GetEvent<ChangeEvent>().Publish(DisContent);
-            RequestClose?.Invoke(new DialogResult(ButtonResult.OK, parm));
-        }
-
-        public string Title { set; get; } = "弹出窗体";
-
-        public event Action<IDialogResult> RequestClose;
-
-        public bool CanCloseDialog()
-        {
-            return true;
-        }
-
-        public void OnDialogClosed()
-        {
-           
-        }
-
-        public void OnDialogOpened(IDialogParameters parameters)
-        {
-            var getMsg = parameters.GetValues<string>("Key");
-            ///值不为空，表示修改
-            if (getMsg != null)
-            {
-                foreach (var item in getMsg)
-                {
-                    DisContent = item;
-                }
-
-            }
-        }
-        private string  disContent =string.Empty;
-        public string  DisContent
-        {
-            get { return disContent; }
-            set { SetProperty(ref disContent, value); }
-        }
-        public DelegateCommand CloseCommand { set; get; }
-        public DelegateCommand<string> SureCommand { set; get; }
-    }
-}

BlankApp1/BlankApp1/ViewModels/TestTwoViewModel.cs

@@ -1,42 +0,0 @@
-using BlankApp1.Events;
-using Prism.Events;
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlankApp1.ViewModels
-{
-    internal class TestTwoViewModel : BindableBase
-    {
-        public TestTwoViewModel(IEventAggregator aggregator)
-        {
-            //aggregator.GetEvent<ChangeEvent>().Subscribe(ChangeDataUpdate,ThreadOption.PublisherThread,false,msg=>
-            //{
-            //    if(msg.Equals("123"))
-            //    {
-            //        return true;
-            //    }
-            //    else
-            //    {
-            //        return false;
-            //    }
-            //});
-            aggregator.GetEvent<ChangeEvent>().Subscribe(ChangeDataUpdate );
-        }
-
-        private void ChangeDataUpdate(string obj)
-        {
-            EventContent=obj;   
-        }
-
-        private string eventContent = string.Empty;
-        public string EventContent
-        {
-            get { return eventContent; }
-            set { SetProperty(ref eventContent, value); }
-        }
-    }
-}

BlankApp1/BlankApp1/Views/BasicConfigView/AddOrEditSchView.xaml

@@ -108,7 +108,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" >
+                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -196,7 +196,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding InConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0" >
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -280,12 +280,12 @@
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <DockPanel LastChildFill="False">
-                    <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
+                    <TextBlock Text="结果项明细:"   Style="{StaticResource textBlockStyle}" />
                     <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Out" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding OutConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0" >
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />

BlankApp1/BlankApp1/Views/BasicConfigView/BaseConfigView.xaml

@@ -63,7 +63,7 @@
         </Grid>
         <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                 ItemsSource="{Binding BaseConfigList}" IsReadOnly="True"  >
+                 ItemsSource="{Binding BaseConfigList}" IsReadOnly="True" Padding="0"  >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding SchemeId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="测试方案名称" Binding="{Binding SchemeName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/BasicConfigView/EditSchView.xaml

@@ -100,7 +100,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" >
+                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -188,7 +188,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding InConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0" >
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -272,12 +272,12 @@
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <DockPanel LastChildFill="False">
-                    <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
+                    <TextBlock Text="结果项明细:"   Style="{StaticResource textBlockStyle}" />
                     <Button  Content="新增" Height="22" Width="60"  Margin="5,0"  Command="{Binding AddDetailCommand}" CommandParameter="Out" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right"  />
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding OutConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0">
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />

BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml

@@ -102,7 +102,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" >
+                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0">
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -191,7 +191,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding InConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding InConList}"  IsReadOnly="True"  Padding="0">
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -276,11 +276,11 @@
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <DockPanel LastChildFill="False">
-                    <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
+                    <TextBlock Text="结果项明细:"   Style="{StaticResource textBlockStyle}" />
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding OutConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0">
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />

BlankApp1/BlankApp1/Views/BusinessManageView/ManualTestView.xaml

@@ -102,7 +102,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
                   ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" >
+                    ItemsSource="{Binding BeforeConList}"  IsReadOnly="True" Padding="0" >
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -191,7 +191,7 @@
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding InConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding InConList}"  IsReadOnly="True" Padding="0">
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
@@ -276,11 +276,11 @@
                     <RowDefinition/>
                 </Grid.RowDefinitions>
                 <DockPanel LastChildFill="False">
-                    <TextBlock Text="前置项明细:"   Style="{StaticResource textBlockStyle}" />
+                    <TextBlock Text="输出项明细:"   Style="{StaticResource textBlockStyle}" />
                 </DockPanel>
                 <DataGrid Grid.Row="1"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
        ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-         ItemsSource="{Binding OutConList}"  IsReadOnly="True" >
+         ItemsSource="{Binding OutConList}"  IsReadOnly="True" Padding="0">
                     <DataGrid.Columns >
                         <DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                         <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />

BlankApp1/BlankApp1/Views/BusinessManageView/QueryView.xaml

@@ -67,17 +67,34 @@
         </Grid>
         <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
                 ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-               ItemsSource="{Binding BaseConfigList}" IsReadOnly="True"  >
+               ItemsSource="{Binding BaseConfigList}" IsReadOnly="True" Padding="0" >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding SchemeId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="测试方案名称" Binding="{Binding SchemeName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="设备名称" Binding="{Binding DeviceName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试项类型" Binding="{Binding ItemType}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试项名称" Binding="{Binding ItemName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                <DataGridTextColumn Header="测试时间" Binding="{Binding StartTestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="测试结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="状态" Binding="{Binding TestStatus}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="创建者" Binding="{Binding CreateBy}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-              
+                <DataGridTemplateColumn Header="操作" Width="160"  CellStyle="{StaticResource MyDataGridCellStyle}">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <UniformGrid Columns="1">
+                                <Button  Width="auto" Background="Transparent" HorizontalContentAlignment ="Left" Foreground="Black" Height="25" BorderThickness="0"
+                                        Command="{Binding DataContext.CheckDetailCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" CommandParameter="{Binding SchemeId}" Cursor="Hand" Margin="0,0,10,0" >
+
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock  Text="查看测试详情" VerticalAlignment="Center" Foreground="Blue"/>
+                                    </StackPanel>
+                                </Button>
+                                
+
+                            </UniformGrid>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
 
         </DataGrid>

BlankApp1/BlankApp1/Views/BusinessManageView/TestOperView.xaml

@@ -60,7 +60,7 @@
         </Grid>
         <DataGrid  Grid.Row="2"  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
                 ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-               ItemsSource="{Binding BaseConfigList}" IsReadOnly="True"  >
+               ItemsSource="{Binding BaseConfigList}" IsReadOnly="True" Padding="0" >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding SchemeId}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="测试方案名称" Binding="{Binding SchemeName}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/MonitorManageView/PLCReadView.xaml

@@ -9,7 +9,7 @@
     <Grid>
         <DataGrid   ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
         ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-       ItemsSource="{Binding PLCItemList}" IsReadOnly="True"  >
+       ItemsSource="{Binding PLCItemList}" IsReadOnly="True"  Padding="0">
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="PLC变量编码" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/MonitorManageView/PLCWriteView.xaml

@@ -10,7 +10,7 @@
 
         <DataGrid   ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"   RowHeaderWidth="0"
    ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-  ItemsSource="{Binding PLCItemList}" IsReadOnly="True"  HorizontalScrollBarVisibility="Hidden" >
+  ItemsSource="{Binding PLCItemList}" IsReadOnly="True"  HorizontalScrollBarVisibility="Hidden" Padding="0" >
             <DataGrid.Columns >
                 <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
                 <DataGridTextColumn Header="PLC变量编码" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>

BlankApp1/BlankApp1/Views/PopView.xaml

@@ -1,37 +0,0 @@
-<UserControl x:Class="BlankApp1.Views.PopView"
-             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" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BlankApp1.Views"
-                xmlns:prism="http://prismlibrary.com/"
-             Height="400" Width="400">
-    <prism:Dialog.WindowStyle>
-        <Style TargetType="Window">
-            <Setter Property="SizeToContent" Value="WidthAndHeight" />
-            <Setter Property="ResizeMode" Value="NoResize" />
-            <Setter Property="prism:Dialog.WindowStartupLocation" Value="CenterScreen" />
-            <Setter Property="WindowStyle" Value="None" />
-        </Style>
-    </prism:Dialog.WindowStyle>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="50"/>
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0"  Cursor="Hand" >
-            <StackPanel Orientation="Horizontal" Margin="10,5,0,0">
-                <TextBlock Text="编辑" FontSize="15" />
-            </StackPanel>
-            <StackPanel HorizontalAlignment="Right" Margin="10,5,5,0">
-                <Button    Command="{Binding CloseCommand}" Background="Transparent" Content="✕" BorderThickness="0"  Cursor="Hand" />
-            </StackPanel>
-
-        </Grid>
-        <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="10">
-            <TextBlock Text="名称" Height="30" FontSize="20"  Margin="0,0,20,0" />
-            <TextBox  Width="150" Height="30" Text="{Binding  DisContent}" />
-            <Button Content="确认"  Width="100" Command="{Binding SureCommand}" Style="{DynamicResource NormalButtonStyle}"/>
-        </StackPanel>
-    </Grid>
-</UserControl>

BlankApp1/BlankApp1/Views/PopView.xaml.cs

@@ -1,28 +0,0 @@
-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 BlankApp1.Views
-{
-    /// <summary>
-    /// PopView.xaml 的交互逻辑
-    /// </summary>
-    public partial class PopView : UserControl
-    {
-        public PopView()
-        {
-            InitializeComponent();
-        }
-    }
-}

BlankApp1/BlankApp1/Views/TestTwoView.xaml

@@ -1,62 +0,0 @@
-<UserControl x:Class="BlankApp1.Views.TestTwoView"
-             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" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BlankApp1.Views"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid >
-        <Grid.RowDefinitions>
-            <RowDefinition Height="80"/>
-            <RowDefinition/>
-            <RowDefinition Height="80"/>
-        </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal">
-            <TextBlock Text="测试项名称" Height="28" FontSize="15" Margin="30,0,15,0"/>
-            <TextBox  Height="28" Width="150" />
-            <Button  Content="查询" Width="80"  Margin="15,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
-            <Button  Content="新增" Width="80"  Margin="15,0"  Command="{Binding PopCommand}" Style="{StaticResource NormalButtonStyle}"/>
-            <Button Content="导出Excel" Width="80"  Margin="15,0"  Command="{Binding QueryCommand}" Style="{StaticResource NormalButtonStyle}" />
-        </StackPanel>
-        <Border Grid.Row="1" Margin="5">
-            <DataGrid  ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False"  SelectionUnit="FullRow" SelectionMode="Single"  RowHeaderWidth="0"
-                  ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
-                  ItemsSource="{Binding BaseConfigList}" IsReadOnly="True"  >
-                <DataGrid.Columns >
-                    <DataGridTextColumn Header="测试项名称" Binding="{Binding Id}"  CellStyle="{StaticResource DataGridCellStyle}" />
-                    <DataGridTextColumn Header="测试项类型" Binding="{Binding Name}" CellStyle="{StaticResource DataGridCellStyle}"/>
-
-                    <DataGridTemplateColumn Header="操作"  CellStyle="{StaticResource DataGridCellStyle}">
-                        <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
-                                <UniformGrid Columns="3">
-                                    <Button  Width="80" Background="Transparent" HorizontalContentAlignment ="Left" Foreground="Black" Height="25" BorderThickness="0"
-                    Command="{Binding DataContext.EditCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" 
-                    Cursor="Hand" >
-
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock  Text="编辑" VerticalAlignment="Center" Foreground="Blue"/>
-                                        </StackPanel>
-                                    </Button>
-                                    <Button  Width="80" Background="Transparent" HorizontalContentAlignment ="Left" Foreground="Black" Height="25" BorderThickness="0"
-                    Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid}}" 
-                    Cursor="Hand" >
-
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock  Text="删除" VerticalAlignment="Center" Foreground="Blue"/>
-                                        </StackPanel>
-                                    </Button>
-
-                                </UniformGrid>
-                            </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                    </DataGridTemplateColumn>
-
-                </DataGrid.Columns>
-
-            </DataGrid>
-        </Border>
-
-    </Grid>
-</UserControl>

BlankApp1/BlankApp1/Views/TestTwoView.xaml.cs

@@ -1,28 +0,0 @@
-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 BlankApp1.Views
-{
-    /// <summary>
-    /// TestTwoView.xaml 的交互逻辑
-    /// </summary>
-    public partial class TestTwoView : UserControl
-    {
-        public TestTwoView()
-        {
-            InitializeComponent();
-        }
-    }
-}