From f107eaf4d1857d2230a5bc6983e4beb7fb811aa1 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期六, 08 七月 2023 22:06:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs6' into bfwcs6
---
src/main/webapp/views/console.html | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fe997be..e3de3f4 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -34,10 +34,10 @@
</div>
<!-- 绗�4鍒� -->
<div class="site-row site-row-4">
-<!-- <div id="barcode-103" class="barcode" style="height: 36px;line-height: 36px;">80004175</div>-->
+ <div id="barcode-1" class="barcode"></div>
<div id="site-103" class="site" style="height: 36px;line-height: 36px;">103</div>
<div id="site-203" class="site" style="height: 30px;line-height: 30px;margin-top: 96px;">203</div>
-<!-- <div id="barcode-203" class="barcode" style="height: 30px;line-height: 30px;margin-top: 96px;">80003736</div>-->
+ <div id="barcode-2" class="barcode"></div>
</div>
<!-- 绗�5鍒� -->
<div class="site-row site-row-5">
@@ -1075,7 +1075,6 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
- getInStaBarcodeInfo(1);
}, 1000);
setInterval(function () {
getSitesInfo();
@@ -1207,25 +1206,6 @@
}
});
}
- // 鍏ュ簱绔欐壂鐮佸櫒鏁版嵁瀹炴椂鑾峰彇
- function getInStaBarcodeInfo(barcodeId) {
- $.ajax({
- url: baseUrl + "/latest/inSta/data/barcode",
- data: {barcodeId:barcodeId},
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- console.log(res)
- if (res.code === 200){
-
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- console.log(res.msg);
- }
- }
- })
- }
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
function getBarcodeInfo(){
@@ -1237,7 +1217,7 @@
if (res.code === 200){
var barcodes = res.data;
for (var i = 0; i < barcodes.length; i++){
- $("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
+ $("#barcode-"+barcodes[i].barcodeId).html(barcodes[i].codeValue ? barcodes[i].codeValue : "--");
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
--
Gitblit v1.9.1