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 | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 7ddda45..707d1fa 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -26,7 +26,6 @@
let bay ='' // 鍗曚釜搴撲綅
let bays = '' // 搴撲綅闆嗗悎
let bayWidth = rackss[i].width / (rackss[i].maxBayNo / rackss[i].minBayNo)
- console.log(bayWidth)
let maxBayNo = rackss[i].maxBayNo // 鏈�澶у簱浣嶅彿
let minBayNo = rackss[i].minBayNo // 鏈�灏忓簱浣嶅彿
let bLen = maxBayNo / minBayNo // 搴撲綅涓暟
@@ -40,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 +
@@ -91,13 +99,18 @@
}
// 妤煎眰
for (let i = 0; i < areas.length;i++) {
+
let stnss = areas[i].stns
let floor = areas[i].text
floorId = areas[i].id
var position = (i+1)*100
floorBtn =
"<button class='floorBtn btn-16' onclick='changFloor("+i+")' style='top: "+position+"px;'>" + floor +"</button>"
- floorBtnss = floorBtnss + floorBtn
+ if (mapInfo.areas[0].floors.length == 1) {
+ floorBtnss = ''
+ } else {
+ floorBtnss = floorBtnss + floorBtn
+ }
// 姣忓眰鐨� 杈撻�佺嚎绔欑偣
var index = i
var n = 1
@@ -132,7 +145,7 @@
$(".main-part").append(floorInfo)
$("#line-total").html(total[0])
- listenChange();
+ // listenChange();
}
function changFloor(e) {
@@ -141,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