From 624b93640b504a33837fddb3fb9ef1ebb510f20c Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 15 四月 2025 20:02:40 +0800
Subject: [PATCH] 12
---
src/main/webapp/views/console.html | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fe997be..d4641a7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -22,6 +22,12 @@
<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-112">
+ <div id="site-114" class="site" style="height: 30px;line-height: 30px;">114</div>
+ <div id="site-113" class="site" style="height: 30px;line-height: 30px;">113</div>
+ <div id="site-112" class="site" style="height: 30px;line-height: 30px;">112</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: 94px;line-height: 94px;">300</div>
@@ -34,10 +40,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">
@@ -52,6 +58,11 @@
<div id="site-207" class="site" style="height: 32px;line-height: 32px;">207</div>
</div>
<!-- 绗�6鍒� -->
+ <div class="site-row site-row-212">
+ <div id="site-212" class="site" style="height: 30px;line-height: 30px;">212</div>
+ <div id="site-213" class="site" style="height: 30px;line-height: 30px;">213</div>
+ <div id="site-214" class="site" style="height: 30px;line-height: 30px;">214</div>
+ </div>
<div class="site-row site-row-6">
<div id="site-108" class="site" style="height: 36px;line-height: 36px;">108</div>
<div id="site-109" class="site" style="height: 36px;line-height: 36px;">109</div>
@@ -1075,7 +1086,6 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
- getInStaBarcodeInfo(1);
}, 1000);
setInterval(function () {
getSitesInfo();
@@ -1207,25 +1217,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 +1228,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