feat: 波动测试模式前端适配 — tb_state_tst扩展+0xB4存库+页面更新
- edc_server/models.py: tb_state_tst DDL增加test_mode/data_source + B4字段 + ALTER TABLE自动迁移 + insert_test_result扩展 + insert_wave_data - edc_server/handlers.py: 0xB2处理传test_mode、0xB4处理调用insert_wave_data存库 - edc-web/models.py: 新增get_latest_wave_data/get_wave_records + test_mode筛选 - edc-web/routes: test_op返回wave数据、test_data支持test_mode筛选 - 前端: test_op页面增加波动数据显示区+测试模式列 test_data页面增加test_mode下拉筛选+B4字段列+CSV导出适配
This commit is contained in:
wangfq
@@ -13,11 +13,13 @@ async function searchData(page = 1) {
|
||||
const serial = document.getElementById("search-serial").value;
|
||||
const dateFrom = document.getElementById("search-date-from").value;
|
||||
const dateTo = document.getElementById("search-date-to").value;
|
||||
const testMode = document.getElementById("search-test-mode").value;
|
||||
|
||||
const params = new URLSearchParams({ page, per_page: 20 });
|
||||
if (serial) params.set("serial", serial);
|
||||
if (dateFrom) params.set("date_from", dateFrom);
|
||||
if (dateTo) params.set("date_to", dateTo);
|
||||
if (testMode) params.set("test_mode", testMode);
|
||||
|
||||
try {
|
||||
const resp = await fetch(`/api/test-data?${params}`);
|
||||
@@ -33,7 +35,7 @@ async function searchData(page = 1) {
|
||||
function renderTable(records) {
|
||||
const tbody = document.querySelector("#test-data-table tbody");
|
||||
if (!records.length) {
|
||||
tbody.innerHTML = '<tr><td colspan="17" style="text-align:center;color:#999;">暂无数据</td></tr>';
|
||||
tbody.innerHTML = '<tr><td colspan="24" style="text-align:center;color:#999;">暂无数据</td></tr>';
|
||||
return;
|
||||
}
|
||||
tbody.innerHTML = records.map(r => `
|
||||
@@ -43,6 +45,8 @@ function renderTable(records) {
|
||||
<td>${r.dpg430_addr}</td>
|
||||
<td>${r.sub_type === 1 ? 'PD132' : r.sub_type === 2 ? 'DLD110' : '-'}</td>
|
||||
<td>${r.str_type || '-'}</td>
|
||||
<td>${r.test_mode === 1 ? '波动测试' : '灵敏度测试'}</td>
|
||||
<td>${r.data_source || '-'}</td>
|
||||
<td>${r.iffinish === '1' ? '是' : '否'}</td>
|
||||
<td>${r.fault_info || '无'}</td>
|
||||
<td>${r.relay_out || '无'}</td>
|
||||
@@ -54,6 +58,11 @@ function renderTable(records) {
|
||||
<td>${r.exit_dist || '-'}</td>
|
||||
<td>${toSpeed(r.enter_speed)}</td>
|
||||
<td>${toSpeed(r.exit_speed)}</td>
|
||||
<td>${r.remain_count || '-'}</td>
|
||||
<td>${r.curr_dist || '-'}</td>
|
||||
<td>${r.speed || '-'}</td>
|
||||
<td>${r.near_dist || '-'}</td>
|
||||
<td>${r.far_dist || '-'}</td>
|
||||
<td>${r.create_time || '-'}</td>
|
||||
</tr>
|
||||
`).join("");
|
||||
@@ -78,11 +87,13 @@ function exportCSV() {
|
||||
const serial = document.getElementById("search-serial").value;
|
||||
const dateFrom = document.getElementById("search-date-from").value;
|
||||
const dateTo = document.getElementById("search-date-to").value;
|
||||
const testMode = document.getElementById("search-test-mode").value;
|
||||
|
||||
const params = new URLSearchParams();
|
||||
if (serial) params.set("serial", serial);
|
||||
if (dateFrom) params.set("date_from", dateFrom);
|
||||
if (dateTo) params.set("date_to", dateTo);
|
||||
if (testMode) params.set("test_mode", testMode);
|
||||
|
||||
window.location.href = `/api/test-data/export?${params}`;
|
||||
}
|
||||
|
||||
@@ -67,6 +67,7 @@ async function startAuto() {
|
||||
// 清空显示
|
||||
resetAverages();
|
||||
document.getElementById("latest-result").innerHTML = '<p class="placeholder">等待测试...</p>';
|
||||
document.getElementById("latest-wave").innerHTML = '<p class="placeholder">暂无波动数据...</p>';
|
||||
document.getElementById("progress-bar").style.width = "0%";
|
||||
document.getElementById("progress-text").textContent = "0/" + count + " (0 失败)";
|
||||
document.getElementById("stat-done").textContent = "0";
|
||||
@@ -145,6 +146,11 @@ async function pollProgress() {
|
||||
renderAverages(data.averages);
|
||||
}
|
||||
|
||||
// 显示波动测试数据
|
||||
if (data.latest_wave) {
|
||||
renderLatestWave(data.latest_wave);
|
||||
}
|
||||
|
||||
// 显示本轮测试明细
|
||||
if (data.records) {
|
||||
renderRecords(data.records);
|
||||
@@ -209,6 +215,7 @@ function renderLatest(data) {
|
||||
const div = document.getElementById("latest-result");
|
||||
div.innerHTML = `
|
||||
<p>设备型号：<strong>${data.str_type || '-'}</strong></p>
|
||||
<p>测试模式：<strong>${data.test_mode === 1 ? '波动测试' : '灵敏度测试'}</strong></p>
|
||||
<p>峰峰值：${data.ppvalue?.toFixed(2) || '-'} V</p>
|
||||
<p>开始工作频率：${data.idle_freq || '-'} Hz</p>
|
||||
<p>进入工作频率：${data.enter_freq || '-'} Hz</p>
|
||||
@@ -242,6 +249,28 @@ function resetAverages() {
|
||||
});
|
||||
}
|
||||
|
||||
// ─── 显示波动测试数据 ──────────────────────────
|
||||
|
||||
function renderLatestWave(data) {
|
||||
const div = document.getElementById("latest-wave");
|
||||
if (!data || !data.work_freq) {
|
||||
div.innerHTML = '<p class="placeholder">暂无波动数据...</p>';
|
||||
return;
|
||||
}
|
||||
div.innerHTML = `
|
||||
<p>剩余次数：<strong>${data.remain_count || 0}</strong></p>
|
||||
<p>工作频率：${data.work_freq || '-'} Hz</p>
|
||||
<p>当前距离：${data.curr_dist || '-'} mm</p>
|
||||
<p>当前速度：${toSpeed(data.speed)} m/s</p>
|
||||
<p>最近距离：${data.near_dist || '-'} mm</p>
|
||||
<p>最远距离：${data.far_dist || '-'} mm</p>
|
||||
<p>进入高度 (B4)：${data.b4_enter_dist || '-'} mm</p>
|
||||
<p>离开高度 (B4)：${data.b4_leave_dist || '-'} mm</p>
|
||||
<p>继电器：${data.relay_out || '无'}</p>
|
||||
<p>时间：${data.create_time || '-'}</p>
|
||||
`;
|
||||
}
|
||||
|
||||
// ─── 显示本轮测试明细 ──────────────────────────
|
||||
|
||||
function renderRecords(records) {
|
||||
@@ -260,6 +289,7 @@ function renderRecords(records) {
|
||||
<td style="color:${r.sn_state === 2 ? '#27ae60' : r.sn_state === 3 ? '#e74c3c' : '#888'}">
|
||||
${r.sn_state === 2 ? 'OK' : r.sn_state === 3 ? '超时' : '?'}
|
||||
</td>
|
||||
<td>${r.test_mode === 1 ? '波动' : '灵敏度'}</td>
|
||||
<td>${r.ppvalue?.toFixed(2) || '-'}</td>
|
||||
<td>${r.idle_freq || '-'}</td>
|
||||
<td>${r.enter_dist || '-'}</td>
|
||||
|
||||
Reference in New Issue
Block a user