From 351d35f5f96417e84d403aa0c4f0425265a11216 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期二, 27 六月 2023 19:21:14 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 6 +++---
src/main/webapp/static/css/console.css | 13 ++++++++++++-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index e118d76..a9548f8 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -40,6 +40,17 @@
position: absolute;
bottom: 3.2%;
}
+.barcode {
+ color: #a19c9c;
+ height: 20px;
+ line-height: 20px;;
+ border: 1px solid rgb(108,167,168);
+ cursor: pointer;
+ width: 70px;
+ text-align: center;
+ background-color: rgb(157, 217, 162);
+ font-size: 10px;
+}
/*=============== SCROLL BAR ===============*/
::-webkit-scrollbar {
@@ -314,7 +325,7 @@
width: 80px;
}
.site-row-4 {
- top: 289px;
+ top: 267px;
left: 653px;
}
.site-row-4 .site {
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e021e97..64c33b1 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">
@@ -1218,7 +1218,7 @@
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