From 91e3d4f6c13dd548d6e538b594d54a8752b51f39 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 17 三月 2022 21:37:14 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 156 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 110 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 6dd20cd..932fc12 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>
@@ -83,6 +88,19 @@
<div id="site-131" class="site" style="height: 71px;line-height: 71px">131</div>
<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>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
@@ -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">
@@ -972,36 +990,24 @@
<div class="table-head">
<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
</div>
- <div class="table-body">
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <div id="barcode1" class="table-body">
+
</div>
</div>
<div class="tablebox">
<div class="table-head">
<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
</div>
- <div class="table-body">
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <div id="barcode2" class="table-body">
+
</div>
</div>
<div class="tablebox">
<div class="table-head">
<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
</div>
- <div class="table-body">
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <div id="barcode3" class="table-body">
+
</div>
</div>
</div>
@@ -1230,6 +1236,63 @@
</body>
</html>
+<script>
+ var tData = []
+ var tData1 = []
+ var tData2 = []
+ var tData3 = []
+ function getCodeData(){
+ $.ajax({
+ url:baseUrl +'/console/barcode/output/site',
+ method:'GET',
+ success:function (res) {
+ if(res.code === 200){
+ 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(function () {
+ getCodeData();
+ renderBarCode();
+ }, 1000)
+
+
+
+
+ function renderBarCode() {
+ 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<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<tData3.length;k++){
+ var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
+ $('#barcode3').append(str3)
+ }
+ }
+</script>
<script type="text/javascript">
// 寮圭獥绔欑偣淇℃伅
$('.site').on('click',function(){
@@ -1248,26 +1311,17 @@
},
method:'post',
success:function (res) {
- for (var val in data) {
+ 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');
}
}
}
})
- // res.data
- for (var val in data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type==='text') {
- find.val(data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", data[val] === 'Y');
- }
- }
});
// 鍫嗗灈鏈轰俊鎭�
@@ -1277,17 +1331,28 @@
$("#siteWindow").attr("style","display:none;");
$('.detailed').empty();
$('.detailed').append(id+'鍙峰爢鍨涙満');
- $.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
- console.log(res)
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type==='text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
+ $.ajax({
+ url:baseUrl+"/console/crn/detail",
+ headers:{
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ crnNo: id
+ },
+ method:'post',
+ success:function (res) {
+ for (var val in res.data) {
+ var find = $("#crnWindow").find(":input[name='" + val + "']");
+ if (find[0].type==='text') {
+ find.val(res.data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", res.data[val] === 'Y');
+ }
}
}
+
})
+
})
// 寮圭獥鍏抽棴
$('button').on('click',function(){
@@ -1348,7 +1413,6 @@
},
method: 'POST',
success: function (res) {
- console.log(res)
layer.close(index);
if (res.code === 200){
if (res.data.status) {
--
Gitblit v1.9.1