From 08c2e06c7d1cc0c58667f28c18fe4931fc3ec755 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 09 三月 2022 16:49:51 +0800
Subject: [PATCH] # ycq 条码显示
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 3 +++
src/main/webapp/views/console.html | 5 -----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index ca2783d..d82420a 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -51,6 +51,9 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
jsonObject.put("barcode", barcode);
+ if (OutputQueue.BARCODE.size() >= 32) {
+ OutputQueue.BARCODE.poll();
+ }
OutputQueue.BARCODE.offer(jsonObject);
}
}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 13a1c34..a1d0f1f 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -1230,20 +1230,17 @@
success:function (res) {
if(res.code === 200){
tData = eval(res.data);
- console.log(tData)
if(tData.length<=5){
tData1 = tData
} else if (tData.length<=10){
tData1 = tData.slice(0,5)
tData.splice(0,5)
tData2 = tData
- console.log(tData2)
} else if(tData.length<=15){
tData1 = tData.slice(0,5)
tData2 = tData.slice(6,10)
tData.splice(0,10)
tData3 = tData
- console.log(tData3)
} else {
tData = tData.slice(-15)
tData1 = tData.slice(-15)
@@ -1265,7 +1262,6 @@
function renderBarCode() {
for (var i = 0;i<tData1.length;i++){
- console.log(tData1[i])
var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
$('#barcode1').append(str1)
}
@@ -1399,7 +1395,6 @@
},
method: 'POST',
success: function (res) {
- console.log(res)
layer.close(index);
if (res.code === 200){
if (res.data.status) {
--
Gitblit v1.9.1