From c4b2cfbdc4b31a6e37a9b51c5f69620bd5e7841f Mon Sep 17 00:00:00 2001 From: pjb <pjb123456> Date: 星期六, 23 八月 2025 08:38:58 +0800 Subject: [PATCH] wcs功能完善 --- src/main/webapp/views/console.html | 52 +++++++++++++++++++--------------------------------- 1 files changed, 19 insertions(+), 33 deletions(-) diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index 91ea99a..0493976 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -20,9 +20,9 @@ <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1> <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6> </div> - <div class="head-right"> - <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80"> - </div> +<!-- <div class="head-right">--> +<!-- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">--> +<!-- </div>--> </div> <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 --> <div class="main-part"> @@ -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