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 | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 34a8653..d4641a7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -19,23 +19,31 @@
<!-- 绗�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-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: 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-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: 26px;">203</div>
+ <div id="site-203" class="site" style="height: 30px;line-height: 30px;margin-top: 96px;">203</div>
+ <div id="barcode-2" class="barcode"></div>
</div>
<!-- 绗�5鍒� -->
<div class="site-row site-row-5">
@@ -50,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>
@@ -949,19 +962,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 +983,6 @@
getCodeData();
renderBarCode();
}, 1000)
-
-
-
function renderBarCode() {
for (var i = 0;i<tData1.length;i++){
@@ -1175,9 +1184,6 @@
} else {
siteEl.html(sites[i].siteId);
}
- if (i+1===8) {
- carAnimate(i+1, Number(sites[i].nearbySta));
- }
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -1222,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