From 85d6c6994b7e76833656328d9d7c4e7d8c85d662 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 27 六月 2023 19:01:33 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index cdaff40..e021e97 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -19,23 +19,25 @@
<!-- 绗�1鍒� -->
<div class="site-row site-row-1">
<div id="site-100" class="site" style="height: 36px;line-height: 36px;">100</div>
- <div id="site-200" class="site" style="height: 30px;line-height: 30px;margin-top: 26px;">200</div>
+ <div id="site-200" class="site" style="height: 30px;line-height: 30px;margin-top: 95px;">200</div>
</div>
<!-- 绗�2鍒�-->
<div class="site-row site-row-2">
<div id="site-101" class="site" style="height: 36px;line-height: 36px;">101</div>
- <div id="site-300" class="site" style="height: 24px;line-height: 24px;">300</div>
+ <div id="site-300" class="site" style="height: 94px;line-height: 94px;">300</div>
<div id="site-201" class="site" style="height: 30px;line-height: 30px;">201</div>
</div>
<!-- 绗�3鍒� -->
<div class="site-row site-row-3">
<div id="site-102" class="site" style="height: 36px;line-height: 36px;">102</div>
- <div id="site-202" class="site" style="height: 30px;line-height: 30px;margin-top: 26px;">202</div>
+ <div id="site-202" class="site" style="height: 30px;line-height: 30px;margin-top: 96px;">202</div>
</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="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: 26px;">203</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>
<!-- 绗�5鍒� -->
<div class="site-row site-row-5">
@@ -949,19 +951,18 @@
tData1 = tData
} else if (tData.length<=10){
tData1 = tData.slice(0,5)
- tData.splice(0,5)
- tData2 = tData
+ tData2 = tData.splice(5,10)
+ // tData2 = tData
} else if(tData.length<=15){
tData1 = tData.slice(0,5)
- tData2 = tData.slice(6,10)
- tData.splice(0,10)
- tData3 = tData
+ tData2 = tData.slice(5,10)
+ // tData.splice(0,10)
+ tData3 = tData.slice(10,15)
} else {
- tData = tData.slice(-15)
- tData1 = tData.slice(-15)
- tData2 = tData.slice(-10)
- tData3 = tData.slice(-5)
-
+ // tData = tData.slice(-15)
+ tData1 = tData.slice(0,5)
+ tData2 = tData.slice(5,10)
+ tData3 = tData.slice(10,15)
}
}
}
@@ -971,9 +972,6 @@
getCodeData();
renderBarCode();
}, 1000)
-
-
-
function renderBarCode() {
for (var i = 0;i<tData1.length;i++){
@@ -1217,6 +1215,7 @@
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);
--
Gitblit v1.9.1