From 7dbb24ceb9400e4ee56e2cce667413c515ef7543 Mon Sep 17 00:00:00 2001
From: MoYue <18168119590@163.com>
Date: Sat, 13 Apr 2024 11:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E4=B8=AA=E6=97=B6?=
 =?UTF-8?q?=E5=BA=8F=E4=BF=9D=E5=AD=98=E5=AD=98=E5=9C=A8=E5=90=8C=E7=A7=8D?=
 =?UTF-8?q?=E4=BC=A0=E6=84=9F=E5=99=A8=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/ModifySequentialViewModel.cs      |  34 +++--
 .../Pages/SequentialDistributionViewModel.cs  |   8 ++
 .../Pages/SequentialDistributionView.xaml     | 117 +++++++++++-------
 3 files changed, 108 insertions(+), 51 deletions(-)

diff --git a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
index cacb446..95372a8 100644
--- a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
+++ b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
@@ -32,6 +32,11 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
         public string? workTime { get; set; }
 
         public long? workInt { get; set; }
+        
+        /// <summary>
+        /// 记录编辑时第一次带入的设备名称
+        /// </summary>
+        public string Device { get; set; }
 
         /// <summary>
         /// 开始时间
@@ -333,6 +338,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
                 SensorID = su.SensorID;
                 WorkTime = su.WorkTime;
                 DurationTime = su.DurationTime;
+                Device = SensorID;
             }
 
             DeviceNodes = _deviceSvice.GetDevices().ToList();
@@ -364,19 +370,29 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
                     return;
                 }
 
-                
+                //编辑情况下
                 if (Number != 0)
                 {
-                    //编辑情况下
-                   
-
+                    if (Device != SensorID)
+                    {
+                        //传感器是否已存在校验
+                        var selectFirst = _sequentialService.Query<SysSequentialDetails>(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList();
+                        if (selectFirst.Count != 0)
+                        {
+                            System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示");
+                            return;
+                        }
+                    }
                 }
-                //传感器是否已存在校验
-                var select = _sequentialService.Query<SysSequentialDetails>(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList();
-                if (select.Count != 0)
+                else
                 {
-                    System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示");
-                    return;
+                    //传感器是否已存在校验
+                    var select = _sequentialService.Query<SysSequentialDetails>(m => m.SensorID == SensorID && m.SequenceGroup == SequenceGroup && m.Sequential == kind && m.IsDelete == 0).ToList();
+                    if (select.Count != 0)
+                    {
+                        System.Windows.MessageBox.Show(kind + "- 配置" + SequenceGroup + "中已存在" + SensorID, "提示");
+                        return;
+                    }
                 }
 
                 ///工作时长是否已超过传感器预设时间
diff --git a/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs
index 6fc08bc..8fa0a32 100644
--- a/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs
+++ b/InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs
@@ -281,6 +281,8 @@ namespace InSituLaboratory.ViewModels.Pages
                     sysSequentialDetail.Number = item.Number;
                     sysSequentialDetail.DurationTime = item.DurationTime;
                     sysSequentialDetail.SensorID = item.SensorID;
+                    sysSequentialDetail.WorkTime = item.WorkTime;
+                    sysSequentialDetail.SequenceGroup = item.SequenceGroup;
                     sysSequentialDetail.CreateTime = item.CreateTime;
                     sysSequentialDetail.Sequential = item.Sequential;
                     sysSequentialDetail.SysSquentialID = item.SysSquentialID;
@@ -399,6 +401,8 @@ namespace InSituLaboratory.ViewModels.Pages
                     sysSequentialDetail.Number = item.Number;
                     sysSequentialDetail.DurationTime = item.DurationTime;
                     sysSequentialDetail.SensorID = item.SensorID;
+                    sysSequentialDetail.WorkTime = item.WorkTime;
+                    sysSequentialDetail.SequenceGroup = item.SequenceGroup;
                     sysSequentialDetail.CreateTime = item.CreateTime;
                     sysSequentialDetail.Sequential = item.Sequential;
                     sysSequentialDetail.SysSquentialID = item.SysSquentialID;
@@ -517,6 +521,8 @@ namespace InSituLaboratory.ViewModels.Pages
                     sysSequentialDetail.Number = item.Number;
                     sysSequentialDetail.DurationTime = item.DurationTime;
                     sysSequentialDetail.SensorID = item.SensorID;
+                    sysSequentialDetail.WorkTime = item.WorkTime;
+                    sysSequentialDetail.SequenceGroup = item.SequenceGroup;
                     sysSequentialDetail.CreateTime = item.CreateTime;
                     sysSequentialDetail.Sequential = item.Sequential;
                     sysSequentialDetail.SysSquentialID = item.SysSquentialID;
@@ -635,6 +641,8 @@ namespace InSituLaboratory.ViewModels.Pages
                     sysSequentialDetail.Number = item.Number;
                     sysSequentialDetail.DurationTime = item.DurationTime;
                     sysSequentialDetail.SensorID = item.SensorID;
+                    sysSequentialDetail.WorkTime = item.WorkTime;
+                    sysSequentialDetail.SequenceGroup = item.SequenceGroup;
                     sysSequentialDetail.CreateTime = item.CreateTime;
                     sysSequentialDetail.Sequential = item.Sequential;
                     sysSequentialDetail.SysSquentialID = item.SysSquentialID;
diff --git a/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
index a33cdaa..639ab44 100644
--- a/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
+++ b/InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
@@ -171,7 +171,7 @@
                                                 </TextBlock>
                                                 <TextBlock Margin="5,3">
                                                     <Hyperlink Command="{Binding DataContext.DeleteS1Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                                  CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
+                                                               CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
                                                 </TextBlock>
                                             </StackPanel>
                                         </Grid>
@@ -235,11 +235,15 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Grid>
 
                         <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS2}" Margin="0,10">
@@ -271,20 +275,25 @@
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
                                             </Grid.ColumnDefinitions>
                                             <TextBlock Text="{Binding num}" FontWeight="Normal"  Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
 
                                             <!--操作-->
-                                            <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
+                                            <StackPanel Grid.Column="5" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock VerticalAlignment="Center">
-                                           <Hyperlink Command="{Binding DataContext.ModifyS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                                      CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
+                                                    <Hyperlink Command="{Binding DataContext.ModifyS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                               CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
                                                 </TextBlock>
                                                 <TextBlock Margin="5,3">
-                                           <Hyperlink Command="{Binding DataContext.DeleteS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                         CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
+                                                    <Hyperlink Command="{Binding DataContext.DeleteS2Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                               CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
                                                 </TextBlock>
                                             </StackPanel>
                                         </Grid>
@@ -347,11 +356,15 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Grid>
 
                         <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS3}" Margin="0,10">
@@ -383,20 +396,24 @@
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
                                             </Grid.ColumnDefinitions>
                                             <TextBlock Text="{Binding num}" FontWeight="Normal"  Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
 
                                             <!--操作-->
-                                            <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
+                                            <StackPanel Grid.Column="5" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock VerticalAlignment="Center">
-                                           <Hyperlink Command="{Binding DataContext.ModifyS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                                      CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
+                                                     <Hyperlink Command="{Binding DataContext.ModifyS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}" 
+                                                                CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
                                                 </TextBlock>
                                                 <TextBlock Margin="5,3">
-                                           <Hyperlink Command="{Binding DataContext.DeleteS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                         CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
+                                                     <Hyperlink Command="{Binding DataContext.DeleteS3Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                                CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
                                                 </TextBlock>
                                             </StackPanel>
                                         </Grid>
@@ -459,11 +476,15 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Grid>
 
                         <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS4}" Margin="0,10">
@@ -495,20 +516,25 @@
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
                                             </Grid.ColumnDefinitions>
                                             <TextBlock Text="{Binding num}" FontWeight="Normal"  Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+
 
                                             <!--操作-->
-                                            <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
+                                            <StackPanel Grid.Column="5" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock VerticalAlignment="Center">
-                                           <Hyperlink Command="{Binding DataContext.ModifyS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                                      CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
+                                                        <Hyperlink Command="{Binding DataContext.ModifyS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}" 
+                                                                   CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
                                                 </TextBlock>
                                                 <TextBlock Margin="5,3">
-                                           <Hyperlink Command="{Binding DataContext.DeleteS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                         CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
+                                                        <Hyperlink Command="{Binding DataContext.DeleteS4Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                                   CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
                                                 </TextBlock>
                                             </StackPanel>
                                         </Grid>
@@ -571,11 +597,15 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="循环时长/s" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            <TextBlock Text="操作" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="配置" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="传感器设备" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="工作时长(s)" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="循环时长(s)" Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="操作" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Grid>
 
                         <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding sysSequentialDetailsListS5}" Margin="0,10">
@@ -607,20 +637,24 @@
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
                                             </Grid.ColumnDefinitions>
                                             <TextBlock Text="{Binding num}" FontWeight="Normal"  Grid.Column="0" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SequenceGroup}" FontSize="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding WorkTime}" FontSize="12" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center"/>
 
                                             <!--操作-->
-                                            <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
+                                            <StackPanel Grid.Column="5" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock VerticalAlignment="Center">
-                                           <Hyperlink Command="{Binding DataContext.ModifyS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                                      CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
+                                                      <Hyperlink Command="{Binding DataContext.ModifyS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}" 
+                                                                 CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>
                                                 </TextBlock>
                                                 <TextBlock Margin="5,3">
-                                           <Hyperlink Command="{Binding DataContext.DeleteS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
-                                         CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
+                                                      <Hyperlink Command="{Binding DataContext.DeleteS5Command,RelativeSource={RelativeSource AncestorType=UserControl}}" 
+                                                                 CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">删除</Hyperlink>
                                                 </TextBlock>
                                             </StackPanel>
                                         </Grid>
@@ -631,7 +665,6 @@
                     </Grid>
                 </Grid>
             </Grid>
-
         </Grid>
     </ScrollViewer>
 </UserControl>