Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r35468 -r35493 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 35468) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 35493) @@ -374,14 +374,6 @@ top: 0; z-index: -1; } - #setRSSI { - margin-left: 50px; - padding: 10px; - border-radius: 5px; - display: initial; - position: absolute; - top: 24px; - }
@@ -392,7 +384,7 @@ - + <%----%>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/setRSSI.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r35480 -r35493 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35480) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35493) @@ -6771,6 +6771,9 @@ } openPort(params, function (value, isData, errorStatus) { if (isData) { + if(typeof value == 'string' && value.indexOf('F') > 0){ + value = value.split('F')[0]; + } loadIdCardByBarcode(value, true, true); } else { showResult(value);