From 61d02c1796f3bedc6650e29cc33d9ee85e3a78fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 19 六月 2023 08:07:17 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fde6b24..7ad3bef 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -515,8 +515,8 @@
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
} else {
+ alert(res.msg);
console.log(res.msg);
-
}
}
});
@@ -560,14 +560,18 @@
var sites = res.data;
for (var i = 0; i < sites.length; i++) {
var siteEl = $("#site-" + sites[i].siteId);
+ console.log(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 {
siteEl.html(sites[i].siteId);
}
- if (i + 1 === 8) {
- carAnimate(i + 1, Number(sites[i].nearbySta));
+
+ if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+
+ carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
} else if (res.code === 403) {
@@ -593,27 +597,17 @@
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
var unit = 0;//($('.item').eq(0).width() + 13) / 2;
- if (crns[i].bay < 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 = 1;
+ // crns[i].bay = 15;
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;
- }
+ unit = 60;
+ offSet = 325;
+
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
@@ -706,23 +700,39 @@
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
- if (id === 8) {
+ // 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;
@@ -730,7 +740,8 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1