From 398a0ea330d94bc4df491dd43d7a98662c6a5157 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 06 三月 2023 14:26:23 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 96 +++++++++++++++++++++++++++---------------------
1 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 60fd15b..2bb3074 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -80,28 +80,28 @@
</div>
</div>
<div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
+ <div class="body-head" id="code">纾呯Г</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>纾呯Г缂栧彿-纾呯Г閲嶉噺</span><span class="right">绉伴噸鏃堕棿</span></li>
</div>
- <div id="barcode1" class="table-body">
+ <div id="scale1" class="table-body">
</div>
</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>纾呯Г缂栧彿-纾呯Г閲嶉噺</span><span class="right">绉伴噸鏃堕棿</span></li>
</div>
- <div id="barcode2" class="table-body">
+ <div id="scale2" class="table-body">
</div>
</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>纾呯Г缂栧彿-纾呯Г閲嶉噺</span><span class="right">绉伴噸鏃堕棿</span></li>
</div>
- <div id="barcode3" class="table-body">
+ <div id="scale3" class="table-body">
</div>
</div>
@@ -344,7 +344,7 @@
url: baseUrl + '/console/barcode/output/site',
method: 'GET',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200) {
tData = eval(res.data);
if (tData.length <= 5) {
@@ -370,16 +370,16 @@
}
function renderBarCode() {
for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#barcode1').append(str1)
+ var str1 = '<li><span>' + tData1[i].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData1[i].time + '</span></li>'
+ $('#scale1').append(str1)
}
for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#barcode2').append(str2)
+ var str2 = '<li><span>' + tData2[j].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData2[j].time + '</span></li>'
+ $('#scale2').append(str2)
}
for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#barcode3').append(str3)
+ var str3 = '<li><span>' + tData3[k].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData3[k].time + '</span></li>'
+ $('#scale3').append(str3)
}
}
</script>
@@ -552,6 +552,7 @@
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
function getSitesInfo() {
+ // carAnimate(112,4);
$.ajax({
url: baseUrl + "/console/latest/data/site",
headers: {'token': localStorage.getItem('token')},
@@ -567,8 +568,9 @@
} else {
siteEl.html(sites[i].siteId);
}
- if (i + 1 === 8) {
- carAnimate(i + 1, Number(sites[i].nearbySta));
+ // RGV浣嶇疆
+ if(sites[i].siteId === '112' || sites[i].siteId === '212'){
+ carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
} else if (res.code === 403) {
@@ -593,29 +595,15 @@
for (var i = 0; i < crns.length; i++) {
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
+ var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
if (crns[i].bay < 0) {
- crns[i].bay = 1
+ crns[i].bay = 1;
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
// crns[i].bay = 1;
- var offSet = 0;
- switch (i) {
- case 0:
- unit = 34;
- offSet = 337;
- break;
- case 1:
- unit = 68;
- offSet = 337;
- break;
- case 2:
- unit = 17;
- offSet = 337;
- break;
- }
-
+ var offSet = 390;
+ // crns[i].bay = 41;
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
} else {
@@ -707,23 +695,47 @@
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
- if (id === 8) {
+ var targetTop = 0;
+ if (id === 112) {
switch (target) {
case 1:
- targetTop += 160;
+ targetTop += 313;
break;
case 2:
- targetTop += 140;
+ targetTop += 313;
break;
case 3:
- targetTop += 80;
+ targetTop += 256;
break;
case 4:
- targetTop += 40;
+ targetTop += 226;
break;
- case 7:
- targetTop += 0;
+ case 5:
+ targetTop += 168;
+ case 6:
+ targetTop += 168;
+ break;
+ default:
+ return;
+ }
+ } else if (id === 212) {
+ switch (target) {
+ case 1:
+ targetTop += 313;
+ break;
+ case 2:
+ targetTop += 313;
+ break;
+ case 3:
+ targetTop += 256;
+ break;
+ case 4:
+ targetTop += 226;
+ break;
+ case 5:
+ targetTop += 168;
+ case 6:
+ targetTop += 168;
break;
default:
return;
--
Gitblit v1.9.1