From 7e8e09aa4c3da51907bcf344de83d377b5b6d6c4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 十一月 2023 15:04:06 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/console.js | 87 +++++++++----------------------------------
1 files changed, 19 insertions(+), 68 deletions(-)
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 880d155..af7cba0 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -9,10 +9,8 @@
track = '',
tracks = '',
stn = '',
- barcode = '',
stns = '',
stnArr = [],
- barcodeArr = [],
floorBtn = '',
floorBtns = '',
floorBtnss = '',
@@ -32,12 +30,12 @@
let bLen
let interval // 闂撮殧鏁�
- if (maxBayNo<35) {
- interval = 1
- bLen = maxBayNo / interval // 搴撲綅涓暟
+ if (maxBayNo < 37) {
+ interval = 1;
+ bLen = maxBayNo / interval; // 搴撲綅涓暟
} else {
- interval = 2
- bLen = maxBayNo / interval // 搴撲綅涓暟
+ interval = 2;
+ bLen = maxBayNo / interval; // 搴撲綅涓暟
}
let bayWidth // 鍗曚釜搴撲綅瀹藉害
let bNum // 搴撲綅鍙风爜
@@ -64,29 +62,11 @@
}
}
}
- bayWidth = (rackss[i].width / bLen)-4
+ bayWidth = rackss[i].width / bLen
// hpPosition 0 琛ㄧず璐ф灦搴忓彿 宸�->鍙� 1 琛ㄧず璐ф灦搴忓彿 宸�<-鍙�
if (mapInfo.hpPosition == 1) {
bNum = maxBayNo
for (let j = bLen; j > 0; j--) {
- if (i === 0) {
- if (j === 13) {
- bay = "<button class='item' style='width: " + 160 + "px'>" + bNum + "</button>"
- bays = bays + bay
- bNum = bNum - interval;
- continue
- }
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
- bNum = bNum - interval;
- continue
- }
- if (j === 13) {
- bay = "<button class='item' style='margin-left: 160px;width: "+ bayWidth +"px'>" + (bNum - 2) + "</button>"
- bays = bays + bay
- bNum = bNum - interval - 2;
- continue
- }
bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
bays = bays + bay
bNum = bNum - interval;
@@ -94,24 +74,6 @@
}else {
bNum = minBayNo
for (let j = 0; j < bLen; j++) {
- if (i === 0) {
- if (j === 15 || j === 16) {
- bay = "<button class='item' style='width: "+ 80 +"px'>" + bNum + "</button>"
- bays = bays + bay
- bNum = bNum + interval;
- continue
- }
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
- bNum = bNum + interval;
- continue
- }
- if (j === 15) {
- bay = "<button class='item' style='margin-left: 160px;width: "+ bayWidth +"px'>" + (bNum + 4) + "</button>"
- bays = bays + bay
- bNum = bNum + interval + 4;
- continue
- }
bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
bays = bays + bay
bNum = bNum + interval;
@@ -127,17 +89,17 @@
racks = racks + rack
// getCrnInfo(minBayNo);
}
- // 璐ф灦鎻忚堪
- for (let i = 0;i < rackDescss.length;i++) {
- rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
- "'style='width:"+ rackDescss[i].width +
- "px;height: "+ rackDescss[i].height+
- "px;line-height: "+ rackDescss[i].height+
- "px;top: "+ rackDescss[i].top +
- "px;left: "+ rackDescss[i].left +
- "px'>" + rackDescss[i].text + "</div>"
- rackDescs = rackDescs + rackDesc
- }
+ // // 璐ф灦鎻忚堪
+ // for (let i = 0;i < rackDescss.length;i++) {
+ // rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
+ // "'style='width:"+ rackDescss[i].width +
+ // "px;height: "+ rackDescss[i].height+
+ // "px;line-height: "+ rackDescss[i].height+
+ // "px;top: "+ rackDescss[i].top +
+ // "px;left: "+ rackDescss[i].left +
+ // "px'>" + rackDescss[i].text + "</div>"
+ // rackDescs = rackDescs + rackDesc
+ // }
// 鍫嗗灈鏈哄拰鍦拌建
for (let i = 0;i < crnss.length;i++) {
if (crnss[i].type == "crane") {
@@ -162,7 +124,6 @@
for (let i = 0; i < areas.length;i++) {
let stnss = areas[i].stns
- let barcodes = areas[i].barcode
let floor = areas[i].text
floorId = areas[i].id
var position = (i+1)*100
@@ -177,7 +138,6 @@
var index = i
var n = 1
stnArr[index] = ''
- barcodeArr[index] = ''
total[index] = ''
for (let j = 0; j < stnss.length; j++) {
if (stnss[j].type == "stn") {
@@ -202,18 +162,9 @@
}
}
- for (let k = 0; k < barcodes.length; k++) {
- barcode = "<div class='barcode' id='" + barcodes[k].id +
- "'style='width:" + barcodes[k].width +
- "px;height: " + barcodes[k].height +
- "px;line-height: " + barcodes[k].height +
- "px;top: "+ barcodes[k].top +
- "px;left: "+ barcodes[k].left + "px'>" + "</div>"
- barcodeArr[i] = barcodeArr[i] + barcode
- }
}
- floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss + barcodeArr[0]
+ floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss
$(".main-part").append(floorInfo)
$("#line-total").html(total[0])
@@ -222,7 +173,7 @@
}
function changFloor(e) {
$(".main-part").empty() // 娓呯┖鑺傜偣
- floorInfo = racks + stnArr[e] +rackDescs + crns + tracks + floorBtnss + barcodeArr[e]
+ floorInfo = racks + stnArr[e] +rackDescs + crns + tracks + floorBtnss
$(".main-part").append(floorInfo)
$("#line-total").empty()
$("#line-total").html(total[e])
--
Gitblit v1.9.1