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.map.js | 425 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 279 insertions(+), 146 deletions(-)
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 0265aa2..a946ae2 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -127,153 +127,268 @@
"minBayNo": 2,
"maxBayNo": 64
},
+ {
+ "type": "rack",
+ "id": "rack13",
+ "top": 512,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 23
+ },
+ {
+ "type": "rack",
+ "id": "rack14",
+ "top": 538,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 23
+ },
+ {
+ "type": "rack",
+ "id": "rack15",
+ "top": 610,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 23
+ },
+ {
+ "type": "rack",
+ "id": "rack16",
+ "top": 636,
+ "left": 430,
+ "width": 1020,
+ "height": 24,
+ "minBayNo": 1,
+ "maxBayNo": 23
+ },
],
- "rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc12",
- "text": "#12",
- "top": 485,
- "left": 1530,
- "width": 41,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc11",
- "text": "#11",
- "top": 460,
- "left": 1530,
- "width": 38,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc10",
- "text": "#10",
- "top": 399,
- "left": 1530,
- "width": 42,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc9",
- "text": "#9",
- "top": 375,
- "left": 1530,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc8",
- "text": "#8",
- "top": 349,
- "left": 1530,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc7",
- "text": "#7",
- "top": 321,
- "left": 1530,
- "width": 32,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc6",
- "text": "#6",
- "top": 264,
- "left": 1530,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc5",
- "text": "#5",
- "top": 235,
- "left": 1530,
- "width": 32,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc4",
- "text": "#4",
- "top": 206,
- "left": 1460,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc3",
- "text": "#3",
- "top": 179,
- "left": 1460,
- "width": 32,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc2",
- "text": "#2",
- "top": 123,
- "left": 1460,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 95,
- "left": 1460,
- "width": 30,
- "height": 23
- }],
- "crns": [{
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 153,
- "left": 500,
- "width": 93,
- "height": 22
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 291,
- "left": 500,
- "width": 93,
- "height": 22
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 428,
- "left": 500,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 300,
- "left": 405,
- "width": 1130,
- "height": 2
- }, {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 438,
- "left": 405,
- "width": 1130,
- "height": 2
- }, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 164,
- "left": 405,
- "width": 1060,
- "height": 2
- }],
+ "rackDescs": [
+ {
+ "type": "rackDescs",
+ "id": "lb_desc1",
+ "text": "#1",
+ "top": 95,
+ "left": 1460,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc2",
+ "text": "#2",
+ "top": 123,
+ "left": 1460,
+ "width": 33,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc3",
+ "text": "#3",
+ "top": 179,
+ "left": 1460,
+ "width": 32,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc4",
+ "text": "#4",
+ "top": 206,
+ "left": 1460,
+ "width": 33,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc5",
+ "text": "#5",
+ "top": 235,
+ "left": 1530,
+ "width": 32,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc6",
+ "text": "#6",
+ "top": 264,
+ "left": 1530,
+ "width": 33,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc7",
+ "text": "#7",
+ "top": 321,
+ "left": 1530,
+ "width": 32,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc8",
+ "text": "#8",
+ "top": 349,
+ "left": 1530,
+ "width": 33,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc9",
+ "text": "#9",
+ "top": 375,
+ "left": 1530,
+ "width": 33,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc10",
+ "text": "#10",
+ "top": 399,
+ "left": 1530,
+ "width": 42,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc11",
+ "text": "#11",
+ "top": 460,
+ "left": 1530,
+ "width": 38,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc12",
+ "text": "#12",
+ "top": 485,
+ "left": 1530,
+ "width": 41,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc13",
+ "text": "#13",
+ "top": 514,
+ "left": 1460,
+ "width": 41,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc14",
+ "text": "#14",
+ "top": 540,
+ "left": 1460,
+ "width": 41,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc15",
+ "text": "#15",
+ "top": 610,
+ "left": 1460,
+ "width": 41,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc16",
+ "text": "#16",
+ "top": 636,
+ "left": 1460,
+ "width": 41,
+ "height": 23
+ },
+ ],
+ "crns": [
+ {
+ "type": "crane",
+ "id": "crn-1",
+ "text": "1",
+ "top": 153,
+ "left": 500,
+ "width": 93,
+ "height": 22
+ },
+ {
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 291,
+ "left": 500,
+ "width": 93,
+ "height": 22
+ },
+ {
+ "type": "crane",
+ "id": "crn-3",
+ "text": "3",
+ "top": 428,
+ "left": 500,
+ "width": 93,
+ "height": 22
+ },
+ {
+ "type": "crane",
+ "id": "crn-4",
+ "text": "4",
+ "top": 574,
+ "left": 500,
+ "width": 93,
+ "height": 22
+ },
+ {
+ "type": "track",
+ "id": "lb_track1",
+ "text": "",
+ "top": 164,
+ "left": 405,
+ "width": 1060,
+ "height": 2
+ },
+ {
+ "type": "track",
+ "id": "lb_track2",
+ "text": "",
+ "top": 300,
+ "left": 405,
+ "width": 1130,
+ "height": 2
+ },
+ {
+ "type": "track",
+ "id": "lb_track3",
+ "text": "",
+ "top": 438,
+ "left": 405,
+ "width": 1130,
+ "height": 2
+ },
+ {
+ "type": "track",
+ "id": "lb_track4",
+ "text": "",
+ "top": 586,
+ "left": 405,
+ "width": 1130,
+ "height": 2
+ },
+
+ ],
"stns": [{
"type": "stn",
"id": "site-306",
@@ -518,6 +633,24 @@
"left": 225,
"width": 100,
"height": 24
+ },
+ {
+ "type": "stn",
+ "id": "site-401",
+ "text": "401",
+ "top": 538,
+ "left": 326,
+ "width": 100,
+ "height": 24
+ },
+ {
+ "type": "stn",
+ "id": "site-402",
+ "text": "402",
+ "top": 538,
+ "left": 224,
+ "width": 100,
+ "height": 24
}
]
}
--
Gitblit v1.9.1