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 | 298 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 191 insertions(+), 107 deletions(-)
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index b8d1815..f10bbbc 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,135 +1,219 @@
mapInfo = {
- "mapName": "GZYNWCS",
- "rackCount": 2,
- "crnCount": 1,
- "stbCount": 9,
+ "mapName": "ZJFNWCS",
+ "rackCount": 4,
+ "crnCount": 2,
+ "stbCount": 13,
"hpPosition": 0,
- "minBayNo": 2,
+ "minBayNo": 1,
"floors": 1,
"racks": [{
"type": "rack",
"id": "rack1",
- "top": 168,
- "left": 463,
- "width": 826,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 18
+ "top": 184,
+ "left": 163,
+ "width": 796,
+ "height": 25,
+ "minBayNo": 1,
+ "maxBayNo": 25
}, {
"type": "rack",
"id": "rack2",
- "top": 226,
- "left": 463,
- "width": 826,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 18
+ "top": 261,
+ "left": 163,
+ "width": 796,
+ "height": 25,
+ "minBayNo": 1,
+ "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_desc2",
- "text": "#2",
- "top": 253,
- "left": 1246,
- "width": 33,
+ "id": "lb_desc1",
+ "text": "#1",
+ "top": 125,
+ "left": 861,
+ "width": 30,
"height": 23
}, {
"type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 142,
- "left": 1249,
- "width": 30,
+ "id": "lb_desc16",
+ "text": "#4",
+ "top": 476,
+ "left": 858,
+ "width": 33,
"height": 23
}],
"crns": [{
"type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 199,
- "left": 606,
+ "id": "crn-3",
+ "text": "2",
+ "top": 387,
+ "left": 436,
"width": 93,
"height": 22
}, {
"type": "track",
- "id": "lb_track1",
+ "id": "lb_track4",
"text": "",
- "top": 210,
- "left": 386,
- "width": 950,
+ "top": 235,
+ "left": 142,
+ "width": 850,
"height": 2
+ }, {
+ "type": "track",
+ "id": "lb_track5",
+ "text": "",
+ "top": 395,
+ "left": 142,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-4",
+ "text": "1",
+ "top": 226,
+ "left": 436,
+ "width": 93,
+ "height": 22
}],
- "stns": [{
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 226,
- "left": 311,
- "width": 75,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 168,
- "left": 1291,
- "width": 57,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 226,
- "left": 387,
- "width": 74,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 226,
- "left": 235,
- "width": 75,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 168,
- "left": 361,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 168,
- "left": 159,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 226,
- "left": 1291,
- "width": 118,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 168,
- "left": 260,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 226,
- "left": 159,
- "width": 75,
- "height": 24
+ "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": 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