新增页面修改页面样式
This commit is contained in:
@@ -144,11 +144,11 @@
|
||||
|
||||
<GroupBox Header="测试参数设置" Grid.Row="0" Margin="0,5">
|
||||
<UniformGrid Columns="1" Rows="3" Margin="10" >
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" >
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,15,0,0" >
|
||||
<TextBlock Text="转速设置(r/min):" Width="110" VerticalAlignment="Center"/>
|
||||
<TextBox Text="{Binding FriabilityTargetRpm, UpdateSourceTrigger=PropertyChanged}" Width="100"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0" >
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,15,0,0" >
|
||||
<TextBlock Text="转数设置(秒):" Width="110" VerticalAlignment="Center"/>
|
||||
<TextBox Text="{Binding FriabilityTargetTimeSec, UpdateSourceTrigger=PropertyChanged}" Width="100"/>
|
||||
</StackPanel>
|
||||
@@ -310,7 +310,7 @@
|
||||
<!-- 标题栏 -->
|
||||
<Border Background="#1976D2" CornerRadius="8" Margin="0,0,0,16" Padding="12">
|
||||
<Grid>
|
||||
<TextBlock Text="片剂四用仪 (硬度·脆碎度·崩解·溶出) 符合《中国药典》2025年版"
|
||||
<TextBlock Text="片剂四用仪 (硬度·脆碎度·崩解·溶出) 符合《中国药典》"
|
||||
FontSize="22" FontWeight="Bold" Foreground="White" VerticalAlignment="Center"/>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
|
||||
<Button Command="{Binding OpenSettingsCommand}" Content="⚙ 参数设置" Style="{StaticResource ActionButton}"/>
|
||||
@@ -350,7 +350,15 @@
|
||||
<TextBlock Text="⚠ " Foreground="#FF5722"/>
|
||||
<TextBlock Text="{Binding GlobalAlarm}" Foreground="Red"/>
|
||||
</StackPanel>
|
||||
|
||||
</StatusBarItem>
|
||||
<!-- 透明的点击区域:完全看不到,但是能响应点击 -->
|
||||
<Button Background="Transparent" Margin="10" Width="80" Height="30"
|
||||
Command="{Binding ShowDataCommand}">
|
||||
|
||||
</Button>
|
||||
</StatusBar>
|
||||
|
||||
</Grid>
|
||||
|
||||
</Window>
|
||||
362
Views/ShowData.xaml
Normal file
362
Views/ShowData.xaml
Normal file
@@ -0,0 +1,362 @@
|
||||
<Window x:Class="片剂四用仪.Views.ShowData"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:片剂四用仪.Views"
|
||||
mc:Ignorable="d"
|
||||
Title="ShowData" Height="768" Width="1024"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Background="#F5F5F5">
|
||||
|
||||
<Window.Resources>
|
||||
<!-- 模块卡片样式 -->
|
||||
<Style x:Key="CardStyle" TargetType="Border">
|
||||
<Setter Property="Background" Value="White"/>
|
||||
<Setter Property="CornerRadius" Value="10"/>
|
||||
<Setter Property="Margin" Value="0,10,15,10"/>
|
||||
<Setter Property="Padding" Value="15"/>
|
||||
<Setter Property="Effect">
|
||||
<Setter.Value>
|
||||
<DropShadowEffect Color="#DCDCDC" BlurRadius="8" ShadowDepth="1"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- 标签样式 -->
|
||||
<Style x:Key="PlcLabel" TargetType="TextBlock">
|
||||
<Setter Property="FontSize" Value="13"/>
|
||||
<Setter Property="Width" Value="110"/>
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="LineHeight" Value="18"/>
|
||||
<Setter Property="Margin" Value="0 3 0 5"/>
|
||||
<Setter Property="Foreground" Value="#333333"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
|
||||
<!-- 输入框样式 -->
|
||||
<Style x:Key="PlcTextBox" TargetType="TextBox">
|
||||
<Setter Property="Width" Value="100"/>
|
||||
<Setter Property="Height" Value="28"/>
|
||||
<Setter Property="FontSize" Value="13"/>
|
||||
<Setter Property="Margin" Value="0 0 10 8"/>
|
||||
<Setter Property="IsReadOnly" Value="True"/>
|
||||
<Setter Property="Background" Value="#FAFAFA"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
</Window.Resources>
|
||||
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto" Margin="10">
|
||||
<WrapPanel>
|
||||
|
||||
<!-- ====================== 模块 1 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<!-- 上 3 个 -->
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D10
硬度当前位置"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D40
溶出步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D42
溶出计时递增s"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<!-- 下 4 个 -->
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D44
溶出计时递增min"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D50
崩解步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D52
崩解计时递增s"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D54
崩解计时递增min"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- ====================== 模块 2 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D70
硬度步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D72
最大力采集"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D74
判定比较"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D80
碎脆度步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D82
脆测次数递增"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D90
硬复位步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D94
脆复位步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- ====================== 模块 3 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D100
崩复位步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D104
溶复位步"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D290
硬mm脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D292
脆r脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D294
崩r脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D296
溶r脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D298
硬度电机极限输入"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- ====================== 模块 4 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D300
硬度速度输入mm/min"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D310
硬度位移输入mm/min"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D320
脆速度输入r/min"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D330
崩速度输入r/min"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D340
溶速度输入r/min"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D400
硬度破损判定输入N"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D410
脆碎试验时间设置"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- ====================== 模块 5 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D412
脆碎前质量输入"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D414
脆碎后质量输入"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D416
失重率%"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D420
崩解时间min设置"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D430
溶出时间min设置"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D432
溶出间隔取样时间设置"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D434
溶出间隔时间过渡"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- ====================== 模块 6 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D500
时钟设置"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1300
力读取"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1304
力浮点"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1308
校准后力"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1314
力显示"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1320
力系数"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1322
力保护"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- ====================== 模块 7 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1410
数据读取"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1412
数据浮点"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1416
算"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1418
算"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1420
算"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1422
温度"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1428
温度系数"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- ====================== 模块 8 ====================== -->
|
||||
<Border Style="{StaticResource CardStyle}">
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0 0 0 8">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D1430
温度显示"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D8340
硬度脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D8350
脆碎度脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D8360
崩解脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource PlcLabel}" Text="D8370
溶出脉冲"/>
|
||||
<TextBox Style="{StaticResource PlcTextBox}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Width="110"/>
|
||||
<StackPanel Width="110"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
</WrapPanel>
|
||||
</ScrollViewer>
|
||||
</Window>
|
||||
25
Views/ShowData.xaml.cs
Normal file
25
Views/ShowData.xaml.cs
Normal file
@@ -0,0 +1,25 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
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.Shapes;
|
||||
|
||||
namespace 片剂四用仪.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// ShowData.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class ShowData : Window
|
||||
{
|
||||
public ShowData()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user