From c59bcfa4429a5d67842ebaa492db1fa11a3e97fc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 10 七月 2025 09:21:25 +0800
Subject: [PATCH] 输送线异常提示
---
src/main/webapp/views/realtimeWatch/console.html | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/realtimeWatch/console.html b/src/main/webapp/views/realtimeWatch/console.html
index fbbfd6a..c3cb408 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 ){ }}
@@ -90,6 +90,7 @@
<span class="site-auto-id">鑷姩+ID</span>
<span class="site-auto">鑷姩</span>
<span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+ <span class="site-error">寮傚父</span>
</div>
</div>
<div class="bar-code">
@@ -341,6 +342,15 @@
</div>
<div class="form-item-input">
<input type="text" name="locNo" value="">
+ </div>
+ </div>
+ <!-- 寮傚父 -->
+ <div class="form-item">
+ <div class="form-item-label">
+ <span>寮傚父锛�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="error" value="">
</div>
</div>
<!-- 鎿嶄綔鎸夐挳 -->
@@ -635,19 +645,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