From f74f237e0179086fb19d08e80c31847ebc33f235 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 13 六月 2022 15:22:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 5 +++++
src/main/webapp/views/render.html | 13 +++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index fdeb421..e0aba4d 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -159,6 +159,11 @@
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
if (siteId.equals(entry.getKey())) {
StaProtocol staProtocol = entry.getValue();
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
if (workNo != null) {
staProtocol.setWorkNo(workNo);
}
diff --git a/src/main/webapp/views/render.html b/src/main/webapp/views/render.html
index 490bd08..67129f0 100644
--- a/src/main/webapp/views/render.html
+++ b/src/main/webapp/views/render.html
@@ -590,18 +590,19 @@
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 = 17;//($('.item').eq(0).width() + 13) / 2;
if (crns[i].bay < 0) {
crns[i].bay = 0
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // debugger
- crns[i].bay = 21;
- unit = 34;
- crnEl.animate({left: ((crns[i].bay * unit)+225) + 'px'}, 1000);
- switch(i){
+ // crns[i].bay = 52;
+ if(crns[i].bay === 1){
+ crnEl.animate({left: 1150 + 'px'}, 1000);
+ } else {
+ crnEl.animate({left: (1150 - (crns[i].bay * unit)) + 'px'}, 1000);
}
+
}
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
--
Gitblit v1.9.1