Index: ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js =================================================================== diff -u -r34765 -r35330 --- ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js (.../setPlugInRFID.js) (revision 34765) +++ ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js (.../setPlugInRFID.js) (revision 35330) @@ -83,35 +83,35 @@ var ports = await navigator.serial.getPorts(); if (ports.length == 1) { var { usbProductId, usbVendorId } = ports[0].getInfo(); - if(usbProductId && usbVendorId){ + if (usbProductId && usbVendorId) { if (filters[0].usbProductId == usbProductId && filters[0].usbVendorId == usbVendorId) { port = ports[0]; } - }else { - if(isRecyleForTouchScreen){ + } else { + if (isRecyleForTouchScreen) { port = ports[0]; usbVendorId = 4292; - usbProductId = 60000; + usbProductId = 60000; } } if (!port) { callback(msg1, false, 'msg1'); return; } } else if (ports.length > 1) { - if(usbProductId && usbVendorId){ + if (usbProductId && usbVendorId) { for (var i = 0; i < ports.length; i++) { var { usbProductId, usbVendorId } = ports[i].getInfo(); if (filters[0].usbProductId == usbProductId && filters[0].usbVendorId == usbVendorId) { port = ports[i]; break; } } - }else { - if(isRecyleForTouchScreen){ + } else { + if (isRecyleForTouchScreen) { port = ports[0]; usbVendorId = 4292; - usbProductId = 60000; + usbProductId = 60000; } } if (!port) { @@ -121,13 +121,13 @@ } else { port = await navigator.serial.requestPort(); var { usbProductId, usbVendorId } = port.getInfo(); - if(usbProductId && usbVendorId){ + if (usbProductId && usbVendorId) { usbVendorId = usbVendorId; usbProductId = usbProductId; - }else { - if(isRecyleForTouchScreen){ + } else { + if (isRecyleForTouchScreen) { usbVendorId = 4292; - usbProductId = 60000; + usbProductId = 60000; } } } @@ -176,10 +176,10 @@ if (usbVendorId == 6790 && usbProductId == 29987) {//桌面式 F5005-H if (value.length > 20) { for (var i = 0; i < value.length; i++) { - if(value[i] > 9){ + if (value[i] > 9) { dataString += value[i].toString(16) - }else { - dataString += '0'+value[i].toString(16) + } else { + dataString += '0' + value[i].toString(16) } } } else { @@ -269,7 +269,7 @@ var uid = arr[0].split('R')[1]; var userId = arr[1]; userId = hextoString(userId); - if(uid){ + if (uid) { callback(uid + ',' + userId, true); } } else { @@ -441,7 +441,7 @@ } } -async function writeRFID(barcode,uid) { +async function writeRFID(barcode, uid) { if (!isStop) { showResult('请先停止读取标签!'); return; @@ -451,10 +451,10 @@ return; } var filterArr = []; - for(var i=0;i