From 0bc2791302e9af5955dfb6bd4d2bc6e870e6218d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 16:47:48 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 84 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2124b17..fd024c3 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 {*/
@@ -85,7 +85,14 @@
</div>
- <!-- 宸﹁緭閫佺嚎 -->
+ <!----------- 宸﹁緭閫佺嚎 ---------->
+
+ <!-- 鍙拌溅杞ㄩ亾 -->
+ <div id="car-track-1" class="car-track"></div>
+
+ <!-- 鍙拌溅瀹炰緥 -->
+ <div id="site-8" class="site car">8</div>
+
<!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-1">
<div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
@@ -183,6 +190,7 @@
<button class="item">34</button>
<div class="site site-none"> </div>
</div>
+ <span class="row-no">2#</span>
</div>
</div>
</main>
@@ -197,7 +205,7 @@
<span>璁惧鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="devpNo" value="" disabled="disabled" style="width: 4rem">
+ <input type="text" name="siteId" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -213,7 +221,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>
@@ -283,7 +291,7 @@
<span>婧愬簱浣�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
+ <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
<div class="form-item" style="width: 40%">
@@ -291,7 +299,7 @@
<span>鐩爣搴撲綅</span>
</div>
<div class="form-item-input">
- <input type="text" name="stock" value="" disabled="disabled" style="width: 8rem">
+ <input type="text" name="locNo" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
</form>
@@ -340,7 +348,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%">
@@ -358,7 +366,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%">
@@ -366,7 +374,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>
@@ -404,7 +412,7 @@
getCrnInfo();
getSystemRunningStatus();
getBarcodeInfo()
- }, 500);
+ }, 1000);
setInterval(function () {
getSitesInfo();
}, 3000);
@@ -494,7 +502,13 @@
if (res.code === 200){
var sites = res.data;
for (var i = 0; i < sites.length; i++){
- $("#site-"+sites[i].siteId).attr("class", "site " + sites[i].siteStatus);
+ var siteEl = $("#site-"+sites[i].siteId);
+ siteEl.attr("class", "site " + sites[i].siteStatus);
+ if (sites[i].workNo != null && sites[i].workNo>0) {
+ siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
+ } else {
+ siteEl.html(sites[i].siteId);
+ }
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -515,7 +529,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";
@@ -630,5 +647,48 @@
});
});
+
+ // 灏忚溅鍋忕Щ鍔ㄧ敾
+ function carAnimate(id, target) {
+ var targetTop = 122;
+ if (id === 8) {
+ switch (target) {
+ case 1:
+ targetTop += 160;
+ break;
+ case 2:
+ targetTop += 120;
+ break;
+ case 3:
+ targetTop += 80;
+ break;
+ case 4:
+ targetTop += 40;
+ break;
+ case 7:
+ targetTop += 0;
+ break;
+ default:
+ return;
+ }
+ } else {
+ return;
+ }
+ $("#site-" + id).animate({top: targetTop+'px'}, 1000);
+ }
+
+
+ // 鍙拌溅鐐瑰嚮浜嬩欢
+ $(document).on("click", ".car", function () {
+ var value = prompt('鐩爣绔欙細', "1");
+ if (value == null) {
+ alert('涓嶈兘涓虹┖锛�');
+ } else if (value === '') {
+ alert('涓嶈兘涓虹┖锛�');
+ } else {
+ carAnimate(8, Number(value));
+ }
+ })
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1