From 932b89aff065d3e7a6da133f5f70d828e7e14c0f Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期五, 04 七月 2025 18:08:32 +0800
Subject: [PATCH] 自动补空桶-判断没在罐装线里空桶数量

---
 src/main/webapp/views/console.html |   46 ++++++++++++++++------------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index d0314a4..0493976 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -595,39 +595,25 @@
                     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;
-
-                        if (crns[i].bay < 0 || crns[i].bay === -2) {
-                            crns[i].bay = 1
+                        if (crns[i].bay < 0) {
+                            crns[i].bay = 1;
                         }
-                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
-                        // crns[i].bay = 15;
-                        var offSet = 0;
-                        switch (i) {
-                            case 0:
-                            case 1:
-                            case 2:
-                            case 3:
-                                unit = 35;
-                                offSet = 500;
-                                break;
-                            case 5:
-                                unit = 124;
-                                offSet = 550;
-                                break;
-                            case 4:
-                            case 6:
-                                unit = 62;
-                                offSet = 550;
-                                break;
-                        }
-
-                        if(crns[i].bay === 1){
-                            crnEl.animate({left: offSet + 'px'}, 1000);
+                        let unit = 20
+                        if (crns[i].crnId === 4) {
+                            let offSet = 960;
+                            if(crns[i].bay === 1){
+                                crnEl.animate({left: offSet + 'px'}, 1000);
+                            } else {
+                                crnEl.animate({left: (offSet + unit*(crns[i].bay-1)) + 'px'}, 1000);
+                            }
                         } else {
-                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+                            let offSet = 450;
+                            if(crns[i].bay === 1){
+                                crnEl.animate({left: offSet + 'px'}, 1000);
+                            } else {
+                                crnEl.animate({left: (offSet + unit*(crns[i].bay -1)) + 'px'}, 1000);
+                            }
                         }
-
                     }
                 } else if (res.code === 403) {
                     parent.location.href = baseUrl + "/login";

--
Gitblit v1.9.1