From bf7f18b252078aa07b7df4a2b51a36e320663730 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 19:00:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 119 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 60fd15b..1a066b7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -21,7 +21,7 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
<div class="head-right">
- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+<!-- <img src="../static/images/zy-logo.png" alt="寰愬伐姹変簯" height="44" width="80">-->
</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
@@ -344,7 +344,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) {
@@ -463,6 +462,8 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
+ // carAnimate();
+ carAnimate2();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
@@ -516,8 +517,8 @@
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
} else {
+ alert(res.msg);
console.log(res.msg);
-
}
}
});
@@ -561,14 +562,18 @@
var sites = res.data;
for (var i = 0; i < sites.length; i++) {
var siteEl = $("#site-" + sites[i].siteId);
+ console.log(sites[i].siteId)
siteEl.attr("class", "site " + sites[i].siteStatus);
+ // siteEl.attr("class", "site site-auto-run-id");
if (sites[i].workNo != null && sites[i].workNo > 0) {
siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
} 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) {
@@ -594,27 +599,17 @@
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) {
+
+ 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 = 0;
- switch (i) {
- case 0:
- unit = 34;
- offSet = 337;
- break;
- case 1:
- unit = 68;
- offSet = 337;
- break;
- case 2:
- unit = 17;
- offSet = 337;
- break;
- }
+ unit = 60;
+ offSet = 325;
+
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
@@ -707,23 +702,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,8 +742,58 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
+ //RGV杞﹁締鍚勭珯鐐硅窛绂绘暟鎹�
+ let sitePosition = {
+ 101: '68px',
+ 102: '117px',
+ 122: '183px',
+ 104: '183px',
+ 105: '232px',
+ 118: '297px',
+ 107: '297px',
+ 108: '345px',
+ 119: '355px',
+ 110: '410px',
+ 120: '421px',
+ 111: '459px',
+ 121: '479px',
+ 113: '524px',
+ 123: '556px',
+ 114: '572px',
+ 1142: '600px',
+ 116: '639px',
+ 117: '687px',
+ }
+
+ //RGV杞︾Щ鍔ㄥ姩鐢�
+ function moveSite(siteId, staNo) {
+ $(siteId).animate({top: sitePosition[staNo]}, 1000);
+ }
+
+ // moveSite("#site-1", 117);//娴嬭瘯绉诲姩鏂规硶,鍙垹闄�
+
+ // Rgv瀹炴椂鏁版嵁鑾峰彇
+ function carAnimate2() {
+ // console.log("1=============1")
+ $.ajax({
+ url: baseUrl + "/rgv/console/rgv/site/data",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var rgvMap = res.data;
+ for (var i = 0; i < rgvMap.length; i++) {
+ moveSite("#site-"+rgvMap[i].id, rgvMap[i].title);
+ }
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
</script>
\ No newline at end of file
--
Gitblit v1.9.1