From 8730e273d5dbf1de6438c12882e69549cf44faf3 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 13 二月 2023 17:29:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/webapp/static/js/console.map.js | 662 +++++++++++++++---------------------------------------
1 files changed, 183 insertions(+), 479 deletions(-)
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 70c6e2b..f10bbbc 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,515 +1,219 @@
mapInfo = {
- "mapName": "HYLYWCS",
- "rackCount": 12,
- "crnCount": 3,
- "stbCount": 16,
+ "mapName": "ZJFNWCS",
+ "rackCount": 4,
+ "crnCount": 2,
+ "stbCount": 13,
"hpPosition": 0,
- "minBayNo": 2,
+ "minBayNo": 1,
"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,
+ "top": 184,
+ "left": 163,
+ "width": 796,
+ "height": 25,
"minBayNo": 1,
- "maxBayNo": 30
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 207,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
+ "maxBayNo": 25
}, {
"type": "rack",
"id": "rack2",
- "top": 123,
- "left": 430,
- "width": 1020,
- "height": 24,
+ "top": 261,
+ "left": 163,
+ "width": 796,
+ "height": 25,
"minBayNo": 1,
- "maxBayNo": 30
+ "maxBayNo": 25
+ }, {
+ "type": "rack",
+ "id": "rack3",
+ "top": 349,
+ "left": 163,
+ "width": 796,
+ "height": 25,
+ "minBayNo": 1,
+ "maxBayNo": 25
+ }, {
+ "type": "rack",
+ "id": "rack4",
+ "top": 418,
+ "left": 163,
+ "width": 796,
+ "height": 25,
+ "minBayNo": 1,
+ "maxBayNo": 25
}],
"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,
+ "top": 125,
+ "left": 861,
"width": 30,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc16",
+ "text": "#4",
+ "top": 476,
+ "left": 858,
+ "width": 33,
"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,
+ "text": "2",
+ "top": 387,
+ "left": 436,
"width": 93,
"height": 22
}, {
"type": "track",
- "id": "lb_track2",
+ "id": "lb_track4",
"text": "",
- "top": 300,
- "left": 380,
- "width": 1180,
+ "top": 235,
+ "left": 142,
+ "width": 850,
"height": 2
}, {
"type": "track",
- "id": "lb_track3",
+ "id": "lb_track5",
"text": "",
- "top": 438,
- "left": 359,
- "width": 1200,
+ "top": 395,
+ "left": 142,
+ "width": 850,
"height": 2
}, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 164,
- "left": 350,
- "width": 1112,
- "height": 2
+ "type": "crane",
+ "id": "crn-4",
+ "text": "1",
+ "top": 226,
+ "left": 436,
+ "width": 93,
+ "height": 22
}],
- "stns": [{
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 458,
- "left": 211,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 399,
- "left": 211,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 458,
- "left": 345,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 458,
- "left": 278,
- "width": 66,
- "height": 24
- },{
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 262,
- "left": 202,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 399,
- "left": 278,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 318,
- "left": 303,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 318,
- "left": 202,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 262,
- "left": 303,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 101,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 124,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 399,
- "left": 345,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 122,
- "left": 154,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 181,
- "left": 225,
- "width": 100,
- "height": 24
- }],
- "areas": [
- {
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 286,
+ "areas": [{
+ "type": "Control_floor",
+ "id": "tabControl_floor1",
+ "text": "妤煎眰",
+ "top": 68,
+ "left": 80,
+ "width": 1405,
+ "height": 664,
+ "floors": [{
+ "type": "floor",
+ "id": "page_floor1",
+ "text": "1F",
+ "top": 4,
"left": 22,
- "width": 302,
- "height": 403,
- "floors": [
- {
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 22,
- "width": 276,
- "height": 395,
- "stns": [
- {
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 458,
- "left": 225,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 399,
- "left": 225,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 458,
- "left": 360,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 458,
- "left": 293,
- "width": 66,
- "height": 24
- },{
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 264,
- "left": 225,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 399,
- "left": 293,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 320,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 320,
- "left": 225,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 264,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 181,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 124,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 399,
- "left": 360,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 124,
- "left": 225,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 181,
- "left": 225,
- "width": 100,
- "height": 24
- }
- ]
- }
- ]
- }
- ]
-
+ "width": 1379,
+ "height": 656,
+ "stns": [{
+ "type": "stn",
+ "id": "site-111",
+ "text": "111",
+ "top": 212,
+ "left": 1126,
+ "width": 65,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-110",
+ "text": "110",
+ "top": 212,
+ "left": 1193,
+ "width": 65,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-109",
+ "text": "109",
+ "top": 184,
+ "left": 1126,
+ "width": 65,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-112",
+ "text": "112",
+ "top": 210,
+ "left": 1044,
+ "width": 80,
+ "height": 50
+ }, {
+ "type": "stn",
+ "id": "site-113",
+ "text": "113",
+ "top": 288,
+ "left": 1044,
+ "width": 80,
+ "height": 59
+ }, {
+ "type": "stn",
+ "id": "site-102",
+ "text": "102",
+ "top": 261,
+ "left": 1044,
+ "width": 80,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-108",
+ "text": "108",
+ "top": 418,
+ "left": 962,
+ "width": 80,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-107",
+ "text": "107",
+ "top": 418,
+ "left": 1044,
+ "width": 80,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-105",
+ "text": "105",
+ "top": 349,
+ "left": 962,
+ "width": 80,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-104",
+ "text": "104",
+ "top": 349,
+ "left": 1044,
+ "width": 80,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-103",
+ "text": "103",
+ "top": 261,
+ "left": 962,
+ "width": 80,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-101",
+ "text": "101",
+ "top": 184,
+ "left": 962,
+ "width": 80,
+ "height": 25
+ }, {
+ "type": "stn",
+ "id": "site-100",
+ "text": "100",
+ "top": 184,
+ "left": 1044,
+ "width": 80,
+ "height": 25
+ }]
+ }]
+ }]
}
\ No newline at end of file
--
Gitblit v1.9.1