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 | 783 ++++++++-----------------------------------------------
1 files changed, 114 insertions(+), 669 deletions(-)
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 0460771..73d7504 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -6,51 +6,15 @@
"hpPosition": 0,
"minBayNo": 1,
"floors": 1,
- "racks": [{
- "type": "rack",
- "id": "rack16",
- "top": 167,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack15",
- "top": 188,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack14",
- "top": 236,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack13",
- "top": 257,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
+ "racks": [ {
"type": "rack",
"id": "rack12",
"top": 280,
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
"id": "rack11",
@@ -58,8 +22,8 @@
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
"id": "rack10",
@@ -67,8 +31,8 @@
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
"id": "rack9",
@@ -76,80 +40,8 @@
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 393,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 414,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 462,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack5",
- "top": 483,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 506,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 527,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 575,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack1",
- "top": 596,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}],
"rackDescs": [{
"type": "rackDescs",
@@ -158,7 +50,7 @@
"top": 167,
"left": 1810,
"width": 30,
- "height": 23
+ "height": 0
}, {
"type": "rackDescs",
"id": "lb_desc2",
@@ -166,25 +58,9 @@
"top": 596,
"left": 1810,
"width": 30,
- "height": 23
+ "height": 0
}],
"crns": [{
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 226,
- "left": 490,
- "width": 1300,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-4",
- "text": "4",
- "top": 213,
- "left": 490,
- "width": 93,
- "height": 22
- },{
"type": "track",
"id": "lb_track3",
"text": "",
@@ -194,41 +70,9 @@
"height": 2
}, {
"type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 325,
- "left": 490,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 451,
- "left": 490,
- "width": 1300,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 438,
- "left": 490,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 564,
- "left": 490,
- "width": 1300,
- "height": 2
- }, {
- "type": "crane",
"id": "crn-1",
"text": "1",
- "top": 553,
+ "top": 325,
"left": 490,
"width": 93,
"height": 22
@@ -244,524 +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-148",
- "text": "148",
- "top": 190,
- "left": 468,
+ "id": "site-1112",
+ "text": "1112",
+ "top": 280,
+ "left": 580,
"width": 60,
- "height": 19
- }, {
+ "height": 40
+ },{
"type": "stn",
- "id": "site-147",
- "text": "147",
- "top": 190,
- "left": 406,
+ "id": "site-1111",
+ "text": "1111",
+ "top": 238,
+ "left": 580,
"width": 60,
- "height": 19
- }, {
+ "height": 40
+ },{
"type": "stn",
- "id": "site-146",
- "text": "146",
- "top": 190,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-149",
- "text": "149",
- "top": 190,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-150",
- "text": "150",
- "top": 169,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-151",
- "text": "151",
- "top": 148,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-153",
- "text": "153",
- "top": 148,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-152",
- "text": "152",
- "top": 148,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-154",
- "text": "154",
- "top": 127,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-155",
- "text": "155",
- "top": 106.5,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-157",
- "text": "157",
- "top": 106.5,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-156",
- "text": "156",
- "top": 106.5,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-158",
- "text": "158",
- "top": 85.5,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-159",
- "text": "159",
- "top": 64.5,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-160",
- "text": "160",
- "top": 64.5,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-161",
- "text": "161",
- "top": 64.5,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-145",
- "text": "145",
- "top": 211,
- "left": 344.5,
- "width": 60,
- "height": 26
- }, {
- "type": "stn",
- "id": "site-142",
- "text": "142",
- "top": 239,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-143",
- "text": "143",
- "top": 239,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 239,
- "left": 468,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-141",
- "text": "141",
- "top": 260,
- "left": 344.5,
- "width": 60,
- "height": 42
- }, {
- "type": "stn",
- "id": "site-139",
- "text": "139",
- "top": 304,
- "left": 406,
- "width": 120,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-138",
- "text": "138",
- "top": 304,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-134",
- "text": "134",
+ "id": "site-1114",
+ "text": "1114",
"top": 352,
- "left": 344.5,
+ "left": 1740,
"width": 60,
- "height": 19
- }, {
+ "height": 40
+ },{
"type": "stn",
- "id": "site-135",
- "text": "135",
+ "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-1122",
+ "text": "1122",
+ "top": 280,
+ "left": 580,
+ "width": 60,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1121",
+ "text": "1121",
+ "top": 238,
+ "left": 580,
+ "width": 60,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1124",
+ "text": "1124",
"top": 352,
- "left": 406,
- "width": 120,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-137",
- "text": "137",
- "top": 324.5,
- "left": 344.5,
+ "left": 1740,
"width": 60,
- "height": 25.5
- }, {
+ "height": 40
+ },{
"type": "stn",
- "id": "site-133",
- "text": "133",
- "top": 373,
- "left": 344.5,
+ "id": "site-1123",
+ "text": "1123",
+ "top": 394,
+ "left": 1740,
"width": 60,
- "height": 42.5
- }, {
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 417,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-131",
- "text": "131",
- "top": 417,
- "left": 406,
- "width": 120,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-129",
- "text": "129",
- "top": 438,
- "left": 344.5,
- "width": 60,
- "height": 25
- }, {
- "type": "stn",
- "id": "site-126",
- "text": "126",
- "top": 464.5,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-127",
- "text": "127",
- "top": 464.5,
- "left": 406,
- "width": 120,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-125",
- "text": "125",
- "top": 485,
- "left": 344.5,
- "width": 60,
- "height": 42.5
- }, {
- "type": "stn",
- "id": "site-124",
- "text": "124",
- "top": 529,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 529,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 529,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 529,
- "left": 468,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 550,
- "left": 344.5,
- "width": 60,
- "height": 25
- }, {
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 577,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 577,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 577,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 577,
- "left": 468,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 598,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 620,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 620,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "track",
- "id": "lb_trCart21",
- "text": "",
- "top": 65,
- "left": 226,
- "width": 6,
- "height": 742
- }, {
- "type": "track",
- "id": "lb_trCart22",
- "text": "",
- "top": 65,
- "left": 270,
- "width": 6,
- "height": 742
- }, {
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 398,
- "left": 220,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 698,
- "left": 220,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 642,
- "left": 283,
- "width": 184,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-999",
- "text": "澶囩敤PGV銆丷GV缁翠慨鍖�",
- "top": 642,
- "left": 283,
- "width": 184,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 663,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 663,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 663,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 684,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 705,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 705,
- "left": 283,
- "width": 122,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 727,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 727,
- "left": 283,
- "width": 122,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 749,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 771,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 771,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 771,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 792,
- "left": 283,
- "width": 184,
- "height": 19
- }]
+ "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