From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/realtimeWatch/console.html | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/realtimeWatch/console.html b/src/main/webapp/views/realtimeWatch/console.html
index fbbfd6a..c67cea4 100644
--- a/src/main/webapp/views/realtimeWatch/console.html
+++ b/src/main/webapp/views/realtimeWatch/console.html
@@ -12,9 +12,9 @@
<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
<!--鍦板浘json-->
- <script src="../../static/wcs/js/console.map.js"></script>
- <script src="../../static/wcs/js/console.js"></script>
- <script src="../../static/wcs/js/common.js"></script>
+ <script src="../../static/wcs/js/console.map.js?v=1"></script>
+ <script src="../../static/wcs/js/console.js?v=1"></script>
+ <script src="../../static/wcs/js/common.js?v=1"></script>
</head>
<script type="text/html" id="errorTpl">
{{# if( d.error === false ){ }}
@@ -635,19 +635,25 @@
for (var i = 0; i < crns.length; i++) {
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
if (crns[i].bay < 0) {
crns[i].bay = 1;
}
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 1;
-
- var offSet = 390;
- // crns[i].bay = 41;
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
+ if (crns[i].crnId === 1) {
+ let unit = 111
+ let offSet = 600;
+ 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 unit = 83
+ let offSet = 600;
+ if(crns[i].bay === 1){
+ crnEl.animate({left: offSet + 'px'}, 1000);
+ } else {
+ crnEl.animate({left: (offSet + unit*(crns[i].bay -1)) + 'px'}, 1000);
+ }
}
}
--
Gitblit v1.9.1