From e32ff68be04c9e2e3ab689c4494aefe5d3036400 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 11:12:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs
---
src/main/webapp/static/js/console.map.js | 459 ++++++++++++++++++---------------------------------------
1 files changed, 146 insertions(+), 313 deletions(-)
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index a9577c9..73d7504 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,215 +1,79 @@
mapInfo = {
- "mapName": "LKTWCS",
+ "mapName": "YKWCS",
"rackCount": 4,
"crnCount": 3,
"stbCount": 13,
- "hpPosition": 1,
+ "hpPosition": 0,
"minBayNo": 1,
"floors": 1,
- "racks": [{
- "type": "rack",
- "id": "rack2",
- "top": 146,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 194,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 215,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack1",
- "top": 125,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- },{
+ "racks": [ {
"type": "rack",
"id": "rack12",
- "top": 296,
- "left": 379,
- "width": 1072,
+ "top": 280,
+ "left": 529,
+ "width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack13",
- "top": 344,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack14",
- "top": 365,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
"id": "rack11",
- "top": 275,
- "left": 379,
- "width": 1072,
+ "top": 301,
+ "left": 529,
+ "width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- },{
- "type": "rack",
- "id": "rack22",
- "top": 446,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
- "id": "rack23",
- "top": 494,
- "left": 379,
- "width": 1072,
+ "id": "rack10",
+ "top": 349,
+ "left": 529,
+ "width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
- "id": "rack24",
- "top": 515,
- "left": 379,
- "width": 1072,
+ "id": "rack9",
+ "top": 370,
+ "left": 529,
+ "width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack21",
- "top": 425,
- "left": 379,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "minBayNo": 1,
+ "maxBayNo": 31
}],
"rackDescs": [{
"type": "rackDescs",
- "id": "lb_desc4",
- "text": "#4",
- "top": 215,
- "left": 348,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
"id": "lb_desc1",
+ "text": "#16",
+ "top": 167,
+ "left": 1810,
+ "width": 30,
+ "height": 0
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc2",
"text": "#1",
- "top": 125,
- "left": 348,
+ "top": 596,
+ "left": 1810,
"width": 30,
- "height": 23
- },{
- "type": "rackDescs",
- "id": "lb_desc14",
- "text": "#14",
- "top": 365,
- "left": 348,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc11",
- "text": "#11",
- "top": 275,
- "left": 348,
- "width": 30,
- "height": 23
- },{
- "type": "rackDescs",
- "id": "lb_desc24",
- "text": "#24",
- "top": 515,
- "left": 348,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc21",
- "text": "#21",
- "top": 425,
- "left": 348,
- "width": 30,
- "height": 23
+ "height": 0
}],
"crns": [{
"type": "track",
- "id": "lb_track1",
+ "id": "lb_track3",
"text": "",
- "top": 184,
- "left": 340,
- "width": 1200,
+ "top": 338,
+ "left": 490,
+ "width": 1300,
"height": 2
}, {
"type": "crane",
"id": "crn-1",
"text": "1",
- "top": 171,
- "left": 340,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 334,
- "left": 340,
- "width": 1200,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 321,
- "left": 340,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 484,
- "left": 340,
- "width": 1200,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 471,
- "left": 340,
+ "top": 325,
+ "left": 490,
"width": 93,
"height": 22
}],
@@ -224,156 +88,125 @@
"floors": [{
"type": "floor",
"id": "page_floor1",
- "text": "1搴�",
+ "text": "1F",
"top": 4,
"left": 22,
"width": 1819,
"height": 668,
"stns": [{
"type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 148,
- "left": 1452,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 148,
- "left": 1542,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 148,
- "left": 1632,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 196,
- "left": 1452,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 196,
- "left": 1542,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 196,
- "left": 1632,
- "width": 89,
- "height": 20
+ "id": "site-1112",
+ "text": "1112",
+ "top": 280,
+ "left": 580,
+ "width": 60,
+ "height": 40
},{
"type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 298,
- "left": 1452,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 298,
- "left": 1542,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 298,
- "left": 1632,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 346,
- "left": 1452,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 346,
- "left": 1542,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 346,
- "left": 1632,
- "width": 89,
- "height": 20
+ "id": "site-1111",
+ "text": "1111",
+ "top": 238,
+ "left": 580,
+ "width": 60,
+ "height": 40
},{
"type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 448,
- "left": 1452,
- "width": 89,
- "height": 20
- }, {
+ "id": "site-1114",
+ "text": "1114",
+ "top": 352,
+ "left": 1740,
+ "width": 60,
+ "height": 40
+ },{
"type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 448,
- "left": 1542,
- "width": 89,
- "height": 20
- }, {
+ "id": "site-1113",
+ "text": "1113",
+ "top": 394,
+ "left": 1740,
+ "width": 60,
+ "height": 40
+ }],
+ "barcode":[
+ {
+ "type": "barcode",
+ "id": "barcode-0",
+ "text": "",
+ "top": 210,
+ "left": 570,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-1",
+ "text": "",
+ "top": 436,
+ "left": 1730,
+ "width": 80,
+ "height": 20
+ }
+ ]
+ },{
+ "type": "floor",
+ "id": "page_floor2",
+ "text": "2F",
+ "top": 4,
+ "left": 22,
+ "width": 1819,
+ "height": 668,
+ "stns": [{
"type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 448,
- "left": 1632,
- "width": 89,
- "height": 20
- }, {
+ "id": "site-1122",
+ "text": "1122",
+ "top": 280,
+ "left": 580,
+ "width": 60,
+ "height": 40
+ },{
"type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 496,
- "left": 1452,
- "width": 89,
- "height": 20
- }, {
+ "id": "site-1121",
+ "text": "1121",
+ "top": 238,
+ "left": 580,
+ "width": 60,
+ "height": 40
+ },{
"type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 496,
- "left": 1542,
- "width": 89,
- "height": 20
- }, {
+ "id": "site-1124",
+ "text": "1124",
+ "top": 352,
+ "left": 1740,
+ "width": 60,
+ "height": 40
+ },{
"type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 496,
- "left": 1632,
- "width": 89,
- "height": 20
- }]
+ "id": "site-1123",
+ "text": "1123",
+ "top": 394,
+ "left": 1740,
+ "width": 60,
+ "height": 40
+ }],
+ "barcode":[
+ {
+ "type": "barcode",
+ "id": "barcode-2",
+ "text": "",
+ "top": 210,
+ "left": 570,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-3",
+ "text": "",
+ "top": 436,
+ "left": 1730,
+ "width": 80,
+ "height": 20
+ }
+ ]
}]
}]
}
\ No newline at end of file
--
Gitblit v1.9.1