From 1db2fb1739982ce77e16c04fccb200f04467bb22 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 20 十一月 2024 14:59:23 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 196 ++++++++++++++++++++++++++++--------------------
1 files changed, 113 insertions(+), 83 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fde6b24..dcbc329 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -41,72 +41,72 @@
</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 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>
- </div>
- <div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
- <div class="tablebox">
- <div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
- </div>
- <div id="barcode1" class="table-body">
+<!-- </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>-->
+<!-- </div>-->
+<!-- <div class="bar-code">-->
+<!-- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>-->
+<!-- <div class="tablebox">-->
+<!-- <div class="table-head">-->
+<!-- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>-->
+<!-- </div>-->
+<!-- <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 id="barcode2" class="table-body">
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="tablebox">-->
+<!-- <div class="table-head">-->
+<!-- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>-->
+<!-- </div>-->
+<!-- <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 id="barcode3" class="table-body">
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="tablebox">-->
+<!-- <div class="table-head">-->
+<!-- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>-->
+<!-- </div>-->
+<!-- <div id="barcode3" class="table-body">-->
- </div>
- </div>
- </div>
- </div>
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 鍫嗗灈鏈哄脊绐� -->
<div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
<div id="crnWindow-head">
@@ -344,6 +344,7 @@
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) {
@@ -566,8 +567,10 @@
} else {
siteEl.html(sites[i].siteId);
}
- if (i + 1 === 8) {
- carAnimate(i + 1, Number(sites[i].nearbySta));
+
+ if (sites[i].siteId === '1' || sites[i].siteId === '2' || sites[i].siteId === '3') {
+
+ carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
} else if (res.code === 403) {
@@ -593,25 +596,29 @@
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;
+ case 3:
+ unit = 35;
+ offSet = 500;
+ break;
+ case 5:
+ unit = 124;
+ offSet = 550;
+ break;
+ case 4:
+ case 6:
+ unit = 62;
+ offSet = 550;
break;
}
@@ -641,7 +648,7 @@
if (res.code === 200) {
var barcodes = res.data;
for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
+ $("#barcode-"+barcodes[i].barcodeId).html(barcodes[i].codeValue ? barcodes[i].codeValue : "--");
}
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
@@ -706,23 +713,45 @@
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
- if (id === 8) {
+ // debugger
+ var targetTop = 0;
+ if (id === 1 || id === '1' || id === '2' || id === 2 || id === '3' || id === 3) {
switch (target) {
case 1:
- targetTop += 160;
+ targetTop += 792;
break;
case 2:
- targetTop += 140;
+ targetTop += 771;
break;
case 3:
- targetTop += 80;
+ targetTop += 727;
break;
case 4:
- targetTop += 40;
+ targetTop += 706;
+ break;
+ case 5:
+ targetTop += 662;
+ break;
+ case 6:
+ targetTop += 620;
break;
case 7:
- targetTop += 0;
+ targetTop += 578;
+ break;
+ case 8:
+ targetTop += 530;
+ break;
+ case 9:
+ targetTop += 190;
+ break;
+ case 10:
+ targetTop += 147;
+ break;
+ case 11:
+ targetTop += 107;
+ break;
+ case 12:
+ targetTop += 63;
break;
default:
return;
@@ -730,6 +759,7 @@
} else {
return;
}
+
$("#site-" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1