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 | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e021e97..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">
@@ -1215,10 +1215,9 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
- console.log(res)
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