From b42f93b96fbbdc10392905f86e4438f9cd6e236a Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 30 八月 2022 15:43:01 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/console.js | 61 +++++++++++++++++++++--------- src/main/webapp/static/js/console.map.js | 48 ++++++++++++------------ 2 files changed, 66 insertions(+), 43 deletions(-) diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js index 707d1fa..f731681 100644 --- a/src/main/webapp/static/js/console.js +++ b/src/main/webapp/static/js/console.js @@ -25,36 +25,59 @@ 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<35) { + 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 { - 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; - } + bNum = minBayNo + for (let j = 0; j < bLen; j++) { + bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>" + bays = bays + bay + bNum = bNum + interval; } - } rack = "<div class='rack' id='" + rackss[i].id + diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js index a946ae2..0fe152b 100644 --- a/src/main/webapp/static/js/console.map.js +++ b/src/main/webapp/static/js/console.map.js @@ -14,8 +14,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 30 + "minBayNo": 2, + "maxBayNo": 31 }, { "type": "rack", @@ -24,8 +24,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 30 + "minBayNo": 2, + "maxBayNo": 31 }, { "type": "rack", @@ -34,8 +34,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 30 + "minBayNo": 2, + "maxBayNo": 31 }, { "type": "rack", @@ -44,8 +44,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 30 + "minBayNo": 2, + "maxBayNo": 31 }, { "type": "rack", @@ -54,8 +54,8 @@ "left": 430, "width": 1088, "height": 24, - "minBayNo": 1, - "maxBayNo": 16 + "minBayNo": 2, + "maxBayNo": 17 }, { "type": "rack", @@ -64,8 +64,8 @@ "left": 430, "width": 1088, "height": 24, - "minBayNo": 1, - "maxBayNo": 16 + "minBayNo": 2, + "maxBayNo": 17 }, { "type": "rack", @@ -74,8 +74,8 @@ "left": 430, "width": 1088, "height": 24, - "minBayNo": 1, - "maxBayNo": 16 + "minBayNo": 2, + "maxBayNo": 17 }, { "type": "rack", @@ -84,8 +84,8 @@ "left": 430, "width": 1088, "height": 24, - "minBayNo": 1, - "maxBayNo": 16 + "minBayNo": 2, + "maxBayNo": 17 }, { "type": "rack", @@ -134,8 +134,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 23 + "minBayNo": 2, + "maxBayNo": 24 }, { "type": "rack", @@ -144,8 +144,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 23 + "minBayNo": 2, + "maxBayNo": 24 }, { "type": "rack", @@ -154,8 +154,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 23 + "minBayNo": 2, + "maxBayNo": 24 }, { "type": "rack", @@ -164,8 +164,8 @@ "left": 430, "width": 1020, "height": 24, - "minBayNo": 1, - "maxBayNo": 23 + "minBayNo": 2, + "maxBayNo": 24 }, ], "rackDescs": [ -- Gitblit v1.9.1