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 | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 611e6b7..af7cba0 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -25,26 +25,58 @@
for (let i = 0;i < rackss.length;i++) {
let bay ='' // 鍗曚釜搴撲綅
let bays = '' // 搴撲綅闆嗗悎
- let bayWidth = rackss[i].width / (rackss[i].maxBayNo / rackss[i].minBayNo)
let maxBayNo = rackss[i].maxBayNo // 鏈�澶у簱浣嶅彿
let minBayNo = rackss[i].minBayNo // 鏈�灏忓簱浣嶅彿
- let bLen = maxBayNo / minBayNo // 搴撲綅涓暟
+ let bLen
+ let interval // 闂撮殧鏁�
+
+ if (maxBayNo < 37) {
+ interval = 1;
+ bLen = maxBayNo / interval; // 搴撲綅涓暟
+ } else {
+ interval = 2;
+ bLen = maxBayNo / interval; // 搴撲綅涓暟
+ }
+ let bayWidth // 鍗曚釜搴撲綅瀹藉害
let bNum // 搴撲綅鍙风爜
- // hpPosition 0 琛ㄧず璐ф灦搴忓彿 宸�->鍙� 1 琛ㄧず璐ф灦搴忓彿 鍙�->宸�
+
+ if (minBayNo % 2 == 0) { // 浠�2寮�濮�
+ if(interval == 1) {
+ bLen = bLen - 1
+ } else if (interval == 2) {
+ if (maxBayNo % 2 == 0) { // 鍋舵暟
+ bLen = bLen
+ } else { // 濂囨暟
+ maxBayNo = maxBayNo + 1
+ bLen = maxBayNo / interval // 搴撲綅涓暟
+ }
+ }
+ } else { // 浠�1寮�濮�
+ if(interval == 1) {
+ bLen = bLen
+ } else if (interval == 2) {
+ if (maxBayNo % 2 == 0) { // 鍋舵暟
+ bLen = bLen
+ } else { // 濂囨暟
+ bLen = bLen + 1
+ }
+ }
+ }
+ bayWidth = rackss[i].width / bLen
+ // hpPosition 0 琛ㄧず璐ф灦搴忓彿 宸�->鍙� 1 琛ㄧず璐ф灦搴忓彿 宸�<-鍙�
if (mapInfo.hpPosition == 1) {
bNum = maxBayNo
for (let j = bLen; j > 0; j--) {
bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
bays = bays + bay
- bNum = bNum - minBayNo;
+ bNum = bNum - interval;
}
}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;
+ bNum = bNum + interval;
}
}
@@ -57,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") {
@@ -90,13 +122,14 @@
}
// 妤煎眰
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>"
- if (areas.length = 1) {
+ if (mapInfo.areas[0].floors.length == 1) {
floorBtnss = ''
} else {
floorBtnss = floorBtnss + floorBtn
@@ -135,7 +168,7 @@
$(".main-part").append(floorInfo)
$("#line-total").html(total[0])
- listenChange();
+ // listenChange();
}
function changFloor(e) {
@@ -144,5 +177,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