From 8c0d2c49eb091aedd053d8f7a1be28b67ce8d0c3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 27 十月 2025 18:47:51 +0800
Subject: [PATCH] *
---
src/main/webapp/views/console.html | 94 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 39 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ea259e5..521b521 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -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')
}
}
- }
+ }
})
})
@@ -568,7 +562,8 @@
siteEl.html(sites[i].siteId);
}
- if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+ if (sites[i].siteId === '1' || sites[i].siteId === '2' || sites[i].siteId === '3') {
+
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
@@ -601,16 +596,14 @@
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
// crns[i].bay = 15;
-
- var offSet = 0;
- unit = 60;
- offSet = 325;
+ var offSet = 120;
+ unit = 15;
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);
}
}
@@ -633,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";
@@ -698,23 +691,45 @@
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
- if (id === 16 || id === '16' || id === '016') {
+ // 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;
@@ -722,6 +737,7 @@
} else {
return;
}
+
$("#site-" + id).animate({top: targetTop + 'px'}, 1000);
}
--
Gitblit v1.9.1