From 196f9b62a04204e7c05da99b53ab9f36d2d7a029 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 17 十一月 2023 10:38:53 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ea259e5..afb3310 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) {
@@ -569,6 +568,7 @@
}
if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
@@ -588,27 +588,30 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- // console.log(res)
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;
-
+ var unit = 0;
if (crns[i].bay < 0 || crns[i].bay === -2) {
crns[i].bay = 1
}
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
var offSet = 0;
- unit = 60;
- offSet = 325;
+ unit = -28.5;
+ offSet = 1552;
if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
+ if (i == 1) {
+ if (crns[i].bay < 27) {
+ crnEl.animate()
+ }
+ } else {
+ crnEl.animate({left: offSet + 'px'}, 1000);
+ }
+
} else {
crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
}
@@ -633,7 +636,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 +701,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 += 827;
break;
case 2:
- targetTop += 140;
+ targetTop += 765;
break;
case 3:
- targetTop += 80;
+ targetTop += 651;
break;
case 4:
- targetTop += 40;
+ targetTop += 589;
+ break;
+ case 5:
+ targetTop += 505;
+ break;
+ case 6:
+ targetTop += 443;
break;
case 7:
- targetTop += 0;
+ targetTop += 362;
+ break;
+ case 8:
+ targetTop += 297;
+ break;
+ case 9:
+ targetTop += 243;
+ break;
+ case 10:
+ targetTop += 129;
break;
default:
return;
@@ -722,7 +741,8 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1