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

UI变化

Browse Source
This commit is contained in:
MoYue 2024-10-31 08:29:52 +08:00
parent 139fb910a2
commit 4387d1fa88
52 changed files with 685 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
InSituLaboratory.Assets/Fonts/SourceHanSansCN-Bold.ttf Normal file
View File

Binary file not shown.

BIN
InSituLaboratory.Assets/Fonts/SourceHanSansCN-Regular.ttf Normal file
View File

Binary file not shown.

BIN
InSituLaboratory.Assets/Images/background1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

BIN
InSituLaboratory.Assets/Images/chang.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
InSituLaboratory.Assets/Images/主腔体当前工作设备.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
InSituLaboratory.Assets/Images/主腔体当前工作设备字.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 993 B

BIN
InSituLaboratory.Assets/Images/主腔体当前故障设备.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
InSituLaboratory.Assets/Images/主腔体当前故障设备字.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
InSituLaboratory.Assets/Images/主腔体状态.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
InSituLaboratory.Assets/Images/主腔体状态字.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 789 B

BIN
InSituLaboratory.Assets/Images/化学生物实验室.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
InSituLaboratory.Assets/Images/横线1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 295 B

BIN
InSituLaboratory.Assets/Images/横线2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

BIN
InSituLaboratory.Assets/Images/组6.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

56
InSituLaboratory.Assets/InSituLaboratory.Assets.csproj
View File

@ -10,11 +10,15 @@
<ItemGroup>
<None Remove="Fonts\iconfont.ttf" />
<None Remove="Fonts\iconfont1.ttf" />
<None Remove="Fonts\SourceHanSansCN-Bold.ttf" />
<None Remove="Fonts\SourceHanSansCN-Regular.ttf" />
<None Remove="Fonts\方正楷体简体.ttf" />
<None Remove="Images\20240201.jpg" />
<None Remove="Images\6604cd8ecc29d.ico" />
<None Remove="Images\Avatar\002m.jpg" />
<None Remove="Images\background1.jpg" />
<None Remove="Images\bitbug_favicon.ico" />
<None Remove="Images\chang.png" />
<None Remove="Images\covers\1.png" />
<None Remove="Images\covers\2.png" />
<None Remove="Images\covers\3.png" />
@ -26,13 +30,29 @@
<None Remove="Images\login_back.jpg" />
<None Remove="Images\Logo.png" />
<None Remove="Images\Snipaste.png" />
<None Remove="Images\主腔体当前工作设备.png" />
<None Remove="Images\主腔体当前工作设备字.png" />
<None Remove="Images\主腔体当前故障设备.png" />
<None Remove="Images\主腔体当前故障设备字.png" />
<None Remove="Images\主腔体状态.png" />
<None Remove="Images\主腔体状态字.png" />
<None Remove="Images\化学生物实验室.png" />
<None Remove="Images\横线1.png" />
<None Remove="Images\横线2.png" />
<None Remove="Images\海洋.jpg" />
<None Remove="Images\组6.jpg" />
</ItemGroup>
<ItemGroup>
<Resource Include="Fonts\iconfont1.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Fonts\SourceHanSansCN-Bold.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Fonts\SourceHanSansCN-Regular.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Fonts\方正楷体简体.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
@ -43,6 +63,9 @@
<Resource Include="Images\bitbug_favicon.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\chang.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\covers\wanF.jpg" />
</ItemGroup>
@ -70,9 +93,42 @@
<Resource Include="Images\Snipaste.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\主腔体当前工作设备.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\主腔体当前工作设备字.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\主腔体当前故障设备.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\主腔体当前故障设备字.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\主腔体状态.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\主腔体状态字.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\化学生物实验室.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\横线1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\横线2.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\海洋.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\background1.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Images\组6.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
</ItemGroup>
</Project>

2
InSituLaboratory/App.xaml
View File

@ -20,6 +20,8 @@
<FontFamily x:Key="Icons">/InSituLaboratory.Assets;component/Fonts/iconfont.ttf#zx_icons</FontFamily>
<FontFamily x:Key="IconsExt">/InSituLaboratory.Assets;component/Fonts/iconfont1.ttf#iconfont</FontFamily>
<FontFamily x:Key="DigitalDisplay">/InSituLaboratory.Assets;component/Fonts/#方正楷体简体</FontFamily>
<FontFamily x:Key="SourceHanSansCN-Bold">/InSituLaboratory.Assets;component/Fonts/#SourceHanSansCN-Bold</FontFamily>
<FontFamily x:Key="SourceHanSansCN-Regular">/InSituLaboratory.Assets;component/Fonts/#SourceHanSansCN-Regular</FontFamily>
</ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

4
InSituLaboratory/App.xaml.cs
View File

@ -32,7 +32,8 @@ namespace InSituLaboratory
{
base.InitializeShell(shell);
Container.Resolve<IRegionManager>().RegisterViewWithRegion("MainRegion", "DashboardView");
//Container.Resolve<IRegionManager>().RegisterViewWithRegion("MainRegion", "DashboardView");
Container.Resolve<IRegionManager>().RegisterViewWithRegion("MainRegion", "DashboardNewView");
}
protected override void RegisterTypes(IContainerRegistry containerRegistry)
@ -62,6 +63,7 @@ namespace InSituLaboratory
containerRegistry.RegisterForNavigation<Views.Pages.DashboardView>();
containerRegistry.RegisterForNavigation<Views.Pages.DashboardNewView>();
containerRegistry.RegisterForNavigation<Views.Pages.MenuManagementView>();
containerRegistry.RegisterForNavigation<Views.Pages.UserManagementView>();
containerRegistry.RegisterForNavigation<Views.Pages.RoleView>();

120
InSituLaboratory/ViewModels/Pages/DashboardNewViewModel.cs Normal file
View File

@ -0,0 +1,120 @@
using InSituLaboratory.Entities;
using InSituLaboratory.IService;
using InSituLaboratory.Models;
using Prism.Commands;
using Prism.Regions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace InSituLaboratory.ViewModels.Pages
{
public class DashboardNewViewModel : ViewModelBase
{
public SysStatusModel SysStatusModel { get; set; } = new SysStatusModel();
public CurrentEquipmentModel CurrentWorkEquipment { get; set; } = new CurrentEquipmentModel();//当前工作设备
public CurrentEquipmentModel currentFaultyEquipment { get; set; } = new CurrentEquipmentModel();//当前故障设备
public DelegateCommand<object> ReadCommand { get; set; }
ISysStatusService _sysStatusService;
public DashboardNewViewModel(IRegionManager regionManager, ISysStatusService isysStatusService) : base(regionManager)
{
PageTitle = "数据中心";
IsCanClose = false;
_sysStatusService = isysStatusService;
ReadCommand = new DelegateCommand<object>(DoRead);
this.Refresh();
}
public override void Refresh()
{
var sysStatuslist = _sysStatusService.GetSysStauts().ToList();
var CurrentWorklist = _sysStatusService.GetCurrentWorkEquipment().ToList();
var currentFaultylist = _sysStatusService.GetCurrentFaultyEquipment().ToList();
if (sysStatuslist.Count() != 0)
{
var data = _sysStatusService.GetSysStauts().FirstOrDefault();
SysStatusModel.PackagingTime = data.PackagingTime;
SysStatusModel.SamplingTime = data.SamplingTime;
SysStatusModel.Voltage48 = data.Voltage48;
SysStatusModel.Current48 = data.Current48;
SysStatusModel.BaseStation48VLeakageCS = data.BaseStation48VLeakageCS;
SysStatusModel.Batterz48VLeakageCS = data.Batterz48VLeakageCS;
SysStatusModel.ICLLeakageCS = data.ICLLeakageCS;
SysStatusModel.IComputerLeakageCS = data.IComputerLeakageCS;
SysStatusModel.TemperatureStaus1 = data.TemperatureStaus1;
SysStatusModel.TemperatureStaus2 = data.TemperatureStaus2;
SysStatusModel.HumidityStaus1 = data.HumidityStaus1;
SysStatusModel.HumidityStaus2 = data.HumidityStaus2;
SysStatusModel.LeakageStaus1 = data.LeakageStaus1;
SysStatusModel.LeakageStaus2 = data.LeakageStaus2;
SysStatusModel.InternalPressure1 = data.InternalPressure1;
SysStatusModel.InternalPressure2 = data.InternalPressure2;
SysStatusModel.TimeSeriesGroupNumber = data.TimeSeriesGroupNumber;
SysStatusModel.GroupNumberStatus = data.GroupNumberStatus;
}
if (CurrentWorklist.Count() != 0)
{
var data = _sysStatusService.GetCurrentWorkEquipment().First();
CurrentWorkEquipment.Chromatograph_MEMS = data.Chromatograph_MEMS;
CurrentWorkEquipment.MassSpectrometer_MEMS = data.MassSpectrometer_MEMS;
CurrentWorkEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
CurrentWorkEquipment.CH4Analyzer = data.CH4Analyzer;
CurrentWorkEquipment.CO2Analyzer = data.CO2Analyzer;
CurrentWorkEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
CurrentWorkEquipment.Sequencer = data.Sequencer;
}
if (currentFaultylist.Count() != 0)
{
var data = _sysStatusService.GetCurrentFaultyEquipment().First();
currentFaultyEquipment.Chromatograph_MEMS = data.Chromatograph_MEMS;
currentFaultyEquipment.MassSpectrometer_MEMS = data.MassSpectrometer_MEMS;
currentFaultyEquipment.ColorMassSpectrometer = data.ColorMassSpectrometer;
currentFaultyEquipment.CH4Analyzer = data.CH4Analyzer;
currentFaultyEquipment.CO2Analyzer = data.CO2Analyzer;
currentFaultyEquipment.ParticleAnalyzer = data.ParticleAnalyzer;
currentFaultyEquipment.Sequencer = data.Sequencer;
}
}
/// <summary>
/// 读取文本文档
/// </summary>
/// <param name="o"></param>
public void DoRead(object o)
{
string? info = null;
string? txtContent = null;
OpenFileDialog openFileDialog = new OpenFileDialog();
openFileDialog.Title = "选择文件";
openFileDialog.Multiselect = false;//选择多个文件
openFileDialog.RestoreDirectory = true;//跟踪上次打开的文件的目录
//openFileDialog.Filter = "所有文件(*.*)|*";
openFileDialog.Filter = "Text files(*.txt) | *.txt";
openFileDialog.CheckFileExists = true;
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
info = openFileDialog.FileName;
}
if (!string.IsNullOrEmpty(info))
{
//逐行读取文件,返回数组
txtContent = tools.ReadTXT_StreamReader(info);
}
}
}
}

2
InSituLaboratory/Views/LoginView.xaml
View File

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

60
InSituLaboratory/Views/MainView.xaml
View File

@ -8,7 +8,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
FontFamily="{StaticResource DigitalDisplay}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
FontSize="13"
Foreground="#333"
FontWeight="ExtraLight"
@ -124,13 +124,16 @@
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Background="#042138">
<StackPanel Orientation="Horizontal" Margin="0,20" HorizontalAlignment="Center">
<Image Source="/InSituLaboratory.Assets;component/Images/6604cd8ecc29d.ico" Width="36"/>
<TextBlock Text="化学生物实验室" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" Foreground="White" FontWeight="Normal" Margin="10,0"/>
<Image Source="/InSituLaboratory.Assets;component/Images/化学生物实验室.png" Width="100" Height="22" Margin="5,8,0,0"/>
<!--<TextBlock Text="化学生物实验室" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#85CDF6" FontWeight="Normal" Margin="10,0"/>-->
</StackPanel>
</Grid>
<TreeView Grid.Row="1" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Menus}">
<Grid Grid.Row="1">
<TreeView Background="#011d32" BorderThickness="0" ItemsSource="{Binding Menus}">
<TreeView.Resources>
<ControlTemplate TargetType="ToggleButton" x:Key="ArrowButtonTemplate">
<Grid Background="Transparent" Name="back">
@ -232,8 +235,8 @@
<TextBlock Text="{Binding MenuIcon}"
FontFamily="{StaticResource Icons}" Foreground="White"
VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="15"/>
<TextBlock Text="{Binding MenuHeader}" Grid.Column="1" Margin="5,0,0,0" FontSize="15" Foreground="White"
FontSize="14"/>
<TextBlock Text="{Binding MenuHeader}" Grid.Column="1" Margin="5,0,0,0" FontSize="14" Foreground="White"
VerticalAlignment="Center"/>
</Grid>
<HierarchicalDataTemplate.Triggers>
@ -246,6 +249,8 @@
</TreeView>
</Grid>
</Grid>
</Border>
<!--内容区域-->
@ -257,15 +262,13 @@
<Border Grid.Row="1" Background="#F0F6FB" />
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Left"
Margin="15,0">
<Run Text="原位实验室主控系统" FontSize="15" FontWeight="ExtraBold" Foreground="White" />
<Run Text="v1.0" FontSize="13" Foreground="White"/>
<Grid Background="#011D32">
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Margin="15,0">
<Run Text="原位实验室主控系统" FontSize="15" FontWeight="ExtraBold" Foreground="#00a7f5" />
<Run Text="v1.0" FontSize="14" Foreground="#00a7f5"/>
</TextBlock>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center"
HorizontalAlignment="Right"
Margin="0,0,10,0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,10,0">
<StackPanel.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@ -307,24 +310,24 @@
VerticalAlignment="Center"
FontSize="15" FontWeight="Normal"
Margin="0,0,10,0" Name="tbtn_user"
Height="30" Foreground="White"
Height="30" Foreground="#00a7f5"
WindowChrome.IsHitTestVisibleInChrome="True"
Style="{StaticResource UserInfoButtonStyle}"/>
<!--最小化按钮-->
<Button Content="&#xe7e6;" FontFamily="{StaticResource Icons}"
Style="{StaticResource ControlButtonStyle}" FontSize="15" Foreground="White"
Click="Button_MinClick"/>
Style="{StaticResource ControlButtonStyle}" FontSize="15"
Foreground="White" Click="Button_MinClick"/>
<!--最大化按钮-->
<Button Content="&#xe694;" FontFamily="{StaticResource Icons}"
Style="{StaticResource ControlButtonStyle}" FontSize="15" Foreground="White"
Click="Button_MaxClick"/>
Style="{StaticResource ControlButtonStyle}" FontSize="15"
Foreground="White" Click="Button_MaxClick"/>
<!--关闭按钮-->
<Button Content="&#xe625;" FontFamily="{StaticResource Icons}"
Style="{StaticResource ControlButtonStyle}" FontSize="15" Foreground="White"
Click="Button_Click"/>
Style="{StaticResource ControlButtonStyle}" FontSize="15"
Foreground="White" Click="Button_Click"/>
</StackPanel>
<!--更换用户头像-->
@ -407,8 +410,7 @@
</Border>
<!--用户头像-->
<Border Width="50" Height="50" CornerRadius="10"
Margin="0,0,5,0" BorderBrush="White" BorderThickness="1">
<Border Width="50" Height="50" CornerRadius="10" Margin="0,0,5,0" BorderBrush="White" BorderThickness="1">
<Border.Background>
<ImageBrush ImageSource="{Binding CurrentUser.UserIcon}"/>
</Border.Background>
@ -421,8 +423,8 @@
<!--用户年龄及性别-->
<StackPanel Grid.Row="2" VerticalAlignment="Center"
HorizontalAlignment="Center"
Orientation="Horizontal" TextBlock.FontSize="11">
HorizontalAlignment="Center" Orientation="Horizontal"
TextBlock.FontSize="11">
<TextBlock Text="{Binding CurrentUser.Age}" Margin="5,0" FontSize="15"/>
<TextBlock Text="{Binding CurrentUser.Gender1}" Margin="5,0" FontSize="15"/>
</StackPanel>
@ -430,21 +432,20 @@
<Border Background="#EEE" Height="0.5" Grid.Row="3"/>
<!--修改密码-->
<Button Content="修改密码" Grid.Row="4"
Style="{StaticResource NormalButtonStyle}"
<Button Content="修改密码" Grid.Row="4" Style="{StaticResource NormalButtonStyle}"
Background="Transparent" Foreground="#409EFE"
Margin="5,3" FontSize="14"
Command="{Binding ModifyPasswordCommand}"/>
<!--切换账号-->
<Button Content="切换账号" Grid.Row="5"
Style="{StaticResource NormalButtonStyle}"
<Button Content="切换账号" Grid.Row="5" Style="{StaticResource NormalButtonStyle}"
Background="Transparent" Foreground="#409EFE"
Margin="5,3" FontSize="14"
Command="{Binding SwitchCommand}"/>
</Grid>
</Grid>
</Popup>
</Grid>
<TabControl Grid.Row="1" Background="Transparent"
@ -501,6 +502,7 @@
<Setter Property="Header" Value="{Binding DataContext.PageTitle}"/>
<Setter Property="Background" Value="Gray"/>
<Setter Property="Foreground" Value="#444"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="TabItem">
@ -513,7 +515,7 @@
</Grid.ColumnDefinitions>
<TextBlock Text="{TemplateBinding Header}" VerticalAlignment="Center"
Margin="10,5,0,5"
FontSize="15"/>
FontSize="14"/>
<Grid Grid.Column="1" Name="close_grid" Visibility="Collapsed"
Width="30" Margin="0,0,-3,0">
<Button Grid.Column="1" Style="{StaticResource TabCloseButtonStyle}"

141
InSituLaboratory/Views/Pages/DashboardNewView.xaml Normal file
View File

@ -0,0 +1,141 @@
<UserControl x:Class="InSituLaboratory.Views.Pages.DashboardNewView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.Background>
<ImageBrush ImageSource="/InSituLaboratory.Assets;component/Images/background1.jpg" Stretch="UniformToFill"/>
</Grid.Background>
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
<RowDefinition Height="110"/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal">
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshCommand}" Margin="2,0" Width="60"/>
<Button Content="读取" Style="{StaticResource NormalButtonStyle}" Command="{Binding ReadCommand}" Margin="6,0,18,0" Width="60"/>
</StackPanel>
<Line X1="20" Y1="80" X2="1368" Y2="80" Stroke="#0A4470" StrokeThickness="1" VerticalAlignment="Bottom"></Line>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<!--组包时间-->
<Grid>
<Border CornerRadius="5" Background="Transparent" Margin="3">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="White" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe8b8;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="16"/>
<Run Text="组包时间" FontSize="14" Foreground="#758d9f"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.PackagingTime ,Mode=TwoWay,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" FontSize="15" FontWeight="Normal" Foreground="White"/>
</StackPanel>
</Border>
</Grid>
<!--采样时间-->
<Grid Grid.Column="1">
<Border CornerRadius="5" Background="Transparent" Margin="3">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="White" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe8a9;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="采样时间" FontSize="14" Foreground="#758d9f"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.SamplingTime ,Mode=TwoWay,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" FontSize="15" FontWeight="Normal" Foreground="White"/>
</StackPanel>
</Border>
</Grid>
<!--48V电压-->
<Grid Grid.Column="2">
<Border CornerRadius="5" Background="Transparent" Margin="3">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="White" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe666;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="48V电压" FontSize="14" Foreground="#758d9f"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.Voltage48 ,Mode=TwoWay,StringFormat={}{0}V}" FontSize="15" FontWeight="Normal" Foreground="White"/>
</StackPanel>
</Border>
</Grid>
<!--48V电流-->
<Grid Grid.Column="3">
<Border CornerRadius="5" Background="Transparent" Margin="3">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="White" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe665;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="48V电流" FontSize="14" Foreground="#758d9f"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.Current48 ,Mode=TwoWay,StringFormat={}{0}A}" FontSize="15" FontWeight="Normal" Foreground="White"/>
</StackPanel>
</Border>
</Grid>
<!--时序下配状态-->
<Grid Grid.Column="4">
<Border CornerRadius="5" Background="Transparent" Margin="3">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="White" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe6e4;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="时序下配状态" FontSize="14" Foreground="#758d9f"/>
</TextBlock>
<TextBlock FontSize="15" FontWeight="Normal" Foreground="#555">
<Run Text="{Binding SysStatusModel.TimeSeriesGroupNumber ,Mode=TwoWay}" Foreground="White" />
<Run Text=" " />
<Run Text="{Binding SysStatusModel.GroupNumberStatus ,Mode=TwoWay}" Foreground="Green"/>
</TextBlock>
</StackPanel>
</Border>
</Grid>
</Grid>
<!--主腔体状态-->
<Grid Grid.Row="2">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Image Source="/InSituLaboratory.Assets;component/Images/chang.png" Width="1340" HorizontalAlignment="Left" Margin="30,0,0,0" />
<Image Source="/InSituLaboratory.Assets;component/Images/主腔体状态字.png" Width="80" HorizontalAlignment="Left" Margin="60,-15,0,0" />
</Grid>
</Grid>
</UserControl>

28
InSituLaboratory/Views/Pages/DashboardNewView.xaml.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace InSituLaboratory.Views.Pages
{
/// <summary>
/// DashboardNewView.xaml 的交互逻辑
/// </summary>
public partial class DashboardNewView : UserControl
{
public DashboardNewView()
{
InitializeComponent();
}
}
}

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

@ -7,7 +7,7 @@
xmlns:converters="clr-namespace:InSituLaboratory.Base;assembly=InSituLaboratory.Base"
mc:Ignorable="d"
Background="#14273a"
FontFamily="{StaticResource DigitalDisplay}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
d:DesignHeight="700" d:DesignWidth="800">
<UserControl.Resources>
<converters:StateBackConvert x:Key="StateBackConvert" />

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

@ -6,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
Height="350" Width="500">
<UserControl.Resources>
<c:SectionConverter x:Key="mtConverter"/>

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
xmlns:b="clr-namespace:InSituLaboratory.Base"
Height="200" Width="350">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
Template="{StaticResource DialogViewTemplate}">
<Grid Margin="10">
<Grid.RowDefinitions>

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

@ -5,8 +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="440" Width="420"
FontFamily="{StaticResource DigitalDisplay}"
mc:Ignorable="d" Height="440" Width="500"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
Template="{StaticResource DialogViewTemplate}">
<UserControl.Resources>

2
InSituLaboratory/Views/Pages/Dialogs/ModifySysDevicesView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Dialogs"
mc:Ignorable="d" Height="330" Width="420"
FontFamily="{StaticResource DigitalDisplay}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
Template="{StaticResource DialogViewTemplate}">
<Grid Margin="40,20" TextBlock.Foreground="#888" FocusManager.FocusedElement="{Binding ElementName=pb}">
<Grid.RowDefinitions>

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
Height="400" Width="520">

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

@ -4,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
Height="550" Width="400">
<UserControl.Resources>

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

@ -4,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource DialogViewTemplate}"
Height="550" Width="400">
<UserControl.Resources>

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}"
>
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<Grid Grid.IsSharedSizeScope="True" Margin="0,5,0,10">

2
InSituLaboratory/Views/Pages/History/SequentialHistoryView.xaml
View File

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageSearchTempalte}">
<UserControl.Resources>
<Style TargetType="GroupBox">

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

@ -5,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<Style TargetType="GroupBox">

6
InSituLaboratory/Views/Pages/RelayView.xaml
View File

@ -9,7 +9,7 @@
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages"
mc:Ignorable="d"
Background="#14273a"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:NegateConverter x:Key="NegateConverter" />
<converters:RelayStateConvert x:Key="RelayStateConvert" />
@ -458,7 +458,7 @@
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock FontSize="17" Text="CO2同位素:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
<TextBlock FontSize="17" Text="CO2:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
<Border Grid.Column="1" Width="20" Height="20" CornerRadius="10" Background="{Binding sysSensorModels.CO2, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
<Button Grid.Column="2" x:Name="CO2" Content="打开" Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}" Command="{Binding RelayCommand }">
<Button.CommandParameter>
@ -521,7 +521,7 @@
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock FontSize="17" Text="甲烷传感器:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
<TextBlock FontSize="17" Text="CH4:" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
<Border Grid.Column="1" Width="20" Height="20" CornerRadius="10" Background="{Binding sysSensorModels.CH4, Converter={StaticResource ResourceKey=RelayStateConvert}}" />
<Button Grid.Column="2" x:Name="CH4" Content="打开" Width="60" Height="28" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NormalButtonStyle}" Command="{Binding RelayCommand}" >
<Button.CommandParameter>

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

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

2
InSituLaboratory/Views/Pages/Sensor/CH4IsotopeView.xaml
View File

@ -8,7 +8,7 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Sensor"
mc:Ignorable="d" Template="{StaticResource PageSearchAndDownloadTempalte}"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:SensorStateConvert x:Key="SensorStateConvert" />
<Style TargetType="GroupBox">

2
InSituLaboratory/Views/Pages/Sensor/CO2IsotopeView.xaml
View File

@ -8,7 +8,7 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Sensor"
mc:Ignorable="d" Template="{StaticResource PageSearchAndDownloadTempalte}"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:SensorStateConvert x:Key="SensorStateConvert" />
<Style TargetType="GroupBox">

2
InSituLaboratory/Views/Pages/Sensor/ColorMSView.xaml
View File

@ -8,7 +8,7 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Sensor"
mc:Ignorable="d" Template="{StaticResource PageSearchAndDownloadTempalte}"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:SensorStateConvert x:Key="SensorStateConvert" />
<Style TargetType="GroupBox">

2
InSituLaboratory/Views/Pages/Sensor/MEMSSpView.xaml
View File

@ -8,7 +8,7 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Sensor"
mc:Ignorable="d" Template="{StaticResource PageSearchAndDownloadTempalte}"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:SensorStateConvert x:Key="SensorStateConvert" />

2
InSituLaboratory/Views/Pages/Sensor/MEMSZpView.xaml
View File

@ -8,7 +8,7 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Sensor"
mc:Ignorable="d" Template="{StaticResource PageSearchAndDownloadTempalte}"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:SensorStateConvert x:Key="SensorStateConvert" />
<Style TargetType="GroupBox">

2
InSituLaboratory/Views/Pages/Sensor/ParticleAnalyzerView.xaml
View File

@ -8,7 +8,7 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Sensor"
mc:Ignorable="d" Template="{StaticResource PageSearchAndDownloadTempalte}"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:SensorStateConvert x:Key="SensorStateConvert" />

2
InSituLaboratory/Views/Pages/Sensor/SequencerView.xaml
View File

@ -8,7 +8,7 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local="clr-namespace:InSituLaboratory.Views.Pages.Sensor"
mc:Ignorable="d" Template="{StaticResource PageSearchAndDownloadTempalte}"
FontFamily="{StaticResource DigitalDisplay}">
FontFamily="{StaticResource SourceHanSansCN-Regular}">
<UserControl.Resources>
<converters:SensorStateConvert x:Key="SensorStateConvert" />
<Style TargetType="GroupBox">

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

@ -7,7 +7,7 @@
xmlns:converters="clr-namespace:InSituLaboratory.Base;assembly=InSituLaboratory.Base"
xmlns:c="clr-namespace:InSituLaboratory.Controls;assembly=InSituLaboratory.Controls"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d"
mc:Ignorable="d" FontFamily="{StaticResource SourceHanSansCN-Regular}"
Background="#14273a"
d:DesignHeight="450" d:DesignWidth="800">
@ -166,7 +166,7 @@
</Grid>
<Grid Grid.Row="1">
<TextBlock Grid.Column="1" Text="注：同一个子时序下，子时序整体循环间隔时长、启动延迟时间、循环次数与子时序号绑定，均与首次设置一致！" Foreground="#FF6A6A " TextWrapping="Wrap" VerticalAlignment="Center" FontSize="14" Margin="50,0,0,0"/>
<TextBlock Grid.Column="1" Text="注：同一个子时序下，子时序整体循环间隔时长、启动延迟时间、循环次数与子时序号绑定，均与首次设置一致！" Foreground="#FF6A6A " FontWeight="Bold" TextWrapping="Wrap" VerticalAlignment="Center" FontSize="14" Margin="50,0,0,0"/>
</Grid>
<!--时序1-->
<Grid Grid.Row="2">
@ -195,7 +195,7 @@
<!--刷新 新建 下发-->
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<!--刷新按钮-->
<TextBlock Text="{Binding sequentStatusModel.Status1,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363"/>
<TextBlock Text="{Binding sequentStatusModel.Status1,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363" FontWeight="Bold"/>
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshSeCommand}" Width="60" Margin="5,-2,5,0" Background="#88409EFE" Name="sequent1Refresh">
<Button.CommandParameter>
<MultiBinding Converter="{StaticResource ResourceKey=BtnConvert}">
@ -374,7 +374,7 @@
<!--刷新 新建 下发-->
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<!--刷新按钮-->
<TextBlock Text="{Binding sequentStatusModel.Status2,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363"/>
<TextBlock Text="{Binding sequentStatusModel.Status2,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363" FontWeight="Bold"/>
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshSeCommand}" Width="60" Margin="5,-2,5,0" Background="#88409EFE" Name="sequent2Refresh">
<Button.CommandParameter>
<MultiBinding Converter="{StaticResource ResourceKey=BtnConvert}">
@ -553,7 +553,7 @@
<!--刷新 新建 下发-->
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<!--刷新按钮-->
<TextBlock Text="{Binding sequentStatusModel.Status3,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363"/>
<TextBlock Text="{Binding sequentStatusModel.Status3,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363" FontWeight="Bold"/>
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshSeCommand}" Width="60" Margin="5,-2,5,0" Background="#88409EFE" Name="sequent3Refresh">
<Button.CommandParameter>
<MultiBinding Converter="{StaticResource ResourceKey=BtnConvert}">
@ -732,7 +732,7 @@
<!--刷新 新建 下发-->
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<!--刷新按钮-->
<TextBlock Text="{Binding sequentStatusModel.Status4,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363"/>
<TextBlock Text="{Binding sequentStatusModel.Status4,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363" FontWeight="Bold"/>
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshSeCommand}" Width="60" Margin="5,-2,5,0" Background="#88409EFE" Name="sequent4Refresh">
<Button.CommandParameter>
<MultiBinding Converter="{StaticResource ResourceKey=BtnConvert}">
@ -910,7 +910,7 @@
<!--刷新 新建 下发-->
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<!--刷新按钮-->
<TextBlock Text="{Binding sequentStatusModel.Status5,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363"/>
<TextBlock Text="{Binding sequentStatusModel.Status5,Mode=TwoWay}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="100" Foreground="#EE6363" FontWeight="Bold"/>
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshSeCommand}" Width="60" Margin="5,-2,5,0" Background="#88409EFE" Name="sequent5Refresh">
<Button.CommandParameter>
<MultiBinding Converter="{StaticResource ResourceKey=BtnConvert}">

2
InSituLaboratory/Views/Pages/SysDeviceView.xaml
View File

@ -4,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageTempalte}">
<UserControl.Resources>
<Style TargetType="GroupBox">

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

@ -4,7 +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}"
FontFamily="{StaticResource SourceHanSansCN-Regular}"
mc:Ignorable="d" Template="{StaticResource PageTempalte}">
<UserControl.Resources>
<Style TargetType="GroupBox">