From d8cc1b75c7590ea3a7e65f61c0f07b131fef0ca0 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 28 八月 2024 23:03:45 +0800
Subject: [PATCH] 配置
---
src/main/webapp/views/console.html | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fde6b24..efd3372 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -47,11 +47,11 @@
<span>鍫嗗灈鏈� 1</span>
<span class="state-ss machine-put-flag ">鍏ュ簱</span>
</div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
+<!-- <div class="state">-->
+<!-- <span>鍫嗗灈鏈� 2</span>-->
+<!-- <span class="state-ss machine-auto-flag ">鑷姩</span>-->
- </div>
+<!-- </div>-->
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
<span class="machine-put-flag">鍏ュ簱</span>
@@ -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) {
@@ -566,8 +567,10 @@
} 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,25 +596,29 @@
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;
+ case 3:
+ unit = 35;
+ offSet = 500;
+ break;
+ case 5:
+ unit = 124;
+ offSet = 550;
+ break;
+ case 4:
+ case 6:
+ unit = 62;
+ offSet = 550;
break;
}
@@ -706,23 +713,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 +753,8 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1