Henry_Du/FSE-Ticket.sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(web): 修复设备ID获取不全与空值处理不完善的问题

Browse Source 
补充从ev.detail中提取设备ID的逻辑，同时新增对空字符串和'---'格式设备ID的统一处理
This commit is contained in:
Henry_Du
2026-07-10 13:37:56 +08:00
parent 8435717a58
commit f65e043130
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/ic-card-admin.js
+2 -2
View File
@@ -191,14 +191,14 @@
const formatIcCardEventUnified = (ev) => { const formatIcCardEventUnified = (ev) => {
const type = String(ev?.type || '').toLowerCase(); const type = String(ev?.type || '').toLowerCase();
const action = String(ev?.action || '').toLowerCase(); const action = String(ev?.action || '').toLowerCase();
let deviceId = String(ev?.device || ev?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim(); let deviceId = String(ev?.device || ev?.device_id || ev?.detail?.device || ev?.detail?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim();
const dStr = deviceId.toLowerCase(); const dStr = deviceId.toLowerCase();
if (dStr === 'gate') { if (dStr === 'gate') {
deviceId = '闸机'; deviceId = '闸机';
} else if (dStr === 'refill_machine') { } else if (dStr === 'refill_machine') {
deviceId = '充值机'; deviceId = '充值机';
} else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown' || dStr === '---' || dStr === '') {
if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') {
deviceId = '闸机'; deviceId = '闸机';
} else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') {
web/ic-card-search.js
+2 -2
View File
@@ -90,14 +90,14 @@
const formatIcCardEventUnified = (ev) => { const formatIcCardEventUnified = (ev) => {
const type = String(ev?.type || '').toLowerCase(); const type = String(ev?.type || '').toLowerCase();
const action = String(ev?.action || '').toLowerCase(); const action = String(ev?.action || '').toLowerCase();
let deviceId = String(ev?.device || ev?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim(); let deviceId = String(ev?.device || ev?.device_id || ev?.detail?.device || ev?.detail?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim();
const dStr = deviceId.toLowerCase(); const dStr = deviceId.toLowerCase();
if (dStr === 'gate') { if (dStr === 'gate') {
deviceId = '闸机'; deviceId = '闸机';
} else if (dStr === 'refill_machine') { } else if (dStr === 'refill_machine') {
deviceId = '充值机'; deviceId = '充值机';
} else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown' || dStr === '---' || dStr === '') {
if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') {
deviceId = '闸机'; deviceId = '闸机';
} else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') {
web/index.js
+4 -4
View File
@@ -348,14 +348,14 @@ createApp({
const formatTicketEventUnified = (ev) => { const formatTicketEventUnified = (ev) => {
const type = getTicketEventType(ev); const type = getTicketEventType(ev);
const action = getTicketEventAction(ev); const action = getTicketEventAction(ev);
let deviceId = String(ev?.device || ev?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim(); let deviceId = String(ev?.device || ev?.device_id || ev?.detail?.device || ev?.detail?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim();
const dStr = deviceId.toLowerCase(); const dStr = deviceId.toLowerCase();
if (dStr === 'gate') { if (dStr === 'gate') {
deviceId = '闸机'; deviceId = '闸机';
} else if (dStr === 'refill_machine') { } else if (dStr === 'refill_machine') {
deviceId = '充值机'; deviceId = '充值机';
} else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown' || dStr === '---' || dStr === '') {
if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') {
deviceId = '闸机'; deviceId = '闸机';
} else { } else {
@@ -464,14 +464,14 @@ createApp({
const formatIcEventDetail = (ev) => { const formatIcEventDetail = (ev) => {
const type = String(ev?.type || '').toLowerCase(); const type = String(ev?.type || '').toLowerCase();
const action = String(ev?.action || '').toLowerCase(); const action = String(ev?.action || '').toLowerCase();
let deviceId = String(ev?.device || ev?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim(); let deviceId = String(ev?.device || ev?.device_id || ev?.detail?.device || ev?.detail?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim();
const dStr = deviceId.toLowerCase(); const dStr = deviceId.toLowerCase();
if (dStr === 'gate') { if (dStr === 'gate') {
deviceId = '闸机'; deviceId = '闸机';
} else if (dStr === 'refill_machine') { } else if (dStr === 'refill_machine') {
deviceId = '充值机'; deviceId = '充值机';
} else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown' || dStr === '---' || dStr === '') {
if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') {
deviceId = '闸机'; deviceId = '闸机';
} else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') {
web/ticket-board.html
+2 -2
View File
@@ -320,14 +320,14 @@
} }
const stationEn = event.station_en || event['站点英文'] || ''; const stationEn = event.station_en || event['站点英文'] || '';
let deviceId = String(event.device || event.device_id || event['设备编号'] || event['机器ID'] || '').trim(); let deviceId = String(event.device || event.device_id || event.detail?.device || event.detail?.device_id || event['设备编号'] || event['机器ID'] || '').trim();
const dStr = deviceId.toLowerCase(); const dStr = deviceId.toLowerCase();
if (dStr === 'gate') { if (dStr === 'gate') {
deviceId = '闸机'; deviceId = '闸机';
} else if (dStr === 'refill_machine') { } else if (dStr === 'refill_machine') {
deviceId = '充值机'; deviceId = '充值机';
} else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown' || dStr === '---' || dStr === '') {
if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') {
deviceId = '闸机'; deviceId = '闸机';
} else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') {
web/ticket-route.js
+2 -2
View File
@@ -228,14 +228,14 @@ createApp({
const formatTicketEventUnified = (ev) => { const formatTicketEventUnified = (ev) => {
const type = getTicketEventType(ev); const type = getTicketEventType(ev);
const action = getTicketEventAction(ev); const action = getTicketEventAction(ev);
let deviceId = String(ev?.device || ev?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim(); let deviceId = String(ev?.device || ev?.device_id || ev?.detail?.device || ev?.detail?.device_id || ev?.["设备编号"] || ev?.["机器ID"] || '---').trim();
const dStr = deviceId.toLowerCase(); const dStr = deviceId.toLowerCase();
if (dStr === 'gate') { if (dStr === 'gate') {
deviceId = '闸机'; deviceId = '闸机';
} else if (dStr === 'refill_machine') { } else if (dStr === 'refill_machine') {
deviceId = '充值机'; deviceId = '充值机';
} else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown' || dStr === '---' || dStr === '') {
if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') {
deviceId = '闸机'; deviceId = '闸机';
} else { } else {
web/ticket-search.js
+2 -2
View File
@@ -110,14 +110,14 @@
const formatTicketEventUnified = (ev) => { const formatTicketEventUnified = (ev) => {
const type = getEventType(ev); const type = getEventType(ev);
const action = String(ev.action || ev["动作"] || '').toLowerCase(); const action = String(ev.action || ev["动作"] || '').toLowerCase();
let deviceId = String(ev.device || ev.device_id || ev["设备编号"] || ev["机器ID"] || '---').trim(); let deviceId = String(ev.device || ev.device_id || ev.detail?.device || ev.detail?.device_id || ev["设备编号"] || ev["机器ID"] || '---').trim();
const dStr = deviceId.toLowerCase(); const dStr = deviceId.toLowerCase();
if (dStr === 'gate') { if (dStr === 'gate') {
deviceId = '闸机'; deviceId = '闸机';
} else if (dStr === 'refill_machine') { } else if (dStr === 'refill_machine') {
deviceId = '充值机'; deviceId = '充值机';
} else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown' || dStr === '---' || dStr === '') {
if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') {
deviceId = '闸机'; deviceId = '闸机';
} else { } else {