From 4b082e35df0d60a97344cd47787d7bf7626d8dd4 Mon Sep 17 00:00:00 2001 From: wangfq Date: Mon, 15 Jun 2026 13:41:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E8=BD=A6?= =?UTF-8?q?=E6=A3=80=E5=99=A8=E5=BA=8F=E5=88=97=E5=8F=B7=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- edc-web/app/static/js/test_data.js | 32 +++++++++++++++--------------- edc-web/app/static/js/test_op.js | 18 ++++++++--------- edc-web/app/templates/test_op.html | 14 ++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/edc-web/app/static/js/test_data.js b/edc-web/app/static/js/test_data.js index 0da4251..b9af44a 100644 --- a/edc-web/app/static/js/test_data.js +++ b/edc-web/app/static/js/test_data.js @@ -39,8 +39,8 @@ const VIEWS = { { 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: '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: 'exit_freq', title: '离开频率(Hz)', render: r => r.data_source === 'B4' ? '-' : (r.exit_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: 'enter_dist', title: '触发距离(mm)', render: r => { const v = r.data_source === 'B4' ? r.b4_enter_dist : r.enter_dist; return v != null ? v + ' ' : '-'; @@ -49,8 +49,8 @@ const VIEWS = { const v = r.data_source === 'B4' ? r.b4_leave_dist : r.exit_dist; return v != null ? v + ' ' : '-'; }}, - { 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: '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: '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: '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: 'ppvalue', title: '峰峰值(V)', render: r => r.ppvalue?.toFixed(2) || '-' }, { key: 'idle_freq', title: '开始频率(Hz)' }, - { key: 'enter_freq', title: '进入频率(Hz)' }, - { key: 'exit_freq', title: '离开频率(Hz)' }, + { key: 'enter_freq', title: '触发频率(Hz)' }, + { key: 'exit_freq', title: '释放频率(Hz)' }, { key: 'enter_dist', title: '触发距离(mm)' }, { key: 'exit_dist', title: '释放距离(mm)' }, - { key: 'enter_speed', title: '进入速度', render: r => toSpeed(r.enter_speed) }, - { key: 'exit_speed', title: '离开速度', render: r => toSpeed(r.exit_speed) }, + { key: 'enter_speed', title: '触发速度', render: r => toSpeed(r.enter_speed) }, + { key: 'exit_speed', title: '释放速度', render: r => toSpeed(r.exit_speed) }, { key: 'env', title: '测试环境', render: r => envLabel(r) }, { key: 'create_time', title: '时间', render: r => fmtTime(r.create_time) }, ], @@ -294,12 +294,12 @@ const CHART_SERIES = { b2: [ { key: 'ppvalue', name: '峰峰值', unit: 'V', yAxisIndex: 0 }, { key: 'idle_freq', name: '开始频率', unit: 'Hz', yAxisIndex: 0 }, - { key: 'enter_freq', name: '进入频率', unit: 'Hz', yAxisIndex: 0 }, - { key: 'exit_freq', name: '离开频率', unit: 'Hz', yAxisIndex: 0 }, - { key: 'enter_dist', name: '进入距离', unit: 'mm', yAxisIndex: 1 }, - { key: 'exit_dist', name: '离开距离', unit: 'mm', yAxisIndex: 1 }, - { key: 'enter_speed', name: '进入速度', unit: 'dm/s',yAxisIndex: 2 }, - { key: 'exit_speed', name: '离开速度', unit: 'dm/s',yAxisIndex: 2 }, + { key: 'enter_freq', name: '触发频率', unit: 'Hz', yAxisIndex: 0 }, + { key: 'exit_freq', name: '释放频率', unit: 'Hz', yAxisIndex: 0 }, + { key: 'enter_dist', name: '触发距离', unit: 'mm', yAxisIndex: 1 }, + { key: 'exit_dist', name: '释放距离', unit: 'mm', yAxisIndex: 1 }, + { key: 'enter_speed', name: '触发速度', unit: 'dm/s',yAxisIndex: 2 }, + { key: 'exit_speed', name: '释放速度', unit: 'dm/s',yAxisIndex: 2 }, ], b4: [ { key: 'work_freq', name: '工作频率', unit: 'Hz', yAxisIndex: 0 }, @@ -307,8 +307,8 @@ const CHART_SERIES = { { key: 'speed', name: '速度', unit: 'dm/s',yAxisIndex: 2 }, { key: 'near_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_leave_dist', name: '离开高度', unit: 'mm', yAxisIndex: 1 }, + { key: 'b4_enter_dist', name: '触发高度', unit: 'mm', yAxisIndex: 1 }, + { key: 'b4_leave_dist', name: '释放高度', unit: 'mm', yAxisIndex: 1 }, ], }; diff --git a/edc-web/app/static/js/test_op.js b/edc-web/app/static/js/test_op.js index c357b0a..258a06e 100644 --- a/edc-web/app/static/js/test_op.js +++ b/edc-web/app/static/js/test_op.js @@ -581,13 +581,13 @@ function renderLatest(data) {

设备型号：${typeName || '-'}

测试模式：${data.test_mode === 1 ? '波动测试' : '灵敏度测试'}

峰峰值：${data.ppvalue?.toFixed(2) || '-'} V

-

开始工作频率：${data.idle_freq || '-'} Hz

-

进入工作频率：${data.enter_freq || '-'} Hz

-

离开工作频率：${data.exit_freq || '-'} Hz

-

进入距离：${data.enter_dist || '-'} mm

-

离开距离：${data.exit_dist || '-'} mm

-

进入速度：${toSpeed(data.enter_speed)} m/s

-

离开速度：${toSpeed(data.exit_speed)} m/s

+

开始频率：${data.idle_freq || '-'} Hz

+

触发频率：${data.enter_freq || '-'} Hz

+

释放频率：${data.exit_freq || '-'} Hz

+

触发距离：${data.enter_dist || '-'} mm

+

释放距离：${data.exit_dist || '-'} mm

+

触发速度：${toSpeed(data.enter_speed)} m/s

+

释放速度：${toSpeed(data.exit_speed)} m/s

是否完成：${data.iffinish === '1' ? '是' : '否'}

故障信息：${data.fault_info || '无'}

继电器：${fmtRelay(data.relay_out) || decodeRelay(data.relay_code)}

@@ -629,8 +629,8 @@ function renderLatestWave(data) {

当前速度：${toSpeed(data.speed)} m/s

最近距离：${data.near_dist || '-'} mm

最远距离：${data.far_dist || '-'} mm

-

进入高度 (B4)：${data.b4_enter_dist || '-'} mm

-

离开高度 (B4)：${data.b4_leave_dist || '-'} mm

+

触发高度 (B4)：${data.b4_enter_dist || '-'} mm

+

释放高度 (B4)：${data.b4_leave_dist || '-'} mm

继电器：${fmtRelay(data.relay_out) || decodeRelay(data.relay_code)}

时间：${fmtTime(data.create_time)}

`; diff --git a/edc-web/app/templates/test_op.html b/edc-web/app/templates/test_op.html index a46bf7e..268f674 100644 --- a/edc-web/app/templates/test_op.html +++ b/edc-web/app/templates/test_op.html @@ -109,12 +109,12 @@

自动化平均值

- - - - - - + + + + + +
平均峰峰值-V
平均开始工作频率-Hz
平均进入工作频率-Hz
平均进入距离-mm
平均离开距离-mm
平均进入速度-m/s
平均离开速度-m/s
平均开始频率-Hz
平均触发频率-Hz
平均触发距离-mm
平均释放距离-mm
平均触发速度-m/s
平均释放速度-m/s

本轮测试明细

@@ -122,7 +122,7 @@ - +
#串口状态模式峰峰值(V)开始频率进入距离离开距离速度(m/s)时间#串口状态模式峰峰值(V)开始频率触发距离释放距离速度(m/s)时间