From 501f9853ce8d62d0d47e38c93dfab3e53a75f4f6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 24 十月 2022 18:59:25 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fde6b24..bc675bd 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -344,6 +344,7 @@
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) {
@@ -551,6 +552,7 @@
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
function getSitesInfo() {
+ // carAnimate(112,4);
$.ajax({
url: baseUrl + "/console/latest/data/site",
headers: {'token': localStorage.getItem('token')},
@@ -566,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) {
@@ -592,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 {
@@ -706,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