From aa5d5e8ae27df5d0818a2d09abc53abe5e823a21 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 十二月 2021 10:34:22 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 3e3c4ee..9db1faf 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -80,14 +80,13 @@
<!-- 鍏ュ簱鍙� -->
<div class="cargo-put-0"></div>
<div class="cargo-put-1"></div>
- <div class="cargo-put-2"></div>
<!-- 鎵爜鍣� -->
<div id="code-decoder-1" class="code-decoder">
<span id="code-decoder-data-1" class="code-decoder-data">0</span>
</div>
- <!-- 鎵爜鍣� -->
- <div id="code-decoder-2" class="code-decoder">
- <span id="code-decoder-data-2" class="code-decoder-data">0</span>
+ <!-- 纾呯Г -->
+ <div class="scale" id="scale-1">
+ <button id="scale-data-1">纾呯Г</button>
</div>
@@ -124,6 +123,7 @@
<!-- 绗�3鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-3">
+ <div id="site-129" class="site" style="height: 20px;line-height: 20px;width: 80px">129</div>
<div id="site-101" class="site" style="height: 20px;line-height: 20px">101</div>
<div id="site-125" class="site" style="height: 20px;line-height: 20px;width: 80px">125</div>
<div id="site-123" class="site" style="height: 20px;line-height: 20px">123</div>
@@ -145,6 +145,19 @@
<div class="site-row site-row-5">
<div id="site-201" class="site" style="height: 20px;line-height: 20px;margin-bottom: 85px">201</div>
<div id="site-204" class="site" style="height: 20px;line-height: 20px;">204</div>
+ </div>
+
+ <!-- 绗�6鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-6">
+ <div id="site-305" class="site" style="height: 20px;line-height: 20px;">305</div>
+ <div id="site-308" class="site" style="height: 21px;line-height: 21px;">308</div>
+ <div id="site-304" class="site" style="height: 20px;line-height: 20px;">304</div>
+ <div id="site-303" class="site" style="height: 44px;line-height: 44px;">303</div>
+ <div id="site-302" class="site" style="height: 20px;line-height: 20px;">302</div>
+ <div id="site-307" class="site" style="height: 21px;line-height: 21px;">307</div>
+ <div id="site-301" class="site" style="height: 20px;line-height: 20px;">301</div>
+ <div id="site-306" class="site" style="height: 20px;line-height: 20px;">306</div>
+ <div id="site-300" class="site" style="height: 20px;line-height: 20px;">300</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
@@ -528,11 +541,13 @@
getCrnInfo();
getSystemRunningStatus();
getBarcodeInfo();
+ getScaleInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
getSystemRunningStatus();
- getBarcodeInfo()
+ getBarcodeInfo();
+ getScaleInfo();
}, 1000);
setInterval(function () {
getSitesInfo();
@@ -657,7 +672,7 @@
var crnEl = $("#crn-"+crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
var unit = ($('.item').eq(0).width()+4)/2;
- crnEl.animate({left: (crns[i].bay * unit) +'px'}, 1000);
+ crnEl.animate({left: (crns[i].bay * unit + 25) +'px'}, 1000);
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -689,6 +704,29 @@
});
}
+ // 纾呯Г瀹炴椂鏁版嵁鑾峰彇
+ function getScaleInfo(){
+ $.ajax({
+ url: baseUrl+ "/console/latest/data/scale",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+
+ if (res.code === 200){
+ var sclaes = res.data;
+ for (var i = 0; i < sclaes.length; i++){
+ console.log(sclaes[i].scaleId + ":" + sclaes[i].value)
+ $("#scale-data-"+sclaes[i].scaleId).text(sclaes[i].value);
+ }
+ } else if (res.code === 403){
+ parent.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
// 鍫嗗灈鏈哄亸绉诲姩鐢�
function crnAnimate(id, leftVal) {
switch (id) {
--
Gitblit v1.9.1