feat: 全部数据视图显示tb_state_tst全部字段,B2/B4差异字段显示'-'
- 排除 dpg430_addr 和 sub_type(型号列用 render 转换) - B4 记录: ppvalue/idle_freq/enter_freq/exit_freq/enter_speed/exit_speed 显示 '-' - B2 记录: remain_count/work_freq/curr_dist/speed/near_dist/far_dist 显示 '-' - 进入距离(B2) 与 进入高度(B4) 合并为「进入高度/距离」 - 离开距离(B2) 与 离开高度(B4) 合并为「离开高度/距离」 - 新增列: iffinish(完成), fault_info(故障信息), relay_out(继电器), enter_freq, exit_freq, enter_speed, exit_speed, work_freq, speed, near_dist, far_dist
This commit is contained in:
@@ -9,19 +9,35 @@ const VIEWS = {
|
||||
cols: [
|
||||
{ key: 'id', title: 'ID' },
|
||||
{ key: 'serial', title: '设备编码' },
|
||||
{ key: 'dpg430_addr', title: '地址' },
|
||||
{ key: 'model', title: '型号', render: r => r.sub_type === 1 ? 'PD132' : r.sub_type === 2 ? 'DLD110' : '-' },
|
||||
{ key: 'str_type', title: '类型' },
|
||||
{ key: 'data_source', title: '来源' },
|
||||
{ key: 'test_mode', title: '测试模式', render: r => r.test_mode === 1 ? '波动' : '灵敏度' },
|
||||
{ key: 'ppvalue', title: '峰峰值(V)', render: r => r.ppvalue?.toFixed(2) || '-' },
|
||||
{ key: 'idle_freq', title: '开始频率' },
|
||||
{ key: 'enter_dist', title: '进入距离' },
|
||||
{ key: 'exit_dist', title: '离开距离' },
|
||||
{ key: 'remain_count', title: '剩余次数' },
|
||||
{ key: 'curr_dist', title: '当前距离' },
|
||||
{ key: 'iffinish', title: '完成', render: r => r.data_source === 'B4' ? '-' : (r.iffinish === '1' ? '是' : '否') },
|
||||
{ key: 'fault_info', title: '故障信息', render: r => r.data_source === 'B4' ? '-' : (r.fault_info || '-') },
|
||||
{ key: 'relay_out', title: '继电器', render: r => decodeRelay(r.relay_code) },
|
||||
{ key: 'ppvalue', title: '峰峰值(V)', render: r => r.data_source === 'B4' ? '-' : (r.ppvalue != null ? r.ppvalue.toFixed(2) : '-') },
|
||||
{ key: 'idle_freq', title: '开始频率', render: r => r.data_source === 'B4' ? '-' : (r.idle_freq || '-') },
|
||||
{ key: 'enter_freq', title: '进入频率', render: r => r.data_source === 'B4' ? '-' : (r.enter_freq || '-') },
|
||||
{ key: 'exit_freq', title: '离开频率', render: r => r.data_source === 'B4' ? '-' : (r.exit_freq || '-') },
|
||||
{ key: 'enter_dist', title: '进入高度/距离', render: r => {
|
||||
const v = r.data_source === 'B4' ? r.b4_enter_dist : r.enter_dist;
|
||||
return v != null ? v + ' mm' : '-';
|
||||
}},
|
||||
{ key: 'exit_dist', title: '离开高度/距离', render: r => {
|
||||
const v = r.data_source === 'B4' ? r.b4_leave_dist : r.exit_dist;
|
||||
return v != null ? v + ' mm' : '-';
|
||||
}},
|
||||
{ key: 'enter_speed', title: '进入速度', render: r => r.data_source === 'B4' ? '-' : toSpeed(r.enter_speed) },
|
||||
{ key: 'exit_speed', title: '离开速度', 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 + ' mm' : '-') },
|
||||
{ key: 'speed', title: '速度(dm/s)', render: r => r.data_source === 'B2' ? '-' : (r.speed ?? '-') },
|
||||
{ key: 'near_dist', title: '最近距离(mm)', render: r => r.data_source === 'B2' ? '-' : (r.near_dist != null ? r.near_dist + ' mm' : '-') },
|
||||
{ key: 'far_dist', title: '最远距离(mm)', render: r => r.data_source === 'B2' ? '-' : (r.far_dist != null ? r.far_dist + ' mm' : '-') },
|
||||
{ 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) },
|
||||
],
|
||||
},
|
||||
b2: {
|
||||
|
||||
Reference in New Issue
Block a user