From f0cbc07048011f4c47aa7e26119af1b975d3b536 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期六, 03 十二月 2022 12:45:13 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ea259e5..7b3b178 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) {
@@ -516,8 +515,8 @@
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
} else {
+ alert(res.msg);
console.log(res.msg);
-
}
}
});
@@ -557,11 +556,14 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
+ console.log(res);
if (res.code === 200) {
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 {
@@ -569,6 +571,7 @@
}
if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
@@ -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