From 97c788f31a57b4e8c3fc8091dc29aab598adeebb Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 04 一月 2026 08:07:00 +0800
Subject: [PATCH] #1
---
src/main/webapp/views/console.html | 209 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 139 insertions(+), 70 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 60fd15b..6bae96a 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -40,43 +40,14 @@
</div>
</div>
</div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
- <div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
- <div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
- </div>
- <div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
-
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
- <span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
- <span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
- </div>
- </div>
<div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
- <div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
- <span id="line-total" class="line-ss"></span>
- </div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
- <div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+ <div class="body-head">鍑哄叆搴撴ā寮�</div>
+ <div class="button" onclick="switchIoMode()"><span class="site-auto-id">鐐瑰嚮鍒囨崲妯″紡</span></div>
+ <div class="button" style="margin-top: 10px;">
+ <span>褰撳墠妯″紡锛�</span>
+ <span id="ioMode-in" class="site-auto">鍏ュ簱妯″紡</span>
+ <span id="ioMode-out" class="site-auto-run">鍑哄簱妯″紡</span>
+ <span id="ioMode-none" class="site-unauto">鏈煡妯″紡</span>
</div>
</div>
<div class="bar-code">
@@ -337,6 +308,7 @@
setInterval(function () {
getCodeData();
renderBarCode();
+ getIoModeInfo()
}, 1000)
var tData = [],tData1 = [],tData2 = [],tData3 = [];
function getCodeData() {
@@ -344,7 +316,6 @@
url: baseUrl + '/console/barcode/output/site',
method: 'GET',
success: function (res) {
- console.log(res)
if (res.code === 200) {
tData = eval(res.data);
if (tData.length <= 5) {
@@ -368,6 +339,7 @@
}
})
}
+
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>'
@@ -381,6 +353,56 @@
var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
$('#barcode3').append(str3)
}
+ }
+
+ function getIoModeInfo() {
+ $.ajax({
+ url: baseUrl + "/console/getIoMode",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ let ioModeData = res.data;
+ if (ioModeData == 1) {
+ $("#ioMode-none").hide()
+ $("#ioMode-in").show()
+ $("#ioMode-out").hide()
+ }else if(ioModeData == 2) {
+ $("#ioMode-none").hide()
+ $("#ioMode-in").hide()
+ $("#ioMode-out").show()
+ }else {
+ $("#ioMode-none").show()
+ $("#ioMode-in").hide()
+ $("#ioMode-out").hide()
+ }
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
+ function switchIoMode() {
+ $.ajax({
+ url: baseUrl + "/console/switchIoMode",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {},
+ method: 'post',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg)
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
}
</script>
<script type="text/javascript">
@@ -461,12 +483,14 @@
getSitesInfo();
getCrnInfo();
getSystemRunningStatus();
+ getDevpTaskCount();
getBarcodeInfo();
getScaleInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
getSystemRunningStatus();
+ getDevpTaskCount();
getBarcodeInfo();
getScaleInfo();
}, 1000);
@@ -550,6 +574,26 @@
});
}
+ function getDevpTaskCount() {
+ $.ajax({
+ url: baseUrl + "/console/devpTaskCount",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ let devpTaskStackOver = res.data.devpTaskStackOver
+ let devpWorkingCount = res.data.devpWorkingCount
+ $("#devpTaskStackOver").html(devpTaskStackOver);
+ $("#devpWorkingCount").html(devpWorkingCount);
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
function getSitesInfo() {
$.ajax({
@@ -567,8 +611,10 @@
} else {
siteEl.html(sites[i].siteId);
}
- if (i + 1 === 8) {
- carAnimate(i + 1, Number(sites[i].nearbySta));
+
+ if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+
+ carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
} else if (res.code === 403) {
@@ -593,34 +639,40 @@
for (var i = 0; i < crns.length; i++) {
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
- if (crns[i].bay < 0) {
+ var unit = 35;//($('.item').eq(0).width() + 13) / 2;
+
+ if (crns[i].bay < 0 || crns[i].bay === -2) {
crns[i].bay = 1
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 1;
+ // crns[i].bay = 15;
+ var offSet = 800;
+ // switch (i) {
+ // case 0:
+ // case 1:
+ // case 2:
+ // case 3:
+ // unit = 35;
+ // offSet = 500;
+ // break;
+ // case 5:
+ // unit = 124;
+ // offSet = 550;
+ // break;
+ // case 4:
+ // case 6:
+ // unit = 62;
+ // offSet = 550;
+ // break;
+ // }
- var offSet = 0;
- switch (i) {
- case 0:
- unit = 34;
- offSet = 337;
- break;
- case 1:
- unit = 68;
- offSet = 337;
- break;
- case 2:
- unit = 17;
- offSet = 337;
- break;
- }
+ crnEl.animate({left: offSet + 'px'}, 1000);
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
+ // if(crns[i].bay === 1){
+ // crnEl.animate({left: offSet + 'px'}, 1000);
+ // } else {
+ // crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ // }
}
} else if (res.code === 403) {
@@ -707,23 +759,39 @@
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
- if (id === 8) {
+ // debugger
+ var targetTop = 0;
+ if (id === 16 || id === '16' || id === '016') {
switch (target) {
case 1:
- targetTop += 160;
+ targetTop += 827;
break;
case 2:
- targetTop += 140;
+ targetTop += 765;
break;
case 3:
- targetTop += 80;
+ targetTop += 651;
break;
case 4:
- targetTop += 40;
+ targetTop += 589;
+ break;
+ case 5:
+ targetTop += 505;
+ break;
+ case 6:
+ targetTop += 443;
break;
case 7:
- targetTop += 0;
+ targetTop += 362;
+ break;
+ case 8:
+ targetTop += 297;
+ break;
+ case 9:
+ targetTop += 243;
+ break;
+ case 10:
+ targetTop += 129;
break;
default:
return;
@@ -731,7 +799,8 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1