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

数据中心增加当前下发时序功能，增加读取TXT文档接口。

Browse Source
This commit is contained in:
MoYue 2024-05-23 18:10:56 +08:00
parent 52021c9ef7
commit 3eeeed32d3
9 changed files with 96 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
InSituLaboratory.Assets/Fonts/iconfont1.ttf
View File

Binary file not shown.

31
InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs
View File

@ -12,6 +12,8 @@ using InSituLaboratory.Entities.ExperimentalStationEntities;
using Prism.Regions;
using InSituLaboratory.IService;
using Prism.Commands;
using System.Windows;
using System.Windows.Forms;
namespace InSituLaboratory.ViewModels.Pages
{
@ -23,7 +25,7 @@ namespace InSituLaboratory.ViewModels.Pages
public CurrentEquipmentModel CurrentWorkEquipment { get; set; } = new CurrentEquipmentModel();//当前工作设备
public CurrentEquipmentModel currentFaultyEquipment { get; set; } = new CurrentEquipmentModel();//当前故障设备
public DelegateCommand<object> ReadCommand { get; set; }
#endregion
ISysStatusService _sysStatusService;
@ -33,6 +35,8 @@ namespace InSituLaboratory.ViewModels.Pages
IsCanClose = false;
_sysStatusService = isysStatusService;
ReadCommand = new DelegateCommand<object>(DoRead);
this.Refresh();
}
@ -60,6 +64,8 @@ namespace InSituLaboratory.ViewModels.Pages
SysStatusModel.LeakageStaus2 = data.LeakageStaus2;
SysStatusModel.InternalPressure1 = data.InternalPressure1;
SysStatusModel.InternalPressure2 = data.InternalPressure2;
SysStatusModel.TimeSeriesGroupNumber = data.TimeSeriesGroupNumber;
SysStatusModel.GroupNumberStatus = data.GroupNumberStatus;
}
if (CurrentWorklist.Count() != 0)
@ -86,5 +92,28 @@ namespace InSituLaboratory.ViewModels.Pages
currentFaultyEquipment.Sequencer = data.Sequencer;
}
}
/// <summary>
/// 读取文本文档
/// </summary>
/// <param name="o"></param>
public void DoRead(object o)
{
System.Windows.Forms.MessageBox.Show("暂无此项功能!", "警告", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
OpenFileDialog openFileDialog = new OpenFileDialog();
openFileDialog.Title = "选择文件";
openFileDialog.Multiselect = false;//选择多个文件
openFileDialog.RestoreDirectory = true;//跟踪上次打开的文件的目录
openFileDialog.Filter = "Text files(*.txt) | *.txt";
}
}
}

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

@ -50,105 +50,120 @@
</Setter>
</Style>
</UserControl.Resources>
<ScrollViewer Margin="0,5,0,10">
<Grid>
<ScrollViewer >
<Grid Margin="15">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition Height="110"/>
<RowDefinition Height="310"/>
<RowDefinition Height="240"/>
</Grid.RowDefinitions>
<!--第一行-->
<Grid Grid.Row="0">
<UniformGrid Columns="5" Rows="3">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<!--组包时间-->
<Grid>
<Border CornerRadius="5" Background="#FAFCFF" Margin="10">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="#AAA" Margin="0,10,0,5" FontSize="12">
<TextBlock Foreground="#AAA" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe8b8;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="16"/>
<Run Text="组包时间" FontSize="15"/>
<Run Text="组包时间" FontSize="18"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.PackagingTime ,Mode=TwoWay,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" FontSize="15" FontWeight="Normal" Foreground="#555"/>
<Grid TextBlock.FontSize="11">
<TextBlock HorizontalAlignment="Left" Foreground="Green">
</TextBlock>
</Grid>
</StackPanel>
</Border>
</Grid>
<!--采样时间-->
<Grid Grid.Column="1">
<Border CornerRadius="5" Background="#FAFCFF" Margin="10">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="#AAA" Margin="0,10,0,5" FontSize="12">
<TextBlock Foreground="#AAA" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe8a9;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="采样时间" FontSize="18"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.SamplingTime ,Mode=TwoWay,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" FontSize="15" FontWeight="Normal" Foreground="#555"/>
<Grid TextBlock.FontSize="11">
<TextBlock HorizontalAlignment="Left" Foreground="Green">
</TextBlock>
</Grid>
</StackPanel>
</Border>
</Grid>
<!--48V电压-->
<Grid Grid.Column="2">
<Border CornerRadius="5" Background="#FAFCFF" Margin="10">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="#AAA" Margin="0,10,0,5" FontSize="12">
<TextBlock Foreground="#AAA" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe666;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="48V电压" FontSize="18"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.Voltage48 ,Mode=TwoWay,StringFormat={}{0}V}" FontSize="15" FontWeight="Normal" Foreground="#555"/>
<Grid TextBlock.FontSize="11">
<TextBlock HorizontalAlignment="Left" Foreground="Green">
</TextBlock>
</Grid>
</StackPanel>
</Border>
</Grid>
<!--48V电流-->
<Grid Grid.Column="3">
<Border CornerRadius="5" Background="#FAFCFF" Margin="10">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="#AAA" Margin="0,10,0,5" FontSize="12">
<TextBlock Foreground="#AAA" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe665;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="48V电流" FontSize="18"/>
</TextBlock>
<TextBlock Text="{Binding SysStatusModel.Current48 ,Mode=TwoWay,StringFormat={}{0}A}" FontSize="15" FontWeight="Normal" Foreground="#555"/>
<Grid TextBlock.FontSize="11">
<TextBlock HorizontalAlignment="Left" Foreground="Green">
</TextBlock>
</Grid>
</StackPanel>
</Border>
</Grid>
<!--时序下配状态-->
<Grid Grid.Column="4">
<Border CornerRadius="5" Background="#FAFCFF" Margin="10">
<Border.Effect>
<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#555" Opacity="0.1"/>
</Border.Effect>
<StackPanel Margin="30,10" Orientation="Vertical" >
<TextBlock Foreground="#AAA" Margin="0,10,0,18" FontSize="12">
<Run Text="&#xe6e4;" FontFamily="{StaticResource IconsExt}" Foreground="#088DF6" FontSize="18"/>
<Run Text="时序下配状态" FontSize="18"/>
</TextBlock>
<TextBlock FontSize="15" FontWeight="Normal" Foreground="#555">
<Run Text="{Binding SysStatusModel.TimeSeriesGroupNumber ,Mode=TwoWay}" />
<Run Text="{Binding SysStatusModel.GroupNumberStatus ,Mode=TwoWay}" />
</TextBlock>
</StackPanel>
</Border>
</Grid>
<!--刷新-->
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshCommand}" FontSize="15" Width="60" Margin="5,0" Background="#88409EFE"/>
</UniformGrid>
<StackPanel Grid.Column="5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
<Button Content="刷新" Style="{StaticResource NormalButtonStyle}" Command="{Binding RefreshCommand}" FontSize="15" Width="80" Margin="5,5" Background="#88409EFE"/>
<Button Content="读取" Style="{StaticResource NormalButtonStyle}" Command="{Binding ReadCommand}" FontSize="15" Width="80" Margin="5,5" Background="#88409EFE"/>
</StackPanel>
</Grid>
<!-- 主腔体状态 -->
<Grid Margin="0,110,0,40" Grid.RowSpan="2">
<Grid Grid.Row="1" >
<GroupBox Header="主腔体状态">
<Grid>
<Grid.ColumnDefinitions>
@ -299,7 +314,7 @@
</Grid>
<!--当前工作状态/当前故障设备-->
<Grid Grid.Row="2" Margin="0,-40,0,0">
<Grid Grid.Row="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition/>

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

@ -129,7 +129,7 @@
<ColumnDefinition Width="2*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<TextBlock Grid.Column="0" Text="设备绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<Border Grid.Column="1" Width="20" Height="20" Background="{Binding cH4IsotopeModel.Insulation, Converter={StaticResource ResourceKey=SensorStateConvert}}" CornerRadius="10" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</Grid>

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

@ -129,7 +129,7 @@
<ColumnDefinition Width="2*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<TextBlock Grid.Column="0" Text="设备绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<Border Grid.Column="1" Width="20" Height="20" Background="{Binding cO2IsotopeModel.Insulation, Converter={StaticResource ResourceKey=SensorStateConvert}}" CornerRadius="10" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</Grid>

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

@ -131,7 +131,7 @@
<ColumnDefinition Width="2*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<TextBlock Grid.Column="0" Text="设备绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<Border Grid.Column="1" Width="20" Height="20" Background="{Binding clormsModel.Insulation, Converter={StaticResource ResourceKey=SensorStateConvert}}" CornerRadius="10" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</Grid>

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

@ -130,7 +130,7 @@
<ColumnDefinition Width="2*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<TextBlock Grid.Column="0" Text="设备绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<Border Grid.Column="1" Width="20" Height="20" Background="{Binding mEMSSpModel.Insulation, Converter={StaticResource ResourceKey=SensorStateConvert}}" CornerRadius="10" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</Grid>

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

@ -131,7 +131,7 @@
<ColumnDefinition Width="2*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<TextBlock Grid.Column="0" Text="设备绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<Border Grid.Column="1" Width="20" Height="20" Background="{Binding mEMSZpModel.Insulation, Converter={StaticResource ResourceKey=SensorStateConvert}}" CornerRadius="10" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</Grid>

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

@ -129,7 +129,7 @@
<ColumnDefinition Width="2*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<TextBlock Grid.Column="0" Text="设备绝缘" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
<Border Grid.Column="1" Width="20" Height="20" Background="{Binding sequencerModel.Insulation, Converter={StaticResource ResourceKey=SensorStateConvert}}" CornerRadius="10" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Grid>
</Grid>