From b851f6f0af99ed69ec5994ffdac2025756807f49 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 02 十二月 2024 16:27:14 +0800
Subject: [PATCH] 优化LocMastMapper.xml中bay条件查询逻辑
---
src/main/webapp/static/js/console.map.js | 423 +++++++++++++++-------------------------------------
1 files changed, 124 insertions(+), 299 deletions(-)
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index c84b19f..bee218b 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,215 +1,95 @@
mapInfo = {
- "mapName": "LKTWCS",
- "rackCount": 18,
- "crnCount": 7,
- "stbCount": 77,
+ "mapName": "WCS",
+ "rackCount": 4,
+ "crnCount": 1,
+ "stbCount": 10,
"hpPosition": 0,
- "minBayNo": 2,
- "floors": 1,
+ "minBayNo": 1,
+ "floors": 2,
"racks": [{
"type": "rack",
- "id": "rack2",
- "top": 146,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 194,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
"id": "rack4",
- "top": 215,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "top": 351,
+ "left": 577,
+ "width": 528,
+ "height": 32,
+ "minBayNo": 1,
+ "maxBayNo": 7
}, {
"type": "rack",
"id": "rack1",
- "top": 125,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- },{
- "type": "rack",
- "id": "rack12",
- "top": 296,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "top": 200,
+ "left": 577,
+ "width": 528,
+ "height": 32,
+ "minBayNo": 1,
+ "maxBayNo": 7
}, {
"type": "rack",
- "id": "rack13",
- "top": 344,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "id": "rack2",
+ "top": 234,
+ "left": 577,
+ "width": 528,
+ "height": 32,
+ "minBayNo": 1,
+ "maxBayNo": 7
}, {
"type": "rack",
- "id": "rack14",
- "top": 365,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack11",
- "top": 275,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- },{
- "type": "rack",
- "id": "rack22",
- "top": 446,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack23",
- "top": 494,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack24",
- "top": 515,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
- }, {
- "type": "rack",
- "id": "rack21",
- "top": 425,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 47
+ "id": "rack3",
+ "top": 317,
+ "left": 577,
+ "width": 528,
+ "height": 32,
+ "minBayNo": 1,
+ "maxBayNo": 7
}],
"rackDescs": [{
"type": "rackDescs",
- "id": "lb_desc4",
- "text": "#4",
- "top": 215,
- "left": 1721,
+ "id": "lb_desc2",
+ "text": "#2",
+ "top": 237,
+ "left": 1154,
"width": 33,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc3",
+ "text": "#3",
+ "top": 317,
+ "left": 1154,
+ "width": 32,
"height": 23
}, {
"type": "rackDescs",
"id": "lb_desc1",
"text": "#1",
- "top": 125,
- "left": 1721,
+ "top": 200,
+ "left": 1154,
"width": 30,
- "height": 23
- },{
- "type": "rackDescs",
- "id": "lb_desc14",
- "text": "#14",
- "top": 365,
- "left": 1721,
- "width": 33,
"height": 23
}, {
"type": "rackDescs",
- "id": "lb_desc11",
- "text": "#11",
- "top": 275,
- "left": 1721,
- "width": 30,
- "height": 23
- },{
- "type": "rackDescs",
- "id": "lb_desc24",
- "text": "#24",
- "top": 515,
- "left": 1721,
+ "id": "lb_desc4",
+ "text": "#4",
+ "top": 360,
+ "left": 1151,
"width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc21",
- "text": "#21",
- "top": 425,
- "left": 1721,
- "width": 30,
"height": 23
}],
"crns": [{
"type": "track",
"id": "lb_track1",
"text": "",
- "top": 184,
- "left": 559,
- "width": 1345,
+ "top": 293,
+ "left": 539,
+ "width": 600,
"height": 2
}, {
"type": "crane",
"id": "crn-1",
"text": "1",
- "top": 171,
- "left": 805,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 334,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 321,
- "left": 805,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 484,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 471,
- "left": 805,
+ "top": 284,
+ "left": 833,
"width": 93,
"height": 22
}],
@@ -217,163 +97,108 @@
"type": "Control_floor",
"id": "tabControl_floor1",
"text": "妤煎眰",
- "top": 68,
+ "top": 64,
"left": 80,
- "width": 1845,
- "height": 676,
+ "width": 1389,
+ "height": 666,
"floors": [{
"type": "floor",
"id": "page_floor1",
- "text": "1搴�",
+ "text": "1F",
"top": 4,
"left": 22,
- "width": 1819,
- "height": 668,
+ "width": 1363,
+ "height": 658,
"stns": [{
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 196,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
"type": "stn",
"id": "site-102",
"text": "102",
- "top": 196,
- "left": 458,
- "width": 89,
- "height": 20
+ "top": 318,
+ "left": 342,
+ "width": 91,
+ "height": 32
}, {
"type": "stn",
"id": "site-101",
"text": "101",
- "top": 196,
- "left": 368,
- "width": 89,
- "height": 20
+ "top": 351,
+ "left": 342,
+ "width": 91,
+ "height": 32
+ }, {
+ "type": "stn",
+ "id": "site-103",
+ "text": "103",
+ "top": 318,
+ "left": 434,
+ "width": 141,
+ "height": 32
}, {
"type": "stn",
"id": "site-104",
"text": "104",
- "top": 148,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 148,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 148,
- "left": 368,
- "width": 89,
- "height": 20
- },{
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 346,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
+ "top": 235,
+ "left": 448,
+ "width": 127,
+ "height": 32
+ }]
+ }, {
+ "type": "floor",
+ "id": "page_floor2",
+ "text": "2F",
+ "top": 4,
+ "left": 22,
+ "width": 1363,
+ "height": 658,
+ "stns": [{
"type": "stn",
"id": "site-202",
"text": "202",
- "top": 346,
- "left": 458,
- "width": 89,
- "height": 20
+ "top": 386,
+ "left": 978,
+ "width": 127,
+ "height": 32
}, {
"type": "stn",
"id": "site-201",
"text": "201",
- "top": 346,
- "left": 368,
- "width": 89,
- "height": 20
+ "top": 420,
+ "left": 978,
+ "width": 127,
+ "height": 32
}, {
"type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 298,
- "left": 548,
- "width": 89,
- "height": 20
+ "id": "site-212",
+ "text": "212",
+ "top": 386,
+ "left": 577,
+ "width": 160,
+ "height": 32
}, {
"type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 298,
- "left": 458,
- "width": 89,
- "height": 20
+ "id": "site-200",
+ "text": "200",
+ "top": 454,
+ "left": 978,
+ "width": 127,
+ "height": 32
}, {
"type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 298,
- "left": 368,
- "width": 89,
- "height": 20
- },{
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 496,
- "left": 548,
- "width": 89,
- "height": 20
+ "id": "site-211",
+ "text": "211",
+ "top": 420,
+ "left": 577,
+ "width": 160,
+ "height": 32
}, {
"type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 496,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 496,
- "left": 368,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 448,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 448,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 448,
- "left": 368,
- "width": 89,
- "height": 20
+ "id": "site-210",
+ "text": "210",
+ "top": 454,
+ "left": 577,
+ "width": 160,
+ "height": 32
}]
}]
}]
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1