代码合并

This commit is contained in:
2026-05-08 20:14:17 +08:00
parent 47bb636727
commit 0a40411962
3 changed files with 51 additions and 21 deletions

View File

@@ -111,7 +111,6 @@
<system:String x:Key="test16">开始CO2浓度</system:String>
<system:String x:Key="test17">结束CO2浓度</system:String>
<system:String x:Key="test18">CO2浓度增加值</system:String>
<system:String x:Key="test19">复位</system:String>
<system:String x:Key="test20">测试启动</system:String>
<system:String x:Key="test21">测试停止</system:String>
@@ -124,8 +123,22 @@
<system:String x:Key="test28">记录画面</system:String>
<system:String x:Key="test29">过程记录</system:String>
<system:String x:Key="testReport">CO2重复呼吸测试报表</system:String>
<system:String x:Key="testReport1">起始时间</system:String>
<system:String x:Key="testReport111">终止时间</system:String>
<system:String x:Key="testReport2">选择日期</system:String>
<system:String x:Key="testReport3">查询</system:String>
<system:String x:Key="testReport4">全选</system:String>
<system:String x:Key="testReport5">批量删除</system:String>
<system:String x:Key="testReport6">导出</system:String>
<system:String x:Key="testReport7">选择</system:String>
<system:String x:Key="testReport8">序号</system:String>
<system:String x:Key="testReport9">二氧化碳浓度(%)</system:String>
<system:String x:Key="testReport10">压力(pa)</system:String>
<system:String x:Key="testReport11">时间</system:String>
<system:String x:Key="testReport12">操作</system:String>
<system:String x:Key="testReport13">上一页</system:String>
<system:String x:Key="testReport14">下一页</system:String>