From bebe61d84eae20ca8997152b8bdb453e8094ab3d Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期五, 18 三月 2022 16:56:48 +0800
Subject: [PATCH] # ycq 堆垛机位置
---
src/main/webapp/views/console.html | 275 +++++++++++++++++++++++++++++-------------------------
1 files changed, 148 insertions(+), 127 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 1acd2bc..c57b160 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -17,8 +17,13 @@
<body>
<div id="root">
<div class="head">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+ <div class="head-left">
+ <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>
<!--绗�1鍒楋紙瀹藉害 70px锛� -->
<div class="site-row site-row-1">
@@ -50,8 +55,8 @@
</div>
<!-- 绗�4鍒楋紙瀹藉害 70px 140px锛� -->
- <!--<!– 绗�5鍒楋紙瀹藉害 70px锛� –>-->
- <div class="site-row site-row-5">
+ <!--<!– 绗�4鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-4">
<div id="site-163" class="site" style="height: 28.5px;line-height: 28.5px">163</div>
<div id="site-162" class="site" style="height: 28.5px;line-height: 28.5px">162</div>
<div id="site-161" class="site" style="height: 71px;line-height: 71px">161</div>
@@ -67,8 +72,8 @@
<div id="site-151" class="site" style="height: 28.5px;line-height: 28.5px">151</div>
<div id="site-150" class="site" style="height: 28.5px;line-height: 28.5px">150</div>
</div>
- <!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
- <div class="site-row site-row-6">
+ <!--<!– 绗�5鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-5">
<div id="site-120" class="site" style="height: 28.5px;line-height: 28.5px">120</div>
<div id="site-121" class="site" style="height: 28.5px;line-height: 28.5px">121</div>
<div id="site-122" class="site" style="height: 71px;line-height: 71px">122</div>
@@ -84,6 +89,19 @@
<div id="site-132" class="site" style="height: 28.5px;line-height: 28.5px">132</div>
<div id="site-133" class="site" style="height: 28.5px;line-height: 28.5px">133</div>
</div>
+ <!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-6">
+ <div id="site-183" class="site">183</div>
+ <div id="site-184" class="site" style="margin-top: 21px">184</div>
+ <div id="site-185" class="site" style="margin-top: 73px">185</div>
+ <div id="site-186" class="site" style="margin-top: 21px">186</div>
+ <div id="site-187" class="site" style="margin-top: 73px">187</div>
+ <div id="site-188" class="site" style="margin-top: 21px">188</div>
+ <div id="site-189" class="site" style="margin-top: 73px">189</div>
+ <div id="site-190" class="site" style="margin-top: 21px">190</div>
+ <div id="site-191" class="site" style="margin-top: 73px">191</div>
+ <div id="site-192" class="site" style="margin-top: 21px">192</div>
+ </div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
@@ -91,10 +109,10 @@
<div class="lane">
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -130,10 +148,10 @@
</div>
<div class="stock-group">
<div id="site-100" class="site" style="">100</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -175,10 +193,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-101" class="site" style="">101</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -213,10 +231,10 @@
<span class="row-no">3#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -257,10 +275,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div class="site" style="background-color: rgb(108,167,168)"></div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -296,10 +314,10 @@
</div>
<div class="stock-group">
<div id="site-102" class="site" style="">102</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -341,10 +359,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-103" class="site" style="">103</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -380,10 +398,10 @@
</div>
<div class="stock-group">
<div class="site" style="background-color: rgb(108,167,168)"></div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -423,10 +441,10 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -462,10 +480,10 @@
</div>
<div class="stock-group">
<div id="site-104" class="site" style="">104</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -507,10 +525,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-105" class="site" style="">105</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -545,10 +563,10 @@
<span class="row-no">11#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -588,10 +606,10 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -627,10 +645,10 @@
</div>
<div class="stock-group">
<div id="site-106" class="site" style="">106</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -672,10 +690,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-107" class="site" style="">107</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -710,10 +728,10 @@
<span class="row-no">15#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -753,10 +771,10 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -792,10 +810,10 @@
</div>
<div class="stock-group">
<div id="site-108" class="site" style="">108</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -837,10 +855,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-109" class="site" style="">109</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -875,10 +893,10 @@
<span class="row-no">19#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 2 </button>
+ <button class="item"> 4 </button>
+ <button class="item"> 6 </button>
+ <button class="item"> 8 </button>
<button class="item">10</button>
<button class="item">12</button>
<button class="item">14</button>
@@ -955,7 +973,7 @@
<div class="body-head">杈撻�佺嚎鐘舵��</div>
<div class="state states">
<span>杩愯緭绾挎�绘暟</span>
- <span class="line-ss">45</span>
+ <span class="line-ss">58</span>
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
@@ -1219,59 +1237,61 @@
</body>
</html>
<script>
+ var tData = []
+ var tData1 = []
+ var tData2 = []
+ var tData3 = []
function getCodeData(){
$.ajax({
- url:baseUrl +'/xgmwcs/console/barcode/output/site',
+ url:baseUrl +'/console/barcode/output/site',
method:'GET',
success:function (res) {
- console.log(res)
if(res.code === 200){
- tData = res.data
+ tData = eval(res.data);
+ if(tData.length<=5){
+ tData1 = tData
+ } else if (tData.length<=10){
+ tData1 = tData.slice(0,5)
+ tData.splice(0,5)
+ tData2 = tData
+ } else if(tData.length<=15){
+ tData1 = tData.slice(0,5)
+ tData2 = tData.slice(6,10)
+ tData.splice(0,10)
+ tData3 = tData
+ } else {
+ tData = tData.slice(-15)
+ tData1 = tData.slice(-15)
+ tData2 = tData.slice(-10)
+ tData3 = tData.slice(-5)
+
+ }
}
}
})
}
- setInterval(getCodeData(),1000)
- var tData = []
- var tDate1 = []
- var tDate2 = []
- var tDate3 = []
- if(tData.length<=5){
- tData1 = tData
- } else if (tData.length<=10){
- tDate1 = tData.slice(0,5)
- tData.splice(0,5)
- tDate2 = tData
- console.log(tDate2)
- } else if(tData.length<=15){
- tDate1 = tData.slice(0,5)
- tDate2 = tData.slice(6,10)
- tData.splice(0,10)
- tDate3 = tData
- console.log(tDate3)
- } else {
- tData = tData.slice(-15)
- tDate1 = tData.slice(-15)
- tDate2 = tData.slice(-10)
- tDate3 = tData.slice(-5)
+ setInterval(function () {
+ getCodeData();
+ renderBarCode();
+ }, 1000)
- }
+
+
function renderBarCode() {
- for (var i = 0;i<tDate1.length;i++){
- var str1 = '<li><span>' + tDate1[i].barcode + '</span><span class="right">' + tDate1[i].time + '</span></li>'
+ for (var i = 0;i<tData1.length;i++){
+ var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
$('#barcode1').append(str1)
}
- for(var j = 0;j<tDate2.length;j++){
- var str2 = '<li><span>' + tDate2[j].barcode + '</span><span class="right">' + tDate2[j].time + '</span></li>'
+ for(var j = 0;j<tData2.length;j++){
+ var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
$('#barcode2').append(str2)
}
- for(var k = 0;k<tDate3.length;k++){
- var str3 = '<li><span>' + tDate3[k].barcode + '</span><span class="right">' + tDate3[k].time + '</span></li>'
+ for(var k = 0;k<tData3.length;k++){
+ var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
$('#barcode3').append(str3)
}
}
- setInterval(renderBarCode(),1000)
</script>
<script type="text/javascript">
// 寮圭獥绔欑偣淇℃伅
@@ -1294,9 +1314,9 @@
for (var val in res.data) {
var find = $("#siteWindow").find(":input[name='" + val + "']");
if (find[0].type==='text') {
- find.val(data[val]);
+ find.val(res.data[val]);
} else if (find[0].type === 'checkbox') {
- find.attr("checked", data[val] === 'Y');
+ find.attr("checked", res.data[val] === 'Y');
}
}
}
@@ -1393,7 +1413,6 @@
},
method: 'POST',
success: function (res) {
- console.log(res)
layer.close(index);
if (res.code === 200){
if (res.data.status) {
@@ -1484,8 +1503,11 @@
for (var i = 0; i < crns.length; i++){
var crnEl = $("#crn-"+crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = ($('.item').eq(0).width()+4)/2;
- crnEl.animate({left: (crns[i].bay * unit + 25) +'px'}, 1000);
+ var unit = ($('.item').eq(0).width()+13)/2;
+ if (crns[i].bay < 0) {
+ crns[i].bay = 0
+ }
+ crnEl.animate({left: (crns[i].bay * unit) +'px'}, 1000);
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -1495,7 +1517,6 @@
}
});
}
-
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
function getBarcodeInfo(){
$.ajax({
--
Gitblit v1.9.1