Zhou/20230201_145_upperpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加项目

Browse Source
This commit is contained in:
MoYue 2024-04-10 17:50:54 +08:00
parent 8b26ce96c2
commit 96d9f2e261
30 changed files with 278 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
InSituLaboratory.Assets/Fonts/方正楷体简体.ttf Normal file
View File

Binary file not shown.

4
InSituLaboratory.Assets/InSituLaboratory.Assets.csproj
View File

@ -9,6 +9,7 @@
<ItemGroup>
<None Remove="Fonts\iconfont.ttf" />
<None Remove="Fonts\方正楷体简体.ttf" />
<None Remove="Images\20240201.jpg" />
<None Remove="Images\6604cd8ecc29d.ico" />
<None Remove="Images\Avatar\002m.jpg" />
@ -25,6 +26,9 @@
</ItemGroup>
<ItemGroup>
<Resource Include="Fonts\方正楷体简体.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\20240201.jpg" />
<Resource Include="Images\6604cd8ecc29d.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

5
InSituLaboratory.Entities/SysDevice.cs
View File

@ -28,6 +28,11 @@ namespace InSituLaboratory.Entities
/// </summary>
public string? DeviceName { get; set; }
/// <summary>
/// 工作时长
/// </summary>
public string? WorkTime { get; set; }
}
}

26
InSituLaboratory.Entities/SysSequentialDetails.cs
View File

@ -20,25 +20,35 @@ namespace InSituLaboratory.Entities
[Key]
public int Number { get; set; }
/// <summary>
/// 母表ID
/// </summary>
public int SysSquentialID { get; set; }
/// <summary>
/// 配置号
/// </summary>
public string? SequenceGroup { get; set; }
/// <summary>
/// 传感器ID
/// </summary>
public string? SensorID { get; set; }
/// <summary>
/// 工作时长
/// </summary>
public string? WorkTime { get; set; }
/// <summary>
/// 循环时长
/// </summary>
public string? DurationTime { get; set; }
/// <summary>
/// 母表ID
/// </summary>
public int SysSquentialID { get; set; }
/// <summary>
///// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }

2
InSituLaboratory.IService/IDeviceSvice.cs
View File

@ -14,5 +14,7 @@ namespace InSituLaboratory.IService
/// </summary>
/// <returns></returns>
IEnumerable<SysDevice> GetDevices();
string GetDeviceByDeviceName(string DeviceName);
}
}

14
InSituLaboratory.Service/DeviceService.cs
View File

@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Metadata.Ecma335;
using System.Text;
using System.Threading.Tasks;
@ -18,5 +19,18 @@ namespace InSituLaboratory.Service
{
return this.Set<SysDevice>();
}
public string GetDeviceByDeviceName(string DeviceName)
{
var workTime = "";
var sysDevice = this.Query<SysDevice>(m=> m.DeviceName == DeviceName).ToList();
foreach (var item in sysDevice)
{
workTime = item.WorkTime;
}
return workTime;
}
}
}

1
InSituLaboratory/App.xaml
View File

@ -18,6 +18,7 @@
<ResourceDictionary>
<FontFamily x:Key="Icons">/InSituLaboratory.Assets;component/Fonts/iconfont.ttf#zx_icons</FontFamily>
<FontFamily x:Key="DigitalDisplay">/InSituLaboratory.Assets;component/Fonts/#方正楷体简体</FontFamily>
</ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

188
InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
View File

@ -10,6 +10,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media.Animation;
namespace InSituLaboratory.ViewModels.Pages.Dialogs
{
@ -18,16 +19,199 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
/// </summary>
public class ModifySequentialViewModel : DialogViewModelBase
{
#region Model
/// <summary>
/// 传感器设备集合
/// </summary>
public List<SysDevice> DeviceNodes { get; set; } = new List<SysDevice>();
public string? workTime { get; set; }
public long? workInt { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime? startTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime? endTime { get; set; }
/// <summary>
/// 配置
/// </summary>
public string SequenceGroup { get; set; }
/// <summary>
/// 序号
/// </summary>
public int Number { get; set; }
public string SensorID { get; set; }
/// <summary>
/// 传感器设备
/// </summary>
private string _sensorID;
public string SensorID
{
get { return _sensorID;}
set
{
_sensorID = value;
//通过设备信息查询设备工作时长
workTime = _deviceSvice.GetDeviceByDeviceName(_sensorID);
this.ErrorList.Clear();
if (_sensorID == "质谱仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(WorkTime) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "质谱仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
else
{
ErrorList.Remove("WorkTime");
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "二氧化碳同位素分析仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(WorkTime) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "二氧化碳同位素分析仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
else
{
ErrorList.Remove("WorkTime");
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "甲烷同位素分析仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(WorkTime) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "甲烷同位素分析仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "气相色谱仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(WorkTime) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "气相色谱仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "基因测序仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(WorkTime) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "基因测序仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else
{
ErrorList.Remove("WorkTime");
this.RaiseErrorsChanged("WorkTime");
}
}
}
/// <summary>
/// 循环时长
/// </summary>
public string DurationTime { get; set; }
/// <summary>
/// 时序类别
/// </summary>
public string kind { get; set; }
private string _workTime;
/// <summary>
/// 工作时长
/// </summary>
public string WorkTime
{
get { return _workTime; }
set
{
_workTime = value;
this.ErrorList.Clear();
if (string.IsNullOrEmpty(value))
{
ErrorList.Add("WorkTime", new List<string> { "工作时长不能为空" });
this.RaiseErrorsChanged();
}
else if (_sensorID == "质谱仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(value) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "质谱仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "二氧化碳同位素分析仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(value) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "二氧化碳同位素分析仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "甲烷同位素分析仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(value) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "甲烷同位素分析仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "气相色谱仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(value) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "气相色谱仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else if (_sensorID == "基因测序仪")
{
workInt = Convert.ToInt64(workTime) * 60 * 60;
if (Convert.ToInt64(value) > workInt)
{
ErrorList.Add("WorkTime", new List<string> { "基因测序仪已超出最大工作时长" });
this.RaiseErrorsChanged("WorkTime");
}
}
else
{
ErrorList.Remove("WorkTime");
this.RaiseErrorsChanged("WorkTime");
}
}
}
#endregion
ISysSequentialService _sequentialService;
IDeviceSvice _deviceSvice;
@ -66,6 +250,8 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
{
try
{
if (this.HasErrors) return;
var data = _sequentialService.GetSequentials(kind).ToList();
//保存时 首次去查询 data == null 说明数据库中无数据 为第一次插入
if (data.Count() == 0)

2
InSituLaboratory/ViewModels/Pages/SequentialDistributionViewModel.cs
View File

@ -161,6 +161,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;

1
InSituLaboratory/Views/LoginView.xaml
View File

@ -7,6 +7,7 @@
xmlns:b="clr-namespace:InSituLaboratory.Base"
xmlns:c="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
mc:Ignorable="d"
FontFamily="{StaticResource DigitalDisplay}"
Height="400" Width="650">
<UserControl.Resources>
<Style TargetType="TextBox">

3
InSituLaboratory/Views/MainView.xaml
View File

@ -8,7 +8,8 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
FontFamily="Microsoft YaHei" FontSize="13"
FontFamily="{StaticResource DigitalDisplay}"
FontSize="13"
Foreground="#333"
FontWeight="ExtraLight"
Background="#FAFCFF"

1
InSituLaboratory/Views/Pages/DashboardView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages"
mc:Ignorable="d"
FontFamily="{StaticResource DigitalDisplay}"
d:DesignHeight="450" d:DesignWidth="800">
<ScrollViewer>
<Grid Margin="10,20">

1
InSituLaboratory/Views/Pages/Dialogs/ModifyMenuView.xaml
View File

@ -6,6 +6,7 @@
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
xmlns:c="clr-namespace:InSituLaboratory.Base.Converters"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
FontFamily="{StaticResource DigitalDisplay}"
Height="350" Width="500">
<UserControl.Resources>
<c:SectionConverter x:Key="mtConverter"/>

1
InSituLaboratory/Views/Pages/Dialogs/ModifyPasswordView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
FontFamily="{StaticResource DigitalDisplay}"
xmlns:b="clr-namespace:InSituLaboratory.Base"
Height="200" Width="350">

1
InSituLaboratory/Views/Pages/Dialogs/ModifyRoleView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
mc:Ignorable="d" Height="200" Width="350"
FontFamily="{StaticResource DigitalDisplay}"
Template="{StaticResource DialogViewTemplate}">
<Grid Margin="10">
<Grid.RowDefinitions>

25
InSituLaboratory/Views/Pages/Dialogs/ModifySequentialView.xaml
View File

@ -5,7 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d" Height="200" Width="350"
mc:Ignorable="d" Height="330" Width="420"
FontFamily="{StaticResource DigitalDisplay}"
Template="{StaticResource DialogViewTemplate}">
<UserControl.Resources>
@ -16,8 +17,10 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid Margin="10">
<Grid Margin="10" FocusManager.FocusedElement="{Binding ElementName=pb}">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition />
</Grid.RowDefinitions>
@ -25,16 +28,14 @@
<ColumnDefinition Width="70"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="传感器" VerticalAlignment="Center" Foreground="#888"/>
<TextBlock Text="循环时间" Grid.Row="1" VerticalAlignment="Center" Foreground="#888"/>
<TextBlock Text="配置" Grid.Row="0" VerticalAlignment="Center" Foreground="#888" />
<TextBlock Text="传感器设备" Grid.Row="1" VerticalAlignment="Center" Foreground="#888"/>
<TextBlock Text="工作时长(s)" Grid.Row="2" VerticalAlignment="Center" Foreground="#888"/>
<TextBlock Text="循环时间(s)" Grid.Row="3" VerticalAlignment="Center" Foreground="#888"/>
<!--<TextBox Grid.Column="1" Height="28" Name="tb_name"
Text="{Binding SensorID,ValidatesOnNotifyDataErrors=True}"
Style="{StaticResource ValidationTextBoxStyle}"/>-->
<hc:ComboBox Margin="0,11,0,11" Grid.Column="1" SelectedIndex="0" IsEditable="True" ItemsSource="{Binding DeviceNodes}" DisplayMemberPath="DeviceName" SelectedValuePath="DeviceName" SelectedValue="{Binding SensorID}" RenderTransformOrigin="0.498,0.193"/>
<TextBox Grid.Row="1" Grid.Column="1" Margin="0,2" Height="28"
Text="{Binding DurationTime}"
Style="{StaticResource ValidationTextBoxStyle}"/>
<hc:ComboBox Grid.Row="0" Name="pb" Margin="0,9,0,8" Grid.Column="1" IsEditable="False" ItemsSource="{Binding DeviceNodes}" DisplayMemberPath="Id" SelectedValuePath="Id" SelectedValue="{Binding SequenceGroup}" RenderTransformOrigin="0.498,0.193"/>
<hc:ComboBox Grid.Row="1" Margin="0,9,0,8" Grid.Column="1" IsEditable="False" ItemsSource="{Binding DeviceNodes}" DisplayMemberPath="DeviceName" SelectedValuePath="DeviceName" SelectedValue="{Binding SensorID}" RenderTransformOrigin="0.498,0.193"/>
<TextBox Grid.Row="2" Grid.Column="1" Margin="0,2" Height="30" Text="{Binding WorkTime,Mode=TwoWay,ValidatesOnNotifyDataErrors=True}" Style="{StaticResource ValidationTextBoxStyle}"/>
<TextBox Grid.Row="3" Grid.Column="1" Margin="0,2" Height="30" Text="{Binding DurationTime}" Style="{StaticResource ValidationTextBoxStyle}"/>
</Grid>
</UserControl>

1
InSituLaboratory/Views/Pages/Dialogs/ModifyUserView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
xmlns:c="clr-namespace:InSituLaboratory.Base.Converters"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
Height="400" Width="520">

1
InSituLaboratory/Views/Pages/Dialogs/SelectRoleView.xaml
View File

@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
Height="550" Width="400">
<UserControl.Resources>

1
InSituLaboratory/Views/Pages/Dialogs/SelectUserView.xaml
View File

@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
Height="550" Width="400">
<UserControl.Resources>

1
InSituLaboratory/Views/Pages/History/CavityBatteryLevelView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.History"
xmlns:zxc="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

1
InSituLaboratory/Views/Pages/History/CavityEnergyConversionView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.History"
xmlns:zxc="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

1
InSituLaboratory/Views/Pages/History/CavityEnvironmentView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.History"
xmlns:zxc="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

1
InSituLaboratory/Views/Pages/History/CavityOperationView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.History"
xmlns:zxc="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}"
>
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

1
InSituLaboratory/Views/Pages/History/CavityOtputCurrentView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.History"
xmlns:zxc="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

1
InSituLaboratory/Views/Pages/History/CavityOtputFeedBackView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.History"
xmlns:zxc="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

1
InSituLaboratory/Views/Pages/History/CavityOutputStatusView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.History"
xmlns:zxc="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

1
InSituLaboratory/Views/Pages/MenuManagementView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages"
mc:Ignorable="d" Template="{StaticResource PageTempalte}"
FontFamily="{StaticResource DigitalDisplay}"
d:DesignHeight="450" d:DesignWidth="800">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">
<Grid.RowDefinitions>

1
InSituLaboratory/Views/Pages/RoleView.xaml
View File

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages"
mc:Ignorable="d"
FontFamily="{StaticResource DigitalDisplay}"
d:DesignHeight="450" d:DesignWidth="800"
Template="{StaticResource PageTempalte}">
<UserControl.Resources>

18
InSituLaboratory/Views/Pages/SequentialDistributionView.xaml
View File

@ -114,11 +114,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 sysSequentialDetailsListS1}" Margin="0,10">
@ -152,11 +156,13 @@
<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.ModifyS1Command,RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" TextDecorations="None" Foreground="#409EFE">编辑</Hyperlink>

1
InSituLaboratory/Views/Pages/UserManagementView.xaml
View File

@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Template="{StaticResource PageTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">
<Grid.RowDefinitions>