From a6cf568459bd004d5302ddaaa9310ae9c885f362 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 14:55:56 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 18983af..0bbd568 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -11,8 +11,8 @@
<link rel="stylesheet" type="text/css" href="../static/css/common.css">
<link rel="stylesheet" type="text/css" href="../static/css/console.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
<style>
/* layer 娣辫摑鑹叉寜閽慨鏀� */
/*.layui-layer-lan .layui-layer-btn {*/
@@ -86,6 +86,12 @@
<!-- 宸﹁緭閫佺嚎 -->
+
+ <!-- 鍙拌溅1 -->
+
+
+
+
<!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-1">
<div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
@@ -341,7 +347,7 @@
<span>宸ヤ綔鐘舵��</span>
</div>
<div class="form-item-input">
- <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -359,7 +365,7 @@
<span>婧愬簱浣�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -367,7 +373,7 @@
<span>鐩爣搴撲綅</span>
</div>
<div class="form-item-input">
- <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="locNo" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
@@ -405,7 +411,7 @@
getCrnInfo();
getSystemRunningStatus();
getBarcodeInfo()
- }, 500);
+ }, 1000);
setInterval(function () {
getSitesInfo();
}, 3000);
@@ -522,7 +528,10 @@
if (res.code === 200){
var crns = res.data;
for (var i = 0; i < crns.length; i++){
- crnAnimate(crns[i].crnId, crns[i].offset);
+ var crnEl = $("#crn-"+crns[i].crnId);
+ crnEl.attr("class", "machine " + crns[i].crnStatus);
+ // crnAnimate(crns[i].crnId, crns[i].offset);
+ crnEl.animate({left: (crns[i].bay * 30) +'px'}, 1000);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1