From fc9d08ef427c4fce72f469edbbb193c92249fd01 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期二, 27 六月 2023 18:43:10 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index cdaff40..fe997be 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++){
@@ -1077,6 +1075,7 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
+ getInStaBarcodeInfo(1);
}, 1000);
setInterval(function () {
getSitesInfo();
@@ -1208,6 +1207,25 @@
}
});
}
+ // 鍏ュ簱绔欐壂鐮佸櫒鏁版嵁瀹炴椂鑾峰彇
+ 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(){
--
Gitblit v1.9.1