From 50add1caee430cc5e70e53cdae138abf30ae98a3 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 22 一月 2026 17:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yhfzwcs' into yhfzwcs
---
src/main/webapp/views/console.html | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 4678401..e523e38 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -10,19 +10,23 @@
<script src="../static/js/console.map.js"></script>
<script src="../static/js/console.js"></script>
<script src="../static/js/common.js"></script>
-
+ <style>
+ .site{
+ font-size: 12px;
+ }
+ </style>
</head>
<body>
<div id="main">
<div class="head">
<div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+ <h1>绔嬩綋搴揥CS鐩戞帶鍥�</h1>
+ <h6>THREE-DIMENSIONAL WAREHOUSE WCS MONITORING MAP</h6>
</div>
- <div class="head-right">
- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
- </div>
+<!-- <div class="head-right">-->
+<!-- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">-->
+<!-- </div>-->
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
@@ -568,7 +572,7 @@
siteEl.html(sites[i].siteId);
}
- if (sites[i].siteId === '1' || sites[i].siteId === '2') {
+ if (sites[i].siteId === '1' || sites[i].siteId === '2' || sites[i].siteId === '3') {
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
@@ -595,37 +599,18 @@
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 || crns[i].bay === -2) {
+ if (crns[i].bay < 0) {
crns[i].bay = 1
}
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 15;
- var offSet = 0;
- 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 = 410;
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
} else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ let lf = (offSet + (crns[i].bay - 1 )* 50);
+ crnEl.animate({left: lf + 'px'}, 1000);
}
}
@@ -715,7 +700,7 @@
function carAnimate(id, target) {
// debugger
var targetTop = 0;
- if (id === 1 || id === '1' || id === '2' || id === 2) {
+ if (id === 1 || id === '1' || id === '2' || id === 2 || id === '3' || id === 3) {
switch (target) {
case 1:
targetTop += 792;
--
Gitblit v1.9.1