更换图标 重新设计

InSituLaboratory.Assets/InSituLaboratory.Assets.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
     <None Remove="Fonts\iconfont.ttf" />
     <None Remove="Images\20240201.jpg" />
+    <None Remove="Images\6604cd8ecc29d.ico" />
     <None Remove="Images\Avatar\002m.jpg" />
     <None Remove="Images\bitbug_favicon.ico" />
     <None Remove="Images\covers\1.png" />
@@ -25,6 +26,9 @@
 
   <ItemGroup>
     <Resource Include="Images\20240201.jpg" />
+    <Resource Include="Images\6604cd8ecc29d.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\bitbug_favicon.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>

InSituLaboratory.Models/MEMSChromatogramModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace InSituLaboratory.Models
+{
+    public class MEMSChromatogramModel
+    {
+        public DateTime SamplingTime { get; set; }
+        public string FaultCodes { get; set; }
+        public string C2Concentration { get; set; }
+        public string C3Concentration { get; set; }
+        public string C4Concentration { get; set; }
+    }
+}

InSituLaboratory.Models/MEMSMassModel.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace InSituLaboratory.Models
+{
+    public class MEMSMassModel
+    {
+        public DateTime SamplingTime { get; set; }
+        public string FaultCodes { get; set; }
+
+        public string CH4Concentration { get; set; }
+        public string H2OConcentration { get; set; }
+        public string N2Concentration { get; set; }
+        public string O2Concentration { get; set; }
+        public string ARConcentration { get; set; }
+        public string CO2Concentration { get; set; }
+
+
+    }
+}

InSituLaboratory.Models/RecordModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace InSituLaboratory.Models
+{
+    public  class RecordModel
+    {
+        public int Number { get; set; }
+
+        public string SensorID { get; set; }
+        public string DurationTime { get; set; }
+    }
+}

InSituLaboratory/App.xaml

@@ -16,6 +16,9 @@
                 <ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/PageBaseTempalte.xaml"/>
                 <ResourceDictionary Source="/InSituLaboratory.Assets;component/Styles/CollectionStyles.xaml"/>
 
+                <!--<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>-->
+
                 <ResourceDictionary>
                     <FontFamily x:Key="Icons">/InSituLaboratory.Assets;component/Fonts/iconfont.ttf#zx_icons</FontFamily>
                 </ResourceDictionary>

InSituLaboratory/InSituLaboratory.csproj

@@ -6,11 +6,11 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>bitbug_favicon.ico</ApplicationIcon>
+    <ApplicationIcon>6604.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="bitbug_favicon.ico" />
+    <Content Include="6604.ico" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,6 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="HandyControl" Version="3.5.1" />
     <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
     <PackageReference Include="Prism.Unity" Version="8.1.97" />
   </ItemGroup>

InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs

@@ -7,15 +7,30 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using InSituLaboratory.Models;
 
 namespace InSituLaboratory.ViewModels.Pages
 {
     public class DashboardViewModel : ViewModelBase
     {
+        public ObservableCollection<MEMSChromatogramModel> MEMSList { get; set; } = new ObservableCollection<MEMSChromatogramModel>();
+        public ObservableCollection<MEMSMassModel> MEMSMassList { get; set; } = new ObservableCollection<MEMSMassModel>();
         public DashboardViewModel() : base(null)
         {
             PageTitle = "数据中心";
             IsCanClose = false;
+
+            MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "设备温度：正常；湿度：正常", C2Concentration = "30" , C3Concentration="40" , C4Concentration ="50"});
+            MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "压力:警报、绝缘：未监控", C2Concentration = "10" , C3Concentration="20" , C4Concentration ="30"});
+            
+            MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "设备温度：正常；湿度：正常", C2Concentration = "20" , C3Concentration="30" , C4Concentration ="70"});
+            MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "湿度：正常", C2Concentration = "15" , C3Concentration="20" , C4Concentration ="30"});
+            MEMSList.Add(new MEMSChromatogramModel { SamplingTime = DateTime.Now, FaultCodes = "压力：正常", C2Concentration = "15" , C3Concentration="20" , C4Concentration ="30"});
+
+
+
+            MEMSMassList.Add(new MEMSMassModel { SamplingTime = DateTime.Now, FaultCodes = "压力：正常", CH4Concentration = "10", H2OConcentration="20" , N2Concentration ="30", O2Concentration ="40", ARConcentration ="50", CO2Concentration ="60"});
+
         }
     }
 }

InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs

@@ -4,6 +4,7 @@ using Prism.Regions;
 using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -13,6 +14,8 @@ namespace InSituLaboratory.ViewModels.Pages
 {
     public class SequentialDistributionViewModel : ViewModelBase
     {
+        public ObservableCollection<RecordModel> RecordList { get; set; } =
+            new ObservableCollection<RecordModel>();
 
         IDialogService _dialogService;
         public SequentialDistributionViewModel(IRegionManager regionManager, IDialogService dialogService) : base(regionManager)
@@ -20,6 +23,11 @@ namespace InSituLaboratory.ViewModels.Pages
             this.PageTitle = "时序下发";
             _dialogService = dialogService;
 
+
+            RecordList.Add(new RecordModel { Number = 1, SensorID = "色谱、质谱", DurationTime = "30"});
+            RecordList.Add(new RecordModel { Number = 2, SensorID = "二氧化碳", DurationTime = "50"});
+            RecordList.Add(new RecordModel { Number = 3, SensorID = "摄像1、摄像2", DurationTime = "100"});
+         
             Refresh();
         }
 

InSituLaboratory/Views/MainView.xaml

@@ -124,7 +124,7 @@
                 </Grid.RowDefinitions>
 
                 <StackPanel Orientation="Horizontal" Margin="0,20" HorizontalAlignment="Center">
-                    <Image Source="/InSituLaboratory.Assets;component/Images/bitbug_favicon.ico" Width="36"/>
+                    <Image Source="/InSituLaboratory.Assets;component/Images/6604cd8ecc29d.ico" Width="36"/>
                     <TextBlock Text="化学生物实验室" FontSize="15" HorizontalAlignment="Center"
                         VerticalAlignment="Center" Foreground="#444" FontWeight="Normal" Margin="10,0"/>
                 </StackPanel>

InSituLaboratory/Views/Pages/DashboardView.xaml

@@ -15,86 +15,7 @@
                 <RowDefinition Height="auto"/>
             </Grid.RowDefinitions>
 
-            <Grid Grid.Row="0">
-                <Border CornerRadius="5" Background="#FAFCFF" Margin="10">
-                    <Border.Effect>
-                        <DropShadowEffect BlurRadius="10" ShadowDepth="0" Direction="0" Color="#555" Opacity="0.1"/>
-                    </Border.Effect>
-                </Border>
-                <Grid Background="#FAFCFF" Margin="20">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="25"/>
-                        <RowDefinition />
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <!--列头-->
-                    <Border Background="#EFEFEF" Height="1" VerticalAlignment="Bottom"/>
-                    <StackPanel  VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="15,0" Orientation="Horizontal">
-                        <TextBlock Text="系统状态：" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="15,0" FontWeight="Normal" Foreground="#888"/>
-                        <TextBlock Text="采样时间：2024-03-27 21:26:36" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="15,0" FontWeight="Normal" Foreground="#888"/>
-                        <TextBlock Text="48V电压：47.96V   " FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                        <TextBlock Text="48V电流：1.26A" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                    </StackPanel>
      
-                    <Grid Grid.Row="1" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Grid Grid.Column="0" Height="60" >
-                            <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left">
-                                <TextBlock Text="基站48V漏电流状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="电池48V漏电流状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="ICL漏电流状态        ：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                            </StackPanel>
-                        </Grid>
-                        <Grid Grid.Column="1" >
-                            <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left">
-                                <TextBlock Text="工控机漏电流状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="温度1状态：            正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="温度2状态：            正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                            </StackPanel>
-                        </Grid>
-                        <Grid Grid.Column="2" >
-                            <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left">
-                                <TextBlock Text="湿度1状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="湿度2状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="漏水1状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                            </StackPanel>
-                        </Grid>
-
-                        <Grid Grid.Column="3" >
-                            <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left">
-                                <TextBlock Text="漏水2状态       ：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="内部压力1状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                                <TextBlock Text="内部压力2状态：正常" FontWeight="Normal" Foreground="#888" VerticalAlignment="Center"/>
-                            </StackPanel>
-                        </Grid>
-                    </Grid>
-
-                    <Grid Grid.Row="2" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-
-                        <Grid Grid.Column="0" >
-                            <TextBlock Text="时序下配状态:最新更新状态：时序1：保持" FontWeight="Normal" />
-                        </Grid>
-
-                        <Grid Grid.Column="1" >
-                            <TextBlock Text="当前工作设备：MEMS色谱仪：工作" FontWeight="Normal" />
-                        </Grid>
-
-                        <Grid Grid.Column="2" >
-                            <TextBlock Text="当前故障设备：MEMS质谱仪：故障" FontWeight="Normal" />
-                        </Grid>
-                    </Grid>
-                </Grid>
-            </Grid>
 
             <Grid Grid.Row="1">
                 <!--第一列-->
@@ -111,7 +32,27 @@
                     <!--列头-->
                     <Border Background="#EFEFEF" Height="1" VerticalAlignment="Bottom"/>
                     <TextBlock Text="MEMS色谱仪" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="15,0" FontWeight="Normal" />
-                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}">
+
+                    <Grid Grid.Row="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666" Margin="0,10">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="采样时间" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="故障代码" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="C2浓度" Grid.Column="2" VerticalAlignment="Center" Margin="5,0"/>
+                            <TextBlock Text="C3浓度" Grid.Column="3" VerticalAlignment="Center" Margin="5,0"/>
+                            <TextBlock Text="C4浓度" Grid.Column="4" VerticalAlignment="Center" Margin="5,0"/>
+                        </Grid>
+                        <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding MEMSList}">
                             <ListBox.ItemContainerStyle>
                                 <Style TargetType="ListBoxItem">
                                     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -123,8 +64,7 @@
                                                 </Border>
                                                 <ControlTemplate.Triggers>
                                                     <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="border" Property="Background"
+                                                        <Setter TargetName="border" Property="Background" Value="#F0F6FB"/>
-                                        Value="#F0F6FB"/>
                                                     </Trigger>
                                                 </ControlTemplate.Triggers>
                                             </ControlTemplate>
@@ -137,14 +77,17 @@
                                     <Border BorderBrush="#EFEFEF" BorderThickness="0,0,0,1">
                                         <Grid Margin="10,15">
                                             <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="auto"/>
+                                                <ColumnDefinition />
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                             </Grid.ColumnDefinitions>
-                                        <TextBlock Text="{Binding Number}" Foreground="#444" FontWeight="Normal"/>
+                                            <TextBlock Text="{Binding SamplingTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" Foreground="#444" FontWeight="Normal" Grid.Column="0"/>
-                                        <TextBlock Text="{Binding RecordInfo}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                            <TextBlock Text="{Binding FaultCodes}"  FontSize="12" Grid.Column="1"/>
+                                            <TextBlock Text="{Binding C2Concentration}"  FontSize="12" Grid.Column="2"/>
+                                            <TextBlock Text="{Binding C3Concentration}"  FontSize="12" Grid.Column="3"/>
+                                            <TextBlock Text="{Binding C4Concentration}"  FontSize="12" Grid.Column="4"/>
                                         </Grid>
                                     </Border>
                                 </DataTemplate>
@@ -155,5 +98,101 @@
                 </Grid>
 
             </Grid>
+
+            <Grid Grid.Row="2">
+                <!--第一列-->
+                <Border CornerRadius="5" Background="#FAFCFF" Margin="10">
+                    <Border.Effect>
+                        <DropShadowEffect BlurRadius="10" ShadowDepth="0" Direction="0" Color="#555" Opacity="0.1"/>
+                    </Border.Effect>
+                </Border>
+                <Grid Background="#FAFCFF" Margin="20">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="45"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <!--列头-->
+                    <Border Background="#EFEFEF" Height="1" VerticalAlignment="Bottom"/>
+                    <TextBlock Text="MEMS质谱仪" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="15,0" FontWeight="Normal" />
+
+                    <Grid Grid.Row="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666" Margin="0,10">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="采样时间" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="故障代码" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="CH4浓度" Grid.Column="2" VerticalAlignment="Center" Margin="5,0"/>
+                            <TextBlock Text="H2O浓度" Grid.Column="3" VerticalAlignment="Center" Margin="5,0"/>
+                            <TextBlock Text="N2浓度" Grid.Column="4" VerticalAlignment="Center" Margin="5,0"/>
+                            <TextBlock Text="O2浓度" Grid.Column="5" VerticalAlignment="Center" Margin="5,0"/>
+                            <TextBlock Text="Ar浓度" Grid.Column="6" VerticalAlignment="Center" Margin="5,0"/>
+                            <TextBlock Text="CO2浓度" Grid.Column="7" VerticalAlignment="Center" Margin="5,0"/>
+                        </Grid>
+                        <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding MEMSMassList}">
+                            <ListBox.ItemContainerStyle>
+                                <Style TargetType="ListBoxItem">
+                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="ListBoxItem">
+                                                <Border Background="Transparent" Name="border">
+                                                    <ContentPresenter/>
+                                                </Border>
+                                                <ControlTemplate.Triggers>
+                                                    <Trigger Property="IsMouseOver" Value="True">
+                                                        <Setter TargetName="border" Property="Background" Value="#F0F6FB"/>
+                                                    </Trigger>
+                                                </ControlTemplate.Triggers>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </ListBox.ItemContainerStyle>
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <Border BorderBrush="#EFEFEF" BorderThickness="0,0,0,1">
+                                        <Grid Margin="10,15">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition />
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock Text="{Binding SamplingTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" Foreground="#444" FontWeight="Normal" Grid.Column="0"/>
+                                            <TextBlock Text="{Binding FaultCodes}"  FontSize="12" Grid.Column="1" Margin="40,0"/>
+                                            <TextBlock Text="{Binding CH4Concentration}"  FontSize="12" Grid.Column="2"/>
+                                            <TextBlock Text="{Binding H2OConcentration}"  FontSize="12" Grid.Column="3"/>
+                                            <TextBlock Text="{Binding N2Concentration}"  FontSize="12" Grid.Column="4"/>
+                                            <TextBlock Text="{Binding O2Concentration}"  FontSize="12" Grid.Column="5"/>
+                                            <TextBlock Text="{Binding ARConcentration}"  FontSize="12" Grid.Column="6"/>
+                                            <TextBlock Text="{Binding CO2Concentration}"  FontSize="12" Grid.Column="7"/>
+                                        </Grid>
+                                    </Border>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+
+                </Grid>
+
+            </Grid>
+
+        </Grid>
     </ScrollViewer>
 </UserControl>

InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml

@@ -16,7 +16,7 @@
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
         <TextBlock Text="传感器" VerticalAlignment="Center" Foreground="#888"/>
-        <TextBlock Text="时长" Grid.Row="1" VerticalAlignment="Center" Foreground="#888"/>
+        <TextBlock Text="循环时间" Grid.Row="1" VerticalAlignment="Center" Foreground="#888"/>
 
         <TextBox Grid.Column="1" Height="28" Name="tb_name"
              Text="{Binding SensorID,ValidatesOnNotifyDataErrors=True}"

InSituLaboratory/Views/Pages/SequentialDistributionView.xaml

@@ -89,7 +89,24 @@
                         <Button Content="下发" Style="{StaticResource NormalButtonStyle}" Command="{Binding SendCommand}" Width="60" Margin="5,0" Background="#88409EFE"/>
                     </StackPanel>
 
-                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}">
+                    <Grid Grid.Row="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0" TextBlock.FontSize="12" TextBlock.FontWeight="Bold" TextBlock.Foreground="#666">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="序号" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="传感器ID" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <TextBlock Text="循环时长" Grid.Column="2" VerticalAlignment="Center" Margin="5,0"/>
+                        </Grid>
+
+                        <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}" Margin="0,10">
                             <ListBox.ItemContainerStyle>
                                 <Style TargetType="ListBoxItem">
                                     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -101,8 +118,7 @@
                                                 </Border>
                                                 <ControlTemplate.Triggers>
                                                     <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="border" Property="Background"
+                                                        <Setter TargetName="border" Property="Background"  Value="#F0F6FB"/>
-                                           Value="#F0F6FB"/>
                                                     </Trigger>
                                                 </ControlTemplate.Triggers>
                                             </ControlTemplate>
@@ -113,16 +129,16 @@
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <Border BorderBrush="#EFEFEF" BorderThickness="0,0,0,1">
-                                    <Grid Margin="10,15">
+                                        <Grid >
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                                 <ColumnDefinition/>
                                             </Grid.ColumnDefinitions>
-                                        <TextBlock Text="{Binding Number}" Foreground="#444" FontWeight="Normal"/>
+                                            <TextBlock Text="{Binding Number}" FontWeight="Normal" Width="120" Grid.Column="0" FontSize="12" Margin="120,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        <TextBlock Text="{Binding SensorID}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                            <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1"/>
-                                        <TextBlock Text="{Binding Duration}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                            <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" Margin="-40,0"/>
 
                                             <!--操作-->
                                             <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
@@ -140,6 +156,11 @@
                                 </DataTemplate>
                             </ListBox.ItemTemplate>
                         </ListBox>
+
+
+                    </Grid>
+                    
+         
                 </Grid>
             </Grid>
 
@@ -179,7 +200,7 @@
                         <Button Content="下发" Style="{StaticResource NormalButtonStyle}" Command="{Binding SendCommand2}" Width="60" Margin="5,0" Background="#88409EFE"/>
                     </StackPanel>
 
-                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}">
+                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}" Margin="0,10">
                         <ListBox.ItemContainerStyle>
                             <Style TargetType="ListBoxItem">
                                 <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -191,8 +212,7 @@
                                             </Border>
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="border" Property="Background"
+                                                    <Setter TargetName="border" Property="Background"  Value="#F0F6FB"/>
-                                  Value="#F0F6FB"/>
                                                 </Trigger>
                                             </ControlTemplate.Triggers>
                                         </ControlTemplate>
@@ -203,16 +223,18 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <Border BorderBrush="#EFEFEF" BorderThickness="0,0,0,1">
-                                    <Grid Margin="10,15">
+                                    <Grid >
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
+                                            <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="{Binding Number}" Foreground="#444" FontWeight="Normal"/>
+                                        <TextBlock Text="{Binding Number}" FontWeight="Normal" Width="120" Grid.Column="0" FontSize="12" Margin="120,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        <TextBlock Text="{Binding SensorID}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1"/>
-                                        <TextBlock Text="{Binding Duration}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" Margin="-40,0"/>
 
+                                        <!--操作-->
                                         <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                             <TextBlock VerticalAlignment="Center">
                                                 <Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
@@ -267,7 +289,7 @@
                         <Button Content="下发" Style="{StaticResource NormalButtonStyle}" Command="{Binding SendCommand3}" Width="60" Margin="5,0" Background="#88409EFE"/>
                     </StackPanel>
 
-                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}">
+                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}" Margin="0,10">
                         <ListBox.ItemContainerStyle>
                             <Style TargetType="ListBoxItem">
                                 <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -279,8 +301,7 @@
                                             </Border>
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="border" Property="Background"
+                                                    <Setter TargetName="border" Property="Background"  Value="#F0F6FB"/>
-                          Value="#F0F6FB"/>
                                                 </Trigger>
                                             </ControlTemplate.Triggers>
                                         </ControlTemplate>
@@ -291,15 +312,18 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <Border BorderBrush="#EFEFEF" BorderThickness="0,0,0,1">
-                                    <Grid Margin="10,15">
+                                    <Grid >
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
+                                            <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="{Binding Number}" Foreground="#444" FontWeight="Normal"/>
+                                        <TextBlock Text="{Binding Number}" FontWeight="Normal" Width="120" Grid.Column="0" FontSize="12" Margin="120,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        <TextBlock Text="{Binding SensorID}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1"/>
-                                        <TextBlock Text="{Binding Duration}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" Margin="-40,0"/>
+
+                                        <!--操作-->
                                         <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                             <TextBlock VerticalAlignment="Center">
                                                 <Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
@@ -354,7 +378,7 @@
                         <Button Content="下发" Style="{StaticResource NormalButtonStyle}" Command="{Binding SendCommand4}" Width="60" Margin="5,0" Background="#88409EFE"/>
                     </StackPanel>
 
-                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}">
+                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}" Margin="0,10">
                         <ListBox.ItemContainerStyle>
                             <Style TargetType="ListBoxItem">
                                 <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -366,8 +390,7 @@
                                             </Border>
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="border" Property="Background"
+                                                    <Setter TargetName="border" Property="Background"  Value="#F0F6FB"/>
-                  Value="#F0F6FB"/>
                                                 </Trigger>
                                             </ControlTemplate.Triggers>
                                         </ControlTemplate>
@@ -378,16 +401,18 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <Border BorderBrush="#EFEFEF" BorderThickness="0,0,0,1">
-                                    <Grid Margin="10,15">
+                                    <Grid >
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
+                                            <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="{Binding Number}" Foreground="#444" FontWeight="Normal"/>
+                                        <TextBlock Text="{Binding Number}" FontWeight="Normal" Width="120" Grid.Column="0" FontSize="12" Margin="120,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        <TextBlock Text="{Binding SensorID}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1"/>
-                                        <TextBlock Text="{Binding Duration}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" Margin="-40,0"/>
 
+                                        <!--操作-->
                                         <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                             <TextBlock VerticalAlignment="Center">
                                                 <Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
@@ -441,8 +466,7 @@
                         </Button>
                         <Button Content="下发" Style="{StaticResource NormalButtonStyle}" Command="{Binding SendCommand5}" Width="60" Margin="5,0" Background="#88409EFE"/>
                     </StackPanel>
-
+                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}" Margin="0,10">
-                    <ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding RecordList}">
                         <ListBox.ItemContainerStyle>
                             <Style TargetType="ListBoxItem">
                                 <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -454,8 +478,7 @@
                                             </Border>
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter TargetName="border" Property="Background"
+                                                    <Setter TargetName="border" Property="Background"  Value="#F0F6FB"/>
-          Value="#F0F6FB"/>
                                                 </Trigger>
                                             </ControlTemplate.Triggers>
                                         </ControlTemplate>
@@ -466,15 +489,18 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <Border BorderBrush="#EFEFEF" BorderThickness="0,0,0,1">
-                                    <Grid Margin="10,15">
+                                    <Grid >
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
+                                            <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="{Binding Number}" Foreground="#444" FontWeight="Normal"/>
+                                        <TextBlock Text="{Binding Number}" FontWeight="Normal" Width="120" Grid.Column="0" FontSize="12" Margin="120,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        <TextBlock Text="{Binding SensorID}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding SensorID}" FontSize="12" Grid.Column="1"/>
-                                        <TextBlock Text="{Binding Duration}" Foreground="#AAA" Margin="0,10" FontSize="10"/>
+                                        <TextBlock Text="{Binding DurationTime}" FontSize="12" Grid.Column="2" Margin="-40,0"/>
+
+                                        <!--操作-->
                                         <StackPanel Grid.Column="3" VerticalAlignment="Center"  HorizontalAlignment="Center" Orientation="Horizontal">
                                             <TextBlock VerticalAlignment="Center">
                                                 <Hyperlink Command="{Binding DataContext.ModifyCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"