From bfc97f036688f34e7c1451d68e3f6fc242f99929 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 12 五月 2023 16:07:46 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |   48 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ea259e5..8d69b6c 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -344,7 +344,6 @@
             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) {
@@ -569,6 +568,7 @@
                         }
 
                         if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+
                             carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                         }
                     }
@@ -603,15 +603,16 @@
                         // crns[i].bay = 15;
 
                         var offSet = 0;
-                        unit = 60;
-                        offSet = 325;
+                        unit = -28.5;
+                        offSet = 1710; //145
 
 
-                        if(crns[i].bay === 1){
-                            crnEl.animate({left: offSet + 'px'}, 1000);
-                        } else {
-                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
-                        }
+                        crnEl.animate({left: offSet + 'px'}, 1000);
+                        // 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) {
@@ -698,23 +699,39 @@
 
     // 灏忚溅鍋忕Щ鍔ㄧ敾
     function carAnimate(id, target) {
-        var targetTop = 122;
+        // 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;
@@ -722,7 +739,8 @@
         } else {
             return;
         }
-        $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+        $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
     }
 
 

--
Gitblit v1.9.1