From 2082845f1a06a552a39ddd62fee3887dd6854c67 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 09 十月 2024 13:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpswcs' into phpswcs
---
src/main/webapp/static/js/console.map.js | 1107 +++++++++++++++++++++++++++++----------------------------
1 files changed, 568 insertions(+), 539 deletions(-)
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 454caa5..6f75c5c 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -4,550 +4,579 @@
"crnCount": 3,
"stbCount": 39,
"hpPosition": 1,
- "minBayNo": 1,
+ "minBayNo": 2,
"floors": 3,
- "racks": [
- {
- "type": "rack",
- "id": "rack6",
- "top": 344,
- "left": 193,
- "width": 796,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 35
- },
- {
- "type": "rack",
- "id": "rack5",
- "top": 284,
- "left": 193,
- "width": 796,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 35
- },
- {
- "type": "rack",
- "id": "rack4",
- "top": 260,
- "left": 193,
- "width": 796,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 35
- },
- {
- "type": "rack",
- "id": "rack1",
- "top": 119,
- "left": 193,
- "width": 796,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 35
- },
- {
- "type": "rack",
- "id": "rack2",
- "top": 176,
- "left": 193,
- "width": 796,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 35
- },
- {
- "type": "rack",
- "id": "rack3",
- "top": 200,
- "left": 193,
- "width": 796,
- "height": 23,
- "minBayNo": 1,
- "maxBayNo": 35
- }
- ],
- "rackDescs": [
- {
- "type": "rackDescs",
- "id": "lb_desc16",
- "text": "#6",
- "top": 344,
- "left": 138,
- "width": 33,
- "height": 23
- }
- ],
- "crns": [
- {
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 97,
- "left": 1090,
- "width": 3,
- "height": 290
- },
- {
- "type": "track",
- "id": "lb_track5",
- "text": "",
- "top": 97,
- "left": 1119,
- "width": 3,
- "height": 290
- },
- {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 316,
- "left": 466,
- "width": 93,
- "height": 22
- },
- {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 327,
- "left": 172,
- "width": 850,
- "height": 2
- },
- {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 232,
- "left": 466,
- "width": 93,
- "height": 22
- },
- {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 160,
- "left": 177,
- "width": 850,
- "height": 2
- },
- {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 243,
- "left": 172,
- "width": 850,
- "height": 2
- },
- {
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 151,
- "left": 471,
- "width": 93,
- "height": 22
- }
- ],
- "areas": [
- {
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 66,
- "left": 80,
- "width": 1252,
- "height": 654,
- "floors": [
+ "racks": [{
+ "type": "rack",
+ "id": "rack6",
+ "top": 344,
+ "left": 193,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 35
+ }, {
+ "type": "rack",
+ "id": "rack5",
+ "top": 284,
+ "left": 193,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 35
+ }, {
+ "type": "rack",
+ "id": "rack4",
+ "top": 260,
+ "left": 193,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 35
+ }, {
+ "type": "rack",
+ "id": "rack1",
+ "top": 119,
+ "left": 193,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 35
+ }, {
+ "type": "rack",
+ "id": "rack2",
+ "top": 176,
+ "left": 193,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 35
+ }, {
+ "type": "rack",
+ "id": "rack3",
+ "top": 200,
+ "left": 193,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 35
+ }],
+ "rackDescs": [{
+ "type": "rackDescs",
+ "id": "lb_desc17",
+ "text": "#6",
+ "top": 119,
+ "left": 157,
+ "width": 30,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc16",
+ "text": "#1",
+ "top": 344,
+ "left": 154,
+ "width": 33,
+ "height": 23
+ }],
+ "crns": [{
+ "type": "track",
+ "id": "lb_track4",
+ "text": "",
+ "top": 97,
+ "left": 1090,
+ "width": 3,
+ "height": 290
+ }, {
+ "type": "track",
+ "id": "lb_track5",
+ "text": "",
+ "top": 97,
+ "left": 1119,
+ "width": 3,
+ "height": 290
+ }, {
+ "type": "crane",
+ "id": "crn-1",
+ "text": "1",
+ "top": 316,
+ "left": 466,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "track",
+ "id": "lb_track3",
+ "text": "",
+ "top": 327,
+ "left": 172,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 232,
+ "left": 466,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "track",
+ "id": "lb_track1",
+ "text": "",
+ "top": 160,
+ "left": 177,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "track",
+ "id": "lb_track2",
+ "text": "",
+ "top": 243,
+ "left": 172,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-3",
+ "text": "3",
+ "top": 151,
+ "left": 471,
+ "width": 93,
+ "height": 22
+ }],
+ "areas": [{
+ "type": "Control_floor",
+ "id": "tabControl_floor1",
+ "text": "妤煎眰",
+ "top": 66,
+ "left": 80,
+ "width": 1267,
+ "height": 666,
+ "floors": [{
+ "type": "floor",
+ "id": "page_floor1",
+ "text": "1F",
+ "top": 4,
+ "left": 22,
+ "width": 1241,
+ "height": 658,
+ "stns": [{
+ "type": "stn",
+ "id": "site-100",
+ "text": "100",
+ "top": 176,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-102",
+ "text": "102",
+ "top": 237,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-101",
+ "text": "101",
+ "top": 176,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-112",
+ "text": "112",
+ "top": 176,
+ "left": 1072,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-105",
+ "text": "105",
+ "top": 284,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-103",
+ "text": "103",
+ "top": 237,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-110",
+ "text": "110",
+ "top": 284,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-108",
+ "text": "108",
+ "top": 200,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-109",
+ "text": "109",
+ "top": 260,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-104",
+ "text": "104",
+ "top": 284,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-107",
+ "text": "107",
+ "top": 176,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-106",
+ "text": "106",
+ "top": 119,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-111",
+ "text": "111",
+ "top": 344,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }],
+ "barcode": [
{
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 22,
- "width": 1226,
- "height": 646,
- "stns": [
- {
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 176,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 237,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 176,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 154,
- "left": 1073,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 284,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 237,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 284,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 200,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 260,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 284,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 176,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 119,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 344,
- "left": 991,
- "width": 80,
- "height": 23
- }
- ]
+ "type": "barcode",
+ "id": "barcode-1",
+ "text": "",
+ "top": 153,
+ "left": 1153,
+ "width": 80,
+ "height": 20
},
{
- "type": "floor",
- "id": "page_floor2",
- "text": "2F",
- "top": 4,
- "left": 22,
- "width": 1226,
- "height": 646,
- "stns": [
- {
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 176,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 237,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 176,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-212",
- "text": "212",
- "top": 154,
- "left": 1073,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 284,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 237,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-210",
- "text": "210",
- "top": 284,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-208",
- "text": "208",
- "top": 200,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-209",
- "text": "209",
- "top": 260,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 284,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-207",
- "text": "207",
- "top": 176,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 119,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-211",
- "text": "211",
- "top": 344,
- "left": 991,
- "width": 80,
- "height": 23
- }
- ]
+ "type": "barcode",
+ "id": "barcode-2",
+ "text": "",
+ "top": 214,
+ "left": 1153,
+ "width": 80,
+ "height": 20
},
{
- "type": "floor",
- "id": "page_floor3",
- "text": "3F",
- "top": 4,
- "left": 22,
- "width": 1226,
- "height": 646,
- "stns": [
- {
- "type": "stn",
- "id": "site-300",
- "text": "300",
- "top": 176,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 237,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 176,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-312",
- "text": "312",
- "top": 154,
- "left": 1073,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 284,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 237,
- "left": 1140,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-310",
- "text": "310",
- "top": 284,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-308",
- "text": "308",
- "top": 200,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-309",
- "text": "309",
- "top": 260,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 284,
- "left": 1206,
- "width": 65,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-307",
- "text": "307",
- "top": 176,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 119,
- "left": 991,
- "width": 80,
- "height": 23
- },
- {
- "type": "stn",
- "id": "site-311",
- "text": "311",
- "top": 344,
- "left": 991,
- "width": 80,
- "height": 23
- }
- ]
- }
+ "type": "barcode",
+ "id": "barcode-3",
+ "text": "",
+ "top": 261,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
]
- }
- ]
+ }, {
+ "type": "floor",
+ "id": "page_floor2",
+ "text": "2F",
+ "top": 4,
+ "left": 22,
+ "width": 1241,
+ "height": 658,
+ "stns": [{
+ "type": "stn",
+ "id": "site-200",
+ "text": "200",
+ "top": 176,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-202",
+ "text": "202",
+ "top": 237,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-201",
+ "text": "201",
+ "top": 176,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-212",
+ "text": "212",
+ "top": 176,
+ "left": 1072,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-205",
+ "text": "205",
+ "top": 284,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-203",
+ "text": "203",
+ "top": 237,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-210",
+ "text": "210",
+ "top": 284,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-208",
+ "text": "208",
+ "top": 200,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-209",
+ "text": "209",
+ "top": 260,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-204",
+ "text": "204",
+ "top": 284,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-207",
+ "text": "207",
+ "top": 176,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-206",
+ "text": "206",
+ "top": 119,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-211",
+ "text": "211",
+ "top": 344,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }],
+ "barcode": [
+ {
+ "type": "barcode",
+ "id": "barcode-4",
+ "text": "",
+ "top": 153,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-5",
+ "text": "",
+ "top": 214,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-6",
+ "text": "",
+ "top": 261,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ ]
+ }, {
+ "type": "floor",
+ "id": "page_floor3",
+ "text": "3F",
+ "top": 4,
+ "left": 22,
+ "width": 1241,
+ "height": 658,
+ "stns": [{
+ "type": "stn",
+ "id": "site-300",
+ "text": "300",
+ "top": 176,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-302",
+ "text": "302",
+ "top": 237,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-301",
+ "text": "301",
+ "top": 176,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-312",
+ "text": "312",
+ "top": 176,
+ "left": 1072,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-305",
+ "text": "305",
+ "top": 284,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-303",
+ "text": "303",
+ "top": 237,
+ "left": 1154,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-310",
+ "text": "310",
+ "top": 284,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-308",
+ "text": "308",
+ "top": 200,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-309",
+ "text": "309",
+ "top": 260,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-304",
+ "text": "304",
+ "top": 284,
+ "left": 1236,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-307",
+ "text": "307",
+ "top": 176,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-306",
+ "text": "306",
+ "top": 119,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-311",
+ "text": "311",
+ "top": 344,
+ "left": 991,
+ "width": 80,
+ "height": 23
+ }],
+ "barcode": [
+ {
+ "type": "barcode",
+ "id": "barcode-7",
+ "text": "",
+ "top": 153,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-8",
+ "text": "",
+ "top": 214,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-9",
+ "text": "",
+ "top": 261,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ ]
+ }]
+ }]
}
\ No newline at end of file
--
Gitblit v1.9.1