Merge branch 'dev'

This commit is contained in:
2026-05-09 14:32:25 +08:00
8 changed files with 156 additions and 99 deletions

View File

@@ -122,6 +122,30 @@
<system:String x:Key="test27">手动界面</system:String>
<system:String x:Key="test28">记录画面</system:String>
<system:String x:Key="test29">过程记录</system:String>
<!--报表1-->
<system:String x:Key="FlowReport">流量压力报表</system:String>
<system:String x:Key="FlowReport1">排气流流量L/min</system:String>
<system:String x:Key="FlowReport2">删除</system:String>
<!--报表2-->
<system:String x:Key="TestReport">气阻测试报表</system:String>
<system:String x:Key="TestReport1">气阻hpa</system:String>
<system:String x:Key="TestReport2">流量L/min</system:String>
<!--报表3-->
<system:String x:Key="FxReport">防窒息测试报表</system:String>
<system:String x:Key="FxReport1">开阀压力pa</system:String>
<system:String x:Key="FxReport2">关阀压力pa</system:String>
<!--报表4-->
<system:String x:Key="FxNReport">单一故障气阻测试报表</system:String>
<system:String x:Key="FxNReport1">呼气阻力pa</system:String>
<system:String x:Key="FxNReport2">吸气阻力pa</system:String>
<!--报表5-->
<system:String x:Key="FiveReport">开始CO2浓度%</system:String>
<system:String x:Key="FiveReport1">终CO2浓度%</system:String>
<system:String x:Key="FiveReport2">CO2浓度相对增加%</system:String>
<system:String x:Key="testReport">CO2重复呼吸测试报表</system:String>
<system:String x:Key="testReport1">起始时间</system:String>
@@ -170,9 +194,13 @@
<system:String x:Key="Manual22">吸气校准</system:String>
<system:String x:Key="Manual23">压力校准</system:String>
<system:String x:Key="Manual24">基础参数设置</system:String>
<!--流量时时监控-->
<system:String x:Key="WatchData">实时流量监测系统</system:String>
<system:String x:Key="WatchData1">流量实时监测折线图</system:String>
<system:String x:Key="WatchData2">开始监测</system:String>
<system:String x:Key="WatchData3">停止监测</system:String>
<system:String x:Key="WatchData4">清空数据</system:String>
<system:String x:Key="PositionToPressure">定位移测压力</system:String>