From aeaf3e43e425ef0de84c1819f318f20e90471f90 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 02 十月 2025 11:49:37 +0800
Subject: [PATCH] #和得服务器
---
src/main/webapp/views/console.html | 237 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 122 insertions(+), 115 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 60fd15b..7ad3964 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,7 +344,7 @@
url: baseUrl + '/console/barcode/output/site',
method: 'GET',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200) {
tData = eval(res.data);
if (tData.length <= 5) {
@@ -385,12 +385,11 @@
</script>
<script type="text/javascript">
// 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
+ $(document).on('click', '.site' ,function () {
var id = this.id.split("-")[1];
- $("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#crnWindow").attr("style", "display:none;");
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
+ $("#siteWindow").css("display", "block");//鏄剧ずdiv
+ $("#crnWindow").css("display", "none");
+ $(".detailed").empty().append(id + '绔欑偣璇︾粏淇℃伅');
$.ajax({
url: baseUrl + "/console/site/detail",
headers: {
@@ -406,7 +405,7 @@
if (find[0].type === 'text') {
find.val(res.data[val]);
} else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
+ find.prop("checked", res.data[val] === 'Y');
}
}
}
@@ -415,32 +414,27 @@
});
// 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
+ $(document).on('click', '.machine',function () {
var id = this.id.split("-")[1];
- $("#crnWindow").attr('style', 'display:block;');
- $("#siteWindow").attr("style", "display:none;");
- $('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
+ $("#crnWindow").css("display","block");
+ $("#siteWindow").css("display","none");
+ $(".detailed").empty().append(id + '鍙峰爢鍨涙満');
$.ajax({
url: baseUrl + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: id
- },
+ 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') {
+ 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');
+ }else if (find[0].type === 'checkbox'){
+ find.prop("checked", res.data[val] === 'Y')
}
}
- }
+ }
})
})
@@ -567,8 +561,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) {
@@ -594,32 +590,20 @@
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 = 120;
+ unit = 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;
- }
if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
+ crnEl.animate({left: offSet + 'px'}, 10);
} else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 10);
}
}
@@ -642,7 +626,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";
@@ -707,23 +691,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;
@@ -731,6 +737,7 @@
} else {
return;
}
+
$("#site-" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1