wangfq/vd_test_fixture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 调整车检器序列号相关命名

Browse Source
This commit is contained in:
wangfq
2026-06-15 13:41:22 +08:00
parent 521cbe4107
commit 4b082e35df
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
edc-web/app/static/js/test_data.js
View File

@@ -39,8 +39,8 @@ const VIEWS = {
{ key: 'relay_out', title: '继电器', render: r => fmtRelay(r.relay_out) }, { key: 'relay_out', title: '继电器', render: r => fmtRelay(r.relay_out) },
{ key: 'ppvalue', title: '峰峰值(V)', render: r => r.data_source === 'B4' ? '-' : (r.ppvalue != null ? r.ppvalue.toFixed(2) : '-') }, { key: 'ppvalue', title: '峰峰值(V)', render: r => r.data_source === 'B4' ? '-' : (r.ppvalue != null ? r.ppvalue.toFixed(2) : '-') },
{ key: 'idle_freq', title: '开始频率(Hz)', render: r => r.data_source === 'B4' ? '-' : (r.idle_freq || '-') }, { key: 'idle_freq', title: '开始频率(Hz)', render: r => r.data_source === 'B4' ? '-' : (r.idle_freq || '-') },
{ key: 'enter_freq', title: '进入频率(Hz)', render: r => r.data_source === 'B4' ? '-' : (r.enter_freq || '-') }, { key: 'enter_freq', title: '触发频率(Hz)', render: r => r.data_source === 'B4' ? '-' : (r.enter_freq || '-') },
{ key: 'exit_freq', title: '离开频率(Hz)', render: r => r.data_source === 'B4' ? '-' : (r.exit_freq || '-') }, { key: 'exit_freq', title: '释放频率(Hz)', render: r => r.data_source === 'B4' ? '-' : (r.exit_freq || '-') },
{ key: 'enter_dist', title: '触发距离(mm)', render: r => { { key: 'enter_dist', title: '触发距离(mm)', render: r => {
const v = r.data_source === 'B4' ? r.b4_enter_dist : r.enter_dist; const v = r.data_source === 'B4' ? r.b4_enter_dist : r.enter_dist;
return v != null ? v + ' ' : '-'; return v != null ? v + ' ' : '-';
@@ -49,8 +49,8 @@ const VIEWS = {
const v = r.data_source === 'B4' ? r.b4_leave_dist : r.exit_dist; const v = r.data_source === 'B4' ? r.b4_leave_dist : r.exit_dist;
return v != null ? v + ' ' : '-'; return v != null ? v + ' ' : '-';
}}, }},
{ key: 'enter_speed', title: '进入速度(dm/s)', render: r => r.data_source === 'B4' ? '-' : toSpeed(r.enter_speed) }, { key: 'enter_speed', title: '触发速度(dm/s)', render: r => r.data_source === 'B4' ? '-' : toSpeed(r.enter_speed) },
{ key: 'exit_speed', title: '离开速度(dm/s)', render: r => r.data_source === 'B4' ? '-' : toSpeed(r.exit_speed) }, { key: 'exit_speed', title: '释放速度(dm/s)', render: r => r.data_source === 'B4' ? '-' : toSpeed(r.exit_speed) },
{ key: 'remain_count', title: '剩余次数', render: r => r.data_source === 'B2' ? '-' : (r.remain_count ?? '-') }, { key: 'remain_count', title: '剩余次数', render: r => r.data_source === 'B2' ? '-' : (r.remain_count ?? '-') },
{ key: 'work_freq', title: '工作频率(Hz)', render: r => r.data_source === 'B2' ? '-' : (r.work_freq ?? '-') }, { key: 'work_freq', title: '工作频率(Hz)', render: r => r.data_source === 'B2' ? '-' : (r.work_freq ?? '-') },
{ key: 'curr_dist', title: '当前距离(mm)', render: r => r.data_source === 'B2' ? '-' : (r.curr_dist != null ? r.curr_dist + ' ' : '-') }, { key: 'curr_dist', title: '当前距离(mm)', render: r => r.data_source === 'B2' ? '-' : (r.curr_dist != null ? r.curr_dist + ' ' : '-') },
@@ -75,12 +75,12 @@ const VIEWS = {
{ key: 'relay_out', title: '继电器', render: r => fmtRelay(r.relay_out) }, { key: 'relay_out', title: '继电器', render: r => fmtRelay(r.relay_out) },
{ key: 'ppvalue', title: '峰峰值(V)', render: r => r.ppvalue?.toFixed(2) || '-' }, { key: 'ppvalue', title: '峰峰值(V)', render: r => r.ppvalue?.toFixed(2) || '-' },
{ key: 'idle_freq', title: '开始频率(Hz)' }, { key: 'idle_freq', title: '开始频率(Hz)' },
{ key: 'enter_freq', title: '进入频率(Hz)' }, { key: 'enter_freq', title: '触发频率(Hz)' },
{ key: 'exit_freq', title: '离开频率(Hz)' }, { key: 'exit_freq', title: '释放频率(Hz)' },
{ key: 'enter_dist', title: '触发距离(mm)' }, { key: 'enter_dist', title: '触发距离(mm)' },
{ key: 'exit_dist', title: '释放距离(mm)' }, { key: 'exit_dist', title: '释放距离(mm)' },
{ key: 'enter_speed', title: '进入速度', render: r => toSpeed(r.enter_speed) }, { key: 'enter_speed', title: '触发速度', render: r => toSpeed(r.enter_speed) },
{ key: 'exit_speed', title: '离开速度', render: r => toSpeed(r.exit_speed) }, { key: 'exit_speed', title: '释放速度', render: r => toSpeed(r.exit_speed) },
{ key: 'env', title: '测试环境', render: r => envLabel(r) }, { key: 'env', title: '测试环境', render: r => envLabel(r) },
{ key: 'create_time', title: '时间', render: r => fmtTime(r.create_time) }, { key: 'create_time', title: '时间', render: r => fmtTime(r.create_time) },
], ],
@@ -294,12 +294,12 @@ const CHART_SERIES = {
b2: [ b2: [
{ key: 'ppvalue', name: '峰峰值', unit: 'V', yAxisIndex: 0 }, { key: 'ppvalue', name: '峰峰值', unit: 'V', yAxisIndex: 0 },
{ key: 'idle_freq', name: '开始频率', unit: 'Hz', yAxisIndex: 0 }, { key: 'idle_freq', name: '开始频率', unit: 'Hz', yAxisIndex: 0 },
{ key: 'enter_freq', name: '进入频率', unit: 'Hz', yAxisIndex: 0 }, { key: 'enter_freq', name: '触发频率', unit: 'Hz', yAxisIndex: 0 },
{ key: 'exit_freq', name: '离开频率', unit: 'Hz', yAxisIndex: 0 }, { key: 'exit_freq', name: '释放频率', unit: 'Hz', yAxisIndex: 0 },
{ key: 'enter_dist', name: '进入距离', unit: 'mm', yAxisIndex: 1 }, { key: 'enter_dist', name: '触发距离', unit: 'mm', yAxisIndex: 1 },
{ key: 'exit_dist', name: '离开距离', unit: 'mm', yAxisIndex: 1 }, { key: 'exit_dist', name: '释放距离', unit: 'mm', yAxisIndex: 1 },
{ key: 'enter_speed', name: '进入速度', unit: 'dm/s',yAxisIndex: 2 }, { key: 'enter_speed', name: '触发速度', unit: 'dm/s',yAxisIndex: 2 },
{ key: 'exit_speed', name: '离开速度', unit: 'dm/s',yAxisIndex: 2 }, { key: 'exit_speed', name: '释放速度', unit: 'dm/s',yAxisIndex: 2 },
], ],
b4: [ b4: [
{ key: 'work_freq', name: '工作频率', unit: 'Hz', yAxisIndex: 0 }, { key: 'work_freq', name: '工作频率', unit: 'Hz', yAxisIndex: 0 },
@@ -307,8 +307,8 @@ const CHART_SERIES = {
{ key: 'speed', name: '速度', unit: 'dm/s',yAxisIndex: 2 }, { key: 'speed', name: '速度', unit: 'dm/s',yAxisIndex: 2 },
{ key: 'near_dist', name: '最近距离', unit: 'mm', yAxisIndex: 1 }, { key: 'near_dist', name: '最近距离', unit: 'mm', yAxisIndex: 1 },
{ key: 'far_dist', name: '最远距离', unit: 'mm', yAxisIndex: 1 }, { key: 'far_dist', name: '最远距离', unit: 'mm', yAxisIndex: 1 },
{ key: 'b4_enter_dist', name: '进入高度', unit: 'mm', yAxisIndex: 1 }, { key: 'b4_enter_dist', name: '触发高度', unit: 'mm', yAxisIndex: 1 },
{ key: 'b4_leave_dist', name: '离开高度', unit: 'mm', yAxisIndex: 1 }, { key: 'b4_leave_dist', name: '释放高度', unit: 'mm', yAxisIndex: 1 },
], ],
}; };

18
edc-web/app/static/js/test_op.js
View File

@@ -581,13 +581,13 @@ function renderLatest(data) {
<p>设备型号：<strong>${typeName || '-'}</strong></p> <p>设备型号：<strong>${typeName || '-'}</strong></p>
<p>测试模式：<strong>${data.test_mode === 1 ? '波动测试' : '灵敏度测试'}</strong></p> <p>测试模式：<strong>${data.test_mode === 1 ? '波动测试' : '灵敏度测试'}</strong></p>
<p>峰峰值：${data.ppvalue?.toFixed(2) || '-'} V</p> <p>峰峰值：${data.ppvalue?.toFixed(2) || '-'} V</p>
<p>开始工作频率：${data.idle_freq || '-'} Hz</p> <p>开始频率：${data.idle_freq || '-'} Hz</p>
<p>进入工作频率：${data.enter_freq || '-'} Hz</p> <p>触发频率：${data.enter_freq || '-'} Hz</p>
<p>离开工作频率：${data.exit_freq || '-'} Hz</p> <p>释放频率：${data.exit_freq || '-'} Hz</p>
<p>进入距离：${data.enter_dist || '-'} mm</p> <p>触发距离：${data.enter_dist || '-'} mm</p>
<p>离开距离：${data.exit_dist || '-'} mm</p> <p>释放距离：${data.exit_dist || '-'} mm</p>
<p>进入速度：${toSpeed(data.enter_speed)} m/s</p> <p>触发速度：${toSpeed(data.enter_speed)} m/s</p>
<p>离开速度：${toSpeed(data.exit_speed)} m/s</p> <p>释放速度：${toSpeed(data.exit_speed)} m/s</p>
<p>是否完成：${data.iffinish === '1' ? '是' : '否'}</p> <p>是否完成：${data.iffinish === '1' ? '是' : '否'}</p>
<p>故障信息：${data.fault_info || '无'}</p> <p>故障信息：${data.fault_info || '无'}</p>
<p>继电器：${fmtRelay(data.relay_out) || decodeRelay(data.relay_code)}</p> <p>继电器：${fmtRelay(data.relay_out) || decodeRelay(data.relay_code)}</p>
@@ -629,8 +629,8 @@ function renderLatestWave(data) {
<p>当前速度：${toSpeed(data.speed)} m/s</p> <p>当前速度：${toSpeed(data.speed)} m/s</p>
<p>最近距离：${data.near_dist || '-'} mm</p> <p>最近距离：${data.near_dist || '-'} mm</p>
<p>最远距离：${data.far_dist || '-'} mm</p> <p>最远距离：${data.far_dist || '-'} mm</p>
<p>进入高度 (B4)：${data.b4_enter_dist || '-'} mm</p> <p>触发高度 (B4)：${data.b4_enter_dist || '-'} mm</p>
<p>离开高度 (B4)：${data.b4_leave_dist || '-'} mm</p> <p>释放高度 (B4)：${data.b4_leave_dist || '-'} mm</p>
<p>继电器：${fmtRelay(data.relay_out) || decodeRelay(data.relay_code)}</p> <p>继电器：${fmtRelay(data.relay_out) || decodeRelay(data.relay_code)}</p>
<p>时间：${fmtTime(data.create_time)}</p> <p>时间：${fmtTime(data.create_time)}</p>
`; `;

14
edc-web/app/templates/test_op.html
View File

@@ -109,12 +109,12 @@
<h3>自动化平均值</h3> <h3>自动化平均值</h3>
<table id="avg-table"> <table id="avg-table">
<tr><td>平均峰峰值</td><td id="avg-ppvalue">-</td><td>V</td></tr> <tr><td>平均峰峰值</td><td id="avg-ppvalue">-</td><td>V</td></tr>
<tr><td>平均开始工作频率</td><td id="avg-idle-freq">-</td><td>Hz</td></tr> <tr><td>平均开始频率</td><td id="avg-idle-freq">-</td><td>Hz</td></tr>
<tr><td>平均进入工作频率</td><td id="avg-enter-freq">-</td><td>Hz</td></tr> <tr><td>平均触发频率</td><td id="avg-enter-freq">-</td><td>Hz</td></tr>
<tr><td>平均进入距离</td><td id="avg-enter-dist">-</td><td>mm</td></tr> <tr><td>平均触发距离</td><td id="avg-enter-dist">-</td><td>mm</td></tr>
<tr><td>平均离开距离</td><td id="avg-exit-dist">-</td><td>mm</td></tr> <tr><td>平均释放距离</td><td id="avg-exit-dist">-</td><td>mm</td></tr>
<tr><td>平均进入速度</td><td id="avg-enter-speed">-</td><td>m/s</td></tr> <tr><td>平均触发速度</td><td id="avg-enter-speed">-</td><td>m/s</td></tr>
<tr><td>平均离开速度</td><td id="avg-exit-speed">-</td><td>m/s</td></tr> <tr><td>平均释放速度</td><td id="avg-exit-speed">-</td><td>m/s</td></tr>
</table> </table>
<h3 style="margin-top:20px;">本轮测试明细</h3> <h3 style="margin-top:20px;">本轮测试明细</h3>
@@ -122,7 +122,7 @@
<table id="records-table" style="font-size:11px;"> <table id="records-table" style="font-size:11px;">
<thead> <thead>
<tr> <tr>
<th>#</th><th>串口状态</th><th>模式</th><th>峰峰值(V)</th><th>开始频率</th><th>进入距离</th><th>离开距离</th><th>速度(m/s)</th><th>时间</th> <th>#</th><th>串口状态</th><th>模式</th><th>峰峰值(V)</th><th>开始频率</th><th>触发距离</th><th>释放距离</th><th>速度(m/s)</th><th>时间</th>
</tr> </tr>
</thead> </thead>
<tbody></tbody> <tbody></tbody>