From 78b52c20a27a02466c8af9c0c8222b9f2f3ff20c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 18 一月 2024 19:59:47 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ea259e5..bce6404 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -344,7 +344,6 @@
url: baseUrl + '/console/barcode/output/site',
method: 'GET',
success: function (res) {
- console.log(res)
if (res.code === 200) {
tData = eval(res.data);
if (tData.length <= 5) {
@@ -562,6 +561,7 @@
for (var i = 0; i < sites.length; i++) {
var siteEl = $("#site-" + sites[i].siteId);
siteEl.attr("class", "site " + sites[i].siteStatus);
+ // siteEl.attr("class", "site site-auto-run-id");
if (sites[i].workNo != null && sites[i].workNo > 0) {
siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
} else {
@@ -569,6 +569,7 @@
}
if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+ console.log(sites[i].nearbySta);
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
@@ -592,6 +593,7 @@
if (res.code === 200) {
var crns = res.data;
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;
@@ -603,13 +605,13 @@
// crns[i].bay = 15;
var offSet = 0;
- unit = 60;
+ unit = 31;
offSet = 325;
-
-
if(crns[i].bay === 1){
+
crnEl.animate({left: offSet + 'px'}, 1000);
} else {
+
crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
}
@@ -633,7 +635,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";
@@ -698,23 +700,39 @@
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
+ // debugger
+ var targetTop = 0;
if (id === 16 || id === '16' || id === '016') {
switch (target) {
case 1:
- targetTop += 160;
+ targetTop += 619;
break;
case 2:
- targetTop += 140;
+ targetTop += 571;
break;
case 3:
- targetTop += 80;
+ targetTop += 505;
break;
case 4:
- targetTop += 40;
+ targetTop += 457;
+ break;
+ case 5:
+ targetTop += 391;
+ break;
+ case 6:
+ targetTop += 344;
break;
case 7:
- targetTop += 0;
+ targetTop += 278;
+ break;
+ case 8:
+ targetTop += 228;
+ break;
+ case 9:
+ targetTop += 183;
+ break;
+ case 10:
+ targetTop += 95;
break;
default:
return;
@@ -722,7 +740,8 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1