From ea9a3f176e8ff0a0cf96762c7948c7f037e56b23 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 30 八月 2022 10:44:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/webapp/static/js/console.js | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index eea1df2..707d1fa 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -39,13 +39,22 @@
bNum = bNum - minBayNo;
}
}else {
- bNum = minBayNo
- for (let j = 0; j < bLen; j++) {
-
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
- bNum = bNum + minBayNo;
+ if (minBayNo % 2 == 0) {
+ bNum = minBayNo
+ for (let j = 0; j < bLen; j++) {
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
+ bays = bays + bay
+ bNum = bNum + minBayNo;
+ }
+ } else {
+ bNum = minBayNo + 1
+ for (let j = 0; j < bLen; j++) {
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
+ bays = bays + bay
+ bNum = bNum + minBayNo;
+ }
}
+
}
rack = "<div class='rack' id='" + rackss[i].id +
@@ -97,7 +106,6 @@
var position = (i+1)*100
floorBtn =
"<button class='floorBtn btn-16' onclick='changFloor("+i+")' style='top: "+position+"px;'>" + floor +"</button>"
- console.log(mapInfo.areas[0].floors.length)
if (mapInfo.areas[0].floors.length == 1) {
floorBtnss = ''
} else {
@@ -137,7 +145,7 @@
$(".main-part").append(floorInfo)
$("#line-total").html(total[0])
- listenChange();
+ // listenChange();
}
function changFloor(e) {
@@ -146,5 +154,5 @@
$(".main-part").append(floorInfo)
$("#line-total").empty()
$("#line-total").html(total[e])
- listenChange();
+ // listenChange();
}
\ No newline at end of file
--
Gitblit v1.9.1