From 72359bb6e10b4a863b5f9faac97bc8d49b85d10c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 27 八月 2022 16:02:39 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/console.js | 21 +++-
src/main/webapp/static/js/console.map.js | 231 ++++++++++++++++++++++++---------------------
2 files changed, 137 insertions(+), 115 deletions(-)
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 34af77e..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 +
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 1c0847e..0265aa2 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -6,115 +6,128 @@
"hpPosition": 0,
"minBayNo": 2,
"floors": 1,
- "racks": [{
- "type": "rack",
- "id": "rack12",
- "top": 484,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- }, {
- "type": "rack",
- "id": "rack11",
- "top": 458,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- }, {
- "type": "rack",
- "id": "rack10",
- "top": 399,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- }, {
- "type": "rack",
- "id": "rack9",
- "top": 373,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 344,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 318,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 263,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
- }, {
- "type": "rack",
- "id": "rack5",
- "top": 237,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 180,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
- }, {
- "type": "rack",
- "id": "rack1",
- "top": 97,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 207,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 123,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
- }],
+ "racks": [
+ {
+ "type": "rack",
+ "id": "rack1",
+ "top": 97,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 30
+ },
+ {
+ "type": "rack",
+ "id": "rack2",
+ "top": 123,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 30
+ },
+ {
+ "type": "rack",
+ "id": "rack3",
+ "top": 180,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 30
+ },
+ {
+ "type": "rack",
+ "id": "rack4",
+ "top": 207,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 30
+ },
+ {
+ "type": "rack",
+ "id": "rack5",
+ "top": 237,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 16
+ },
+ {
+ "type": "rack",
+ "id": "rack6",
+ "top": 263,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 16
+ },
+ {
+ "type": "rack",
+ "id": "rack7",
+ "top": 318,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 16
+ },
+ {
+ "type": "rack",
+ "id": "rack8",
+ "top": 344,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 16
+ },
+ {
+ "type": "rack",
+ "id": "rack9",
+ "top": 373,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 2,
+ "maxBayNo": 64
+ },
+ {
+ "type": "rack",
+ "id": "rack10",
+ "top": 399,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 2,
+ "maxBayNo": 64
+ },
+ {
+ "type": "rack",
+ "id": "rack11",
+ "top": 458,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 2,
+ "maxBayNo": 64
+ },
+ {
+ "type": "rack",
+ "id": "rack12",
+ "top": 484,
+ "left": 430,
+ "width": 1088,
+ "height": 24,
+ "minBayNo": 2,
+ "maxBayNo": 64
+ },
+ ],
"rackDescs": [{
"type": "rackDescs",
"id": "lb_desc12",
--
Gitblit v1.9.1