From 3fc96f06985fe61b51aa200a6821f795ee9671c0 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期三, 22 六月 2022 12:50:43 +0800
Subject: [PATCH] #
---
src/main/webapp/views/render.html | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/render.html b/src/main/webapp/views/render.html
index 36f5c3f..0fbbcab 100644
--- a/src/main/webapp/views/render.html
+++ b/src/main/webapp/views/render.html
@@ -584,17 +584,41 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(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 = ($('.item').eq(0).width() + 13) / 2;
+ var unit = 0;//($('.item').eq(0).width() + 13) / 2;
if (crns[i].bay < 0) {
- crns[i].bay = 0
+ crns[i].bay = 1
}
- crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
+ // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
+ // crns[i].bay = 1;
+
+ var offSet = 0;
+ switch (i) {
+ case 0:
+ unit = 34;
+ offSet = 260;
+ break;
+ case 1:
+ unit = 50;
+ offSet = 310;
+ break;
+ case 2:
+ unit = 17.2;
+ offSet = 315;
+ break;
+ }
+
+ if(crns[i].bay === 1){
+ crnEl.animate({left: offSet + 'px'}, 1000);
+ } else {
+ crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ }
+
}
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
@@ -651,7 +675,7 @@
// 鍫嗗灈鏈哄亸绉诲姩鐢�
function crnAnimate(id, leftVal) {
- console.log(crn1Position)
+ // console.log(crn1Position)
switch (id) {
case 1:
$("#crn-1").animate({left: leftVal + 'px'}, 1000);
--
Gitblit v1.9.1